daan/geekbot
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

Handle possible error with non-existing role properly in the reaction listener

Browse source
This commit is contained in:
Daan Boerlage 2022-07-22 18:26:48 +02:00
parent 245e88726a
commit 29f44c34bc
Signed by: daan
GPG key ID: FCE070E1E4956606
2 changed files with 51 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/Core/ReactionListener/ReactionListener.cs
View file

@ -1,22 +1,29 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Discord;
using Discord.WebSocket;
using Geekbot.Core.Database;
using Geekbot.Core.Database.Models;
using Geekbot.Core.Extensions;
using Geekbot.Core.Logger;
using Sentry;
namespace Geekbot.Core.ReactionListener
{
public class ReactionListener : IReactionListener
{
private readonly DatabaseContext _database;
private readonly IGeekbotLogger _logger;
// <messageId, <reaction, roleId>
private Dictionary<ulong, Dictionary<IEmote, ulong>> _listener;
public ReactionListener(DatabaseContext database)
public ReactionListener(DatabaseContext database, IGeekbotLogger logger)
{
_database = database;
_logger = logger;
LoadListeners();
}
@ -62,11 +69,22 @@ namespace Geekbot.Core.ReactionListener
public async void RemoveRole(ISocketMessageChannel channel, SocketReaction reaction)
{
var roleId = _listener[reaction.MessageId][reaction.Emote];
_listener.TryGetValue(reaction.MessageId, out var registeredReactions);
if (registeredReactions == null) return;
if (!registeredReactions.ContainsKey(reaction.Emote)) return;
var roleId = registeredReactions[reaction.Emote];
var guild = (SocketGuildChannel) channel;
try
{
var role = guild.Guild.GetRole(roleId);
await ((IGuildUser) reaction.User.Value).RemoveRoleAsync(role);
}
catch (Exception error)
{
HandleDeletedRole(error, guild, reaction, roleId);
}
}
public async void GiveRole(ISocketMessageChannel channel, SocketReaction reaction)
{
@ -75,9 +93,34 @@ namespace Geekbot.Core.ReactionListener
if (!registeredReactions.ContainsKey(reaction.Emote)) return;
var roleId = registeredReactions[reaction.Emote];
var guild = (SocketGuildChannel) channel;
try
{
var role = guild.Guild.GetRole(roleId);
await ((IGuildUser) reaction.User.Value).AddRoleAsync(role);
}
catch (Exception error)
{
HandleDeletedRole(error, guild, reaction, roleId);
}
}
private void HandleDeletedRole(Exception error, SocketGuildChannel guild, SocketReaction reaction, ulong roleId)
{
_logger.Warning(LogSource.Interaction, "Failed to get or assign role in reaction listener", error);
if (!SentrySdk.IsEnabled) return;
var sentryEvent = new SentryEvent(error)
{
Message = "Failed to get or assign role in reaction listener"
};
sentryEvent.SetTag("discord_server", guild.Id.ToString());
sentryEvent.SetExtra("Message", reaction.MessageId.ToString());
sentryEvent.SetExtra("User", roleId.ToString());
SentrySdk.CaptureEvent(sentryEvent);
}
public IEmote ConvertStringToEmote(string emoji)
{

2
src/Startup/Program.cs
View file

@ -105,7 +105,7 @@ ServiceCollection RegisterServices()
{
var services = new ServiceCollection();
var userRepository = new UserRepository(databaseInitializer.Initialize(), logger);
var reactionListener = new ReactionListener(databaseInitializer.Initialize());
var reactionListener = new ReactionListener(databaseInitializer.Initialize(), logger);
var guildSettingsManager = new GuildSettingsManager(databaseInitializer.Initialize());
var fortunes = new FortunesProvider(logger);
var levelCalc = new LevelCalc();