liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #291 from dev-kittens/feat/msgdelete

Browse Source 
Add 'pk;msg <id|link> delete'
This commit is contained in:
Astrid 2021-03-21 12:21:15 +01:00 committed by GitHub
commit 3404384df6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Myriad/Rest/DiscordApiClient.cs
View File

@ -54,7 +54,8 @@ namespace Myriad.Rest
public Task DeleteMessage(ulong channelId, ulong messageId) =>
_client.Delete($"/channels/{channelId}/messages/{messageId}", ("DeleteMessage", channelId));
public Task DeleteMessage(Message message) =>
_client.Delete($"/channels/{message.ChannelId}/messages/{message.Id}", ("DeleteMessage", message.ChannelId));
public Task CreateReaction(ulong channelId, ulong messageId, Emoji emoji) =>
_client.Put<object>($"/channels/{channelId}/messages/{messageId}/reactions/{EncodeEmoji(emoji)}/@me",
("CreateReaction", channelId), null);

2
PluralKit.Bot/Commands/CommandTree.cs
View File

@ -75,7 +75,7 @@ namespace PluralKit.Bot
public static Command Export = new Command("export", "export", "Exports system information to a data file");
public static Command Help = new Command("help", "help", "Shows help information about PluralKit");
public static Command Explain = new Command("explain", "explain", "Explains the basics of systems and proxying");
public static Command Message = new Command("message", "message <id|link>", "Looks up a proxied message");
public static Command Message = new Command("message", "message <id|link> [delete]", "Looks up a proxied message");
public static Command LogChannel = new Command("log channel", "log channel <channel>", "Designates a channel to post proxied messages to");
public static Command LogChannelClear = new Command("log channel", "log channel -clear", "Clears the currently set log channel");
public static Command LogEnable = new Command("log enable", "log enable all|<channel> [channel 2] [channel 3...]", "Enables message logging in certain channels");

9
PluralKit.Bot/Commands/Misc.cs
View File

@ -222,6 +222,15 @@ namespace PluralKit.Bot {
var message = await _db.Execute(c => _repo.GetMessage(c, messageId));
if (message == null) throw Errors.MessageNotFound(messageId);
if (ctx.Match("delete") || ctx.MatchFlag("delete"))
{
if (message.System.Id != ctx.System.Id)
throw new PKError("You can only delete your own messages.");
await ctx.Rest.DeleteMessage(message.Message.Channel, message.Message.Mid);
await ctx.Rest.DeleteMessage(ctx.Message);
return;
}
await ctx.Reply(embed: await _embeds.CreateMessageInfoEmbed(message));
}
}