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

Workaround for permission errors when removing reactions

Browse Source
This commit is contained in:
Ske 2020-07-18 13:05:22 +02:00
parent 99d6942ff4
commit d749876796
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
PluralKit.Bot/Handlers/ReactionAdded.cs
View File

@ -7,17 +7,21 @@ using DSharpPlus.Exceptions;
using PluralKit.Core; using PluralKit.Core;
using Serilog;
namespace PluralKit.Bot namespace PluralKit.Bot
{ {
public class ReactionAdded: IEventHandler<MessageReactionAddEventArgs> public class ReactionAdded: IEventHandler<MessageReactionAddEventArgs>
{ {
private IDataStore _data; private IDataStore _data;
private EmbedService _embeds; private EmbedService _embeds;
private ILogger _logger;
public ReactionAdded(IDataStore data, EmbedService embeds) public ReactionAdded(IDataStore data, EmbedService embeds, ILogger logger)
{ {
_data = data; _data = data;
_embeds = embeds; _embeds = embeds;
_logger = logger.ForContext<ReactionAdded>();
} }
public async Task Handle(MessageReactionAddEventArgs evt) public async Task Handle(MessageReactionAddEventArgs evt)
@ -94,9 +98,7 @@ namespace PluralKit.Bot
} }
catch (UnauthorizedException) { } // No permissions to DM, can't check for this :( catch (UnauthorizedException) { } // No permissions to DM, can't check for this :(
// And finally remove the original reaction (if we can) await TryRemoveOriginalReaction(evt);
if (evt.Channel.BotHasAllPermissions(Permissions.ManageMessages))
await evt.Message.DeleteReactionAsync(evt.Emoji, evt.User);
} }
private async ValueTask HandlePingReaction(MessageReactionAddEventArgs evt, FullMessage msg) private async ValueTask HandlePingReaction(MessageReactionAddEventArgs evt, FullMessage msg)
@ -127,9 +129,24 @@ namespace PluralKit.Bot
catch (UnauthorizedException) { } catch (UnauthorizedException) { }
} }
// Finally, remove the original reaction (if we can) await TryRemoveOriginalReaction(evt);
if (evt.Channel.BotHasAllPermissions(Permissions.ManageMessages)) }
await evt.Message.DeleteReactionAsync(evt.Emoji, evt.User);
private async Task TryRemoveOriginalReaction(MessageReactionAddEventArgs evt)
{
try
{
if (evt.Channel.BotHasAllPermissions(Permissions.ManageMessages))
await evt.Message.DeleteReactionAsync(evt.Emoji, evt.User);
}
catch (UnauthorizedException)
{
var botPerms = evt.Channel.BotPermissions();
// So, in some cases (see Sentry issue 11K) the above check somehow doesn't work, and
// Discord returns a 403 Unauthorized. TODO: figure out the root cause here instead of a workaround
_logger.Warning("Attempted to remove reaction {Emoji} from user {User} on message {Channel}/{Message}, but got 403. Bot has permissions {Permissions} according to itself.",
evt.Emoji.Id, evt.User.Id, evt.Channel.Id, evt.Message.Id, botPerms);
}
} }
} }
} }