Skip to content

merge master in develop #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GamerVII-NET merged 3 commits into from
Oct 12, 2025
Merged

merge master in develop #13

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77cde17
Merge pull request #11 from Gml-Launcher/develop
GamerVII-NET Sep 28, 2025
1a0b797
Added texture protocol from request
Gamer-VII Oct 12, 2025
07ce1be
Merge pull request #12 from Gml-Launcher/GML-53
GamerVII-NET Oct 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/Gml.Web.Skin.Service/Core/Requests/TextureRequests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ internal static async Task<IResult> LoadSkin(HttpRequest request, [FromForm] IFo
await file.CopyToAsync(fileStream);
}

var texture = SkinHelper.Create($"http://{request.Host.Value}", userName);
var texture = SkinHelper.Create($"{request.Scheme}://{request.Host.Value}", userName);
return Results.Ok(mapper.Map<UserTextureReadDto>(texture));
}
catch (Exception ex)
Expand Down Expand Up @@ -74,7 +74,7 @@ internal static async Task<IResult> LoadCloak(HttpRequest request, [FromForm] IF
await file.CopyToAsync(fileStream);
}

var texture = SkinHelper.Create($"http://{request.Host.Value}", userName);
var texture = SkinHelper.Create($"{request.Scheme}://{request.Host.Value}", userName);
return Results.Ok(mapper.Map<UserTextureReadDto>(texture));
}
catch (Exception ex)
Expand All @@ -97,14 +97,14 @@ internal static async Task<IResult> DeleteCloak(HttpRequest request, IMapper map

internal static Task<IResult> GetSkin(HttpRequest request, string userName, string? uuid)
{
var user = SkinHelper.Create($"http://{request.Host.Value}", userName.Substring(2, userName.Length - 2));
var user = SkinHelper.Create($"{request.Scheme}://{request.Host.Value}", userName.Substring(2, userName.Length - 2));

return Task.FromResult(Results.File(user.SkinFullPath, "image/png"));
}

internal static Task<IResult> GetUserTexture(HttpRequest request, IMapper mapper, string userName)
{
var texture = SkinHelper.Create($"http://{request.Host.Value}", userName);
var texture = SkinHelper.Create($"{request.Scheme}://{request.Host.Value}", userName);

return Task.FromResult(Results.Ok(mapper.Map<UserTextureReadDto>(texture)));
}
Expand All @@ -128,7 +128,7 @@ internal static async Task<IResult> RefreshCache(HttpRequest request, IMapper ma

internal static Task<IResult> GetCloak(HttpRequest request, string userName, int? size = 128)
{
var user = SkinHelper.Create($"http://{request.Host.Value}", userName);
var user = SkinHelper.Create($"{request.Scheme}://{request.Host.Value}", userName);

if (!user.HasCloak) return Task.FromResult(Results.NotFound("Cloak not exists"));

Expand All @@ -139,7 +139,7 @@ internal static Task<IResult> GetCloak(HttpRequest request, string userName, int

internal static Task<IResult> GetCloakTexture(HttpRequest request, string userName)
{
var user = SkinHelper.Create($"http://{request.Host.Value}", userName.Substring(2, userName.Length - 2));
var user = SkinHelper.Create($"{request.Scheme}://{request.Host.Value}", userName.Substring(2, userName.Length - 2));

if (!user.HasCloak) return Task.FromResult(Results.NotFound("Cloak not exists"));

Expand All @@ -148,7 +148,7 @@ internal static Task<IResult> GetCloakTexture(HttpRequest request, string userNa

internal static Task<IResult> GetSkinHead(HttpRequest request, string userName, int size = 128)
{
var user = SkinHelper.Create($"http://{request.Host.Value}", userName);
var user = SkinHelper.Create($"{request.Scheme}://{request.Host.Value}", userName);

var image = SkinViewer.SkinViewer.GetHead(user.SkinFullPath, user, size);

Expand All @@ -157,7 +157,7 @@ internal static Task<IResult> GetSkinHead(HttpRequest request, string userName,

internal static Task<IResult> GetSkinFront(HttpRequest request, string userName, int size = 128)
{
var user = SkinHelper.Create($"http://{request.Host.Value}", userName);
var user = SkinHelper.Create($"{request.Scheme}://{request.Host.Value}", userName);

var image = SkinViewer.SkinViewer.GetFront(user.SkinFullPath, user, size);

Expand All @@ -166,7 +166,7 @@ internal static Task<IResult> GetSkinFront(HttpRequest request, string userName,

internal static Task<IResult> GetSkinBack(HttpRequest request, string userName, int size = 128)
{
var user = SkinHelper.Create($"http://{request.Host.Value}", userName);
var user = SkinHelper.Create($"{request.Scheme}://{request.Host.Value}", userName);

var image = SkinViewer.SkinViewer.GetBack(user, size);

Expand All @@ -175,7 +175,7 @@ internal static Task<IResult> GetSkinBack(HttpRequest request, string userName,

internal static Task<IResult> GetSkinAndCloakBack(HttpRequest request, string userName, int size = 128)
{
var user = SkinHelper.Create($"http://{request.Host.Value}", userName);
var user = SkinHelper.Create($"{request.Scheme}://{request.Host.Value}", userName);

var image = SkinViewer.SkinViewer.GetBack(user, size, true);

Expand Down