eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-09 15:27:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

WIP: revise avatars service
Some checks failed
Build and push Docker image / .net docker build (push) Has been cancelled
Details
.net checks / run .net tests (push) Has been cancelled
Details
.net checks / dotnet-format (push) Has been cancelled
Details
Build and push Rust service Docker images / rust docker build (push) Has been cancelled
Details
rust checks / cargo fmt (push) Has been cancelled
Details

Browse source
This commit is contained in:
asleepyskye 2026-01-24 11:43:05 -05:00
parent 0a474c43eb
commit f69587ceaf
26 changed files with 912 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

14
PluralKit.Bot/Services/AvatarHostingService.cs
View file

@ -1,4 +1,5 @@
using PluralKit.Core;
using Serilog;
using System.Net;
using System.Net.Http.Json;
@ -18,7 +19,7 @@ public class AvatarHostingService
};
}
public async Task VerifyAvatarOrThrow(string url, bool isBanner = false)
public async Task VerifyAvatarOrThrow(Context ctx, string url, bool isBanner = false)
{
if (url.Length > Limits.MaxUriLength)
throw Errors.UrlTooLong(url);
@ -35,6 +36,7 @@ public class AvatarHostingService
return;
var kind = isBanner ? "banner" : "avatar";
if (ctx.Premium) kind = "premium_" + kind;
try
{
@ -56,11 +58,11 @@ public class AvatarHostingService
}
}
public async Task<ParsedImage> TryRehostImage(ParsedImage input, RehostedImageType type, ulong userId, PKSystem? system)
public async Task<ParsedImage> TryRehostImage(Context ctx, ParsedImage input, RehostedImageType type)
{
try
{
var uploaded = await TryUploadAvatar(input.Url, type, userId, system);
var uploaded = await TryUploadAvatar(ctx, input.Url, type);
if (uploaded != null)
{
// todo: make new image type called Cdn?
@ -78,7 +80,7 @@ public class AvatarHostingService
}
}
public async Task<string?> TryUploadAvatar(string? avatarUrl, RehostedImageType type, ulong userId, PKSystem? system)
public async Task<string?> TryUploadAvatar(Context ctx, string? avatarUrl, RehostedImageType type)
{
if (!AvatarUtils.IsDiscordCdnUrl(avatarUrl))
return null;
@ -93,8 +95,10 @@ public class AvatarHostingService
_ => throw new ArgumentOutOfRangeException(nameof(type), type, null)
};
if (ctx.Premium) kind = "premium_" + kind;
var response = await _client.PostAsJsonAsync(_config.AvatarServiceUrl + "/pull",
new { url = avatarUrl, kind, uploaded_by = userId, system_id = system?.Uuid.ToString() });
new { url = avatarUrl, kind, uploaded_by = ctx.Author.Id, system_id = ctx.System.Uuid.ToString() });
if (response.StatusCode != HttpStatusCode.OK)
{
var error = await response.Content.ReadFromJsonAsync<ErrorResponse>();