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

fix: users without a system could delete any proxied message

Browse source
This commit is contained in:
rladenson 2024-11-05 21:22:07 -07:00
parent eff4120ce1
commit 83bdfe8406
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
PluralKit.Bot/ApplicationCommands/Message.cs
View file

@ -78,7 +78,8 @@ public class ApplicationCommandProxiedMessage
var message = await ctx.Repository.GetFullMessage(messageId);
if (message != null)
{
if (message.Message.Sender != ctx.User.Id && (ctx.System != null && message.System?.Id != ctx.System.Id))
// if user has has a system and their system sent the message, or if user sent the message, do not error
if (!((ctx.System != null && message.System?.Id == ctx.System.Id) || message.Message.Sender == ctx.User.Id))
throw new PKError("You can only delete your own messages.");
await DeleteMessageInner(ctx, message.Message.Guild ?? 0, message.Message.Channel, message.Message.Mid, false);

3
PluralKit.Bot/Commands/Message.cs
View file

@ -400,7 +400,8 @@ public class ProxiedMessage
if (!showContent)
throw new PKError(noShowContentError);
if (message.Message.Sender != ctx.Author.Id && (ctx.System != null && message.System?.Id != ctx.System.Id))
// if user has has a system and their system sent the message, or if user sent the message, do not error
if (!((ctx.System != null && message.System?.Id == ctx.System.Id) || message.Message.Sender == ctx.Author.Id))
throw new PKError("You can only delete your own messages.");
await ctx.Rest.DeleteMessage(message.Message.Channel, message.Message.Mid);