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

Handle send message/embed links permission erorrs gracefully

Browse Source
This commit is contained in:
Ske
2020-02-24 09:57:16 +01:00
parent 9d4993b121
commit a95d12639d
3 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
PluralKit.Bot/Bot.cs
View File

@@ -316,7 +316,15 @@ namespace PluralKit.Bot
msg.Content.Substring(argPos).TrimStart().Length; msg.Content.Substring(argPos).TrimStart().Length;
argPos += trimStartLengthDiff; argPos += trimStartLengthDiff;
await _tree.ExecuteCommand(new Context(_services, msg, argPos, cachedAccount?.System)); try
{
await _tree.ExecuteCommand(new Context(_services, msg, argPos, cachedAccount?.System));
}
catch (PKError)
{
// Only permission errors will ever bubble this far and be caught here instead of Context.Execute
// so we just catch and ignore these. TODO: this may need to change.
}
} }
else if (cachedAccount != null) else if (cachedAccount != null)
{ {
@@ -329,7 +337,8 @@ namespace PluralKit.Bot
} }
catch (PKError e) catch (PKError e)
{ {
await arg.Channel.SendMessageAsync($"{Emojis.Error} {e.Message}"); if (arg.Channel.HasPermission(ChannelPermission.SendMessages))
await arg.Channel.SendMessageAsync($"{Emojis.Error} {e.Message}");
} }
} }
} }
@@ -343,7 +352,7 @@ namespace PluralKit.Bot
// We'll fetch the event ID and send a user-facing error message. // We'll fetch the event ID and send a user-facing error message.
// ONLY IF this error's actually our problem. As for what defines an error as "our problem", // ONLY IF this error's actually our problem. As for what defines an error as "our problem",
// check the extension method :) // check the extension method :)
if (exc.IsOurProblem()) if (exc.IsOurProblem() && _msg.Channel.HasPermission(ChannelPermission.SendMessages))
{ {
var eid = evt.EventId; var eid = evt.EventId;
await _msg.Channel.SendMessageAsync( await _msg.Channel.SendMessageAsync(

13
PluralKit.Bot/CommandSystem/Context.cs
View File

@@ -53,8 +53,17 @@ namespace PluralKit.Bot
public bool HasNext(bool skipFlags = true) => RemainderOrNull(skipFlags) != null; public bool HasNext(bool skipFlags = true) => RemainderOrNull(skipFlags) != null;
public string FullCommand => _parameters.FullCommand; public string FullCommand => _parameters.FullCommand;
public Task<IUserMessage> Reply(string text = null, Embed embed = null) => public Task<IUserMessage> Reply(string text = null, Embed embed = null)
Channel.SendMessageAsync(text, embed: embed); {
if (!this.BotHasPermission(ChannelPermission.SendMessages))
// Will be "swallowed" during the error handler anyway, this message is never shown.
throw new PKError("PluralKit does not have permission to send messages in this channel.");
if (embed != null && !this.BotHasPermission(ChannelPermission.EmbedLinks))
throw new PKError("PluralKit does not have permission to send embeds in this channel. Please ensure I have the **Embed Links** permission enabled.");
return Channel.SendMessageAsync(text, embed: embed);
}
/// <summary> /// <summary>
/// Checks if the next parameter is equal to one of the given keywords. Case-insensitive. /// Checks if the next parameter is equal to one of the given keywords. Case-insensitive.

6
PluralKit.Bot/Utils/ContextUtils.cs
View File

@@ -82,7 +82,7 @@ namespace PluralKit.Bot {
try try
{ {
var msg = await ctx.Channel.SendMessageAsync(embed: await MakeEmbedForPage(0)); var msg = await ctx.Reply(embed: await MakeEmbedForPage(0));
if (pageCount == 1) return; // If we only have one page, don't bother with the reaction/pagination logic, lol if (pageCount == 1) return; // If we only have one page, don't bother with the reaction/pagination logic, lol
IEmote[] botEmojis = { new Emoji("\u23EA"), new Emoji("\u2B05"), new Emoji("\u27A1"), new Emoji("\u23E9"), new Emoji(Emojis.Error) }; IEmote[] botEmojis = { new Emoji("\u23EA"), new Emoji("\u2B05"), new Emoji("\u27A1"), new Emoji("\u23E9"), new Emoji(Emojis.Error) };
await msg.AddReactionsAsync(botEmojis); await msg.AddReactionsAsync(botEmojis);
@@ -147,7 +147,7 @@ namespace PluralKit.Bot {
var pageCount = (items.Count-1) / pageSize + 1; var pageCount = (items.Count-1) / pageSize + 1;
// Send the original message // Send the original message
var msg = await ctx.Channel.SendMessageAsync($"**[Page {currPage + 1}/{pageCount}]**\n{description}\n{MakeOptionList(currPage)}"); var msg = await ctx.Reply($"**[Page {currPage + 1}/{pageCount}]**\n{description}\n{MakeOptionList(currPage)}");
// Add back/forward reactions and the actual indicator emojis // Add back/forward reactions and the actual indicator emojis
async Task AddEmojis() async Task AddEmojis()
@@ -186,7 +186,7 @@ namespace PluralKit.Bot {
} }
else else
{ {
var msg = await ctx.Channel.SendMessageAsync($"{description}\n{MakeOptionList(0)}"); var msg = await ctx.Reply($"{description}\n{MakeOptionList(0)}");
// Add the relevant reactions (we don't care too much about awaiting) // Add the relevant reactions (we don't care too much about awaiting)
async Task AddEmojis() async Task AddEmojis()