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

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;
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)
{
@ -329,7 +337,8 @@ namespace PluralKit.Bot
}
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.
// ONLY IF this error's actually our problem. As for what defines an error as "our problem",
// check the extension method :)
if (exc.IsOurProblem())
if (exc.IsOurProblem() && _msg.Channel.HasPermission(ChannelPermission.SendMessages))
{
var eid = evt.EventId;
await _msg.Channel.SendMessageAsync(