eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-17 03:00:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: properly fall back to regular Url if CleanUrl is not present

Browse source
This commit is contained in:
Jake Fulmine 2024-02-09 03:21:08 +01:00
parent bacc328417
commit 6d3c73d017
No known key found for this signature in database
GPG key ID: 177E8DB7BF4C60B2
6 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PluralKit.Bot/CommandSystem/Context/ContextAvatarExt.cs
View file

@ -52,7 +52,7 @@ public static class ContextAvatarExt
public struct ParsedImage public struct ParsedImage
{ {
public string Url; public string Url;
public string CleanUrl; public string? CleanUrl;
public AvatarSource Source; public AvatarSource Source;
public User? SourceUser; public User? SourceUser;
} }

4
PluralKit.Bot/Commands/Groups.cs
View file

@ -263,7 +263,7 @@ public class Groups
await AvatarUtils.VerifyAvatarOrThrow(_client, img.Url); await AvatarUtils.VerifyAvatarOrThrow(_client, img.Url);
await ctx.Repository.UpdateGroup(target.Id, new GroupPatch { Icon = img.CleanUrl }); await ctx.Repository.UpdateGroup(target.Id, new GroupPatch { Icon = img.CleanUrl ?? img.Url });
var msg = img.Source switch var msg = img.Source switch
{ {
@ -328,7 +328,7 @@ public class Groups
await AvatarUtils.VerifyAvatarOrThrow(_client, img.Url, true); await AvatarUtils.VerifyAvatarOrThrow(_client, img.Url, true);
await ctx.Repository.UpdateGroup(target.Id, new GroupPatch { BannerImage = img.CleanUrl }); await ctx.Repository.UpdateGroup(target.Id, new GroupPatch { BannerImage = img.CleanUrl ?? img.Url });
var msg = img.Source switch var msg = img.Source switch
{ {

2
PluralKit.Bot/Commands/Member.cs
View file

@ -79,7 +79,7 @@ public class Member
img.CleanUrl = uriBuilder.Uri.AbsoluteUri; img.CleanUrl = uriBuilder.Uri.AbsoluteUri;
await AvatarUtils.VerifyAvatarOrThrow(_client, img.Url); await AvatarUtils.VerifyAvatarOrThrow(_client, img.Url);
await ctx.Repository.UpdateMember(member.Id, new MemberPatch { AvatarUrl = img.CleanUrl }, conn); await ctx.Repository.UpdateMember(member.Id, new MemberPatch { AvatarUrl = img.CleanUrl ?? img.Url }, conn);
dispatchData.Add("avatar_url", img.CleanUrl); dispatchData.Add("avatar_url", img.CleanUrl);
} }

2
PluralKit.Bot/Commands/MemberAvatar.cs
View file

@ -139,7 +139,7 @@ public class MemberAvatar
ctx.CheckSystem().CheckOwnMember(target); ctx.CheckSystem().CheckOwnMember(target);
await AvatarUtils.VerifyAvatarOrThrow(_client, avatarArg.Value.Url); await AvatarUtils.VerifyAvatarOrThrow(_client, avatarArg.Value.Url);
await UpdateAvatar(location, ctx, target, avatarArg.Value.CleanUrl); await UpdateAvatar(location, ctx, target, avatarArg.Value.CleanUrl ?? avatarArg.Value.Url);
await PrintResponse(location, ctx, target, avatarArg.Value, guildData); await PrintResponse(location, ctx, target, avatarArg.Value, guildData);
} }

2
PluralKit.Bot/Commands/MemberEdit.cs
View file

@ -182,7 +182,7 @@ public class MemberEdit
{ {
await AvatarUtils.VerifyAvatarOrThrow(_client, img.Url, true); await AvatarUtils.VerifyAvatarOrThrow(_client, img.Url, true);
await ctx.Repository.UpdateMember(target.Id, new MemberPatch { BannerImage = img.CleanUrl }); await ctx.Repository.UpdateMember(target.Id, new MemberPatch { BannerImage = img.CleanUrl ?? img.Url });
var msg = img.Source switch var msg = img.Source switch
{ {

6
PluralKit.Bot/Commands/SystemEdit.cs
View file

@ -475,7 +475,7 @@ public class SystemEdit
await AvatarUtils.VerifyAvatarOrThrow(_client, img.Url); await AvatarUtils.VerifyAvatarOrThrow(_client, img.Url);
await ctx.Repository.UpdateSystem(target.Id, new SystemPatch { AvatarUrl = img.CleanUrl }); await ctx.Repository.UpdateSystem(target.Id, new SystemPatch { AvatarUrl = img.CleanUrl ?? img.Url });
var msg = img.Source switch var msg = img.Source switch
{ {
@ -543,7 +543,7 @@ public class SystemEdit
await AvatarUtils.VerifyAvatarOrThrow(_client, img.Url); await AvatarUtils.VerifyAvatarOrThrow(_client, img.Url);
await ctx.Repository.UpdateSystemGuild(target.Id, ctx.Guild.Id, new SystemGuildPatch { AvatarUrl = img.CleanUrl }); await ctx.Repository.UpdateSystemGuild(target.Id, ctx.Guild.Id, new SystemGuildPatch { AvatarUrl = img.CleanUrl ?? img.Url });
var msg = img.Source switch var msg = img.Source switch
{ {
@ -640,7 +640,7 @@ public class SystemEdit
{ {
await AvatarUtils.VerifyAvatarOrThrow(_client, img.Url, true); await AvatarUtils.VerifyAvatarOrThrow(_client, img.Url, true);
await ctx.Repository.UpdateSystem(target.Id, new SystemPatch { BannerImage = img.CleanUrl }); await ctx.Repository.UpdateSystem(target.Id, new SystemPatch { BannerImage = img.CleanUrl ?? img.Url });
var msg = img.Source switch var msg = img.Source switch
{ {