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

fix: respect system avatar privacy

Browse source
This commit is contained in:
rladenson 2025-01-04 03:21:56 -07:00
parent fa9e88c846
commit bba86fe98b
1 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -567,6 +567,9 @@ public class SystemEdit
async Task ShowIcon() async Task ShowIcon()
{ {
if ((target.AvatarUrl?.Trim() ?? "").Length > 0) if ((target.AvatarUrl?.Trim() ?? "").Length > 0)
{
if (!target.AvatarPrivacy.CanAccess(ctx.DirectLookupContextFor(target.Id)))
throw new PKSyntaxError("This system does not have an icon set or it is private.");
switch (ctx.MatchFormat()) switch (ctx.MatchFormat())
{ {
case ReplyFormat.Raw: case ReplyFormat.Raw:
@ -586,9 +589,14 @@ public class SystemEdit
await ctx.Reply(embed: ebS.Build()); await ctx.Reply(embed: ebS.Build());
break; break;
} }
}
else else
{
var isOwner = target.Id == ctx.System?.Id;
throw new PKSyntaxError( throw new PKSyntaxError(
"This system does not have an icon set. Set one by attaching an image to this command, or by passing an image URL or @mention."); $"This system does not have an icon set{(isOwner ? "" : " or it is private")}."
+ (isOwner ? " Set one by attaching an image to this command, or by passing an image URL or @mention." : ""));
}
} }
if (target != null && target?.Id != ctx.System?.Id) if (target != null && target?.Id != ctx.System?.Id)
@ -646,10 +654,12 @@ public class SystemEdit
async Task ShowIcon() async Task ShowIcon()
{ {
var settings = await ctx.Repository.GetSystemGuild(ctx.Guild.Id, target.Id); var settings = await ctx.Repository.GetSystemGuild(ctx.Guild.Id, target.Id);
if ((settings.AvatarUrl?.Trim() ?? "").Length > 0) if ((settings.AvatarUrl?.Trim() ?? "").Length > 0)
{
if (!target.AvatarPrivacy.CanAccess(ctx.DirectLookupContextFor(target.Id)))
throw new PKSyntaxError("This system does not have a icon specific to this server or it is private.");
switch (ctx.MatchFormat()) switch (ctx.MatchFormat())
{ {
case ReplyFormat.Raw: case ReplyFormat.Raw:
@ -669,9 +679,14 @@ public class SystemEdit
await ctx.Reply(embed: ebS.Build()); await ctx.Reply(embed: ebS.Build());
break; break;
} }
}
else else
{
var isOwner = target.Id == ctx.System?.Id;
throw new PKSyntaxError( throw new PKSyntaxError(
"This system does not have a icon specific to this server. Set one by attaching an image to this command, or by passing an image URL or @mention."); $"This system does not have a icon specific to this server{(isOwner ? "" : " or it is private")}."
+ (isOwner ? " Set one by attaching an image to this command, or by passing an image URL or @mention." : ""));
}
} }
ctx.CheckGuildContext(); ctx.CheckGuildContext();