Refactor proxy handling code
- Move reaction handlers to the ReactionAdded event instead of ProxyService - Split tag matching off into ProxyTagParser - Split autoproxy matching off into Autoproxier - General cleanup and simplification
This commit is contained in:
Ske
@@ -118,7 +118,7 @@ namespace PluralKit.Bot
|
||||
|
||||
try
|
||||
{
|
||||
await _proxy.HandleMessageAsync(evt.Client, cachedGuild, cachedAccount, msg, doAutoProxy: true);
|
||||
await _proxy.HandleMessageAsync(evt.Client, cachedGuild, cachedAccount, msg, allowAutoproxy: true);
|
||||
}
|
||||
catch (PKError e)
|
||||
{
|
||||
|
||||
@@ -1,31 +1,39 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
using DSharpPlus.EventArgs;
|
||||
|
||||
using Sentry;
|
||||
using PluralKit.Core;
|
||||
|
||||
using Serilog;
|
||||
|
||||
namespace PluralKit.Bot
|
||||
{
|
||||
// Double duty :)
|
||||
public class MessageDeleted: IEventHandler<MessageDeleteEventArgs>, IEventHandler<MessageBulkDeleteEventArgs>
|
||||
{
|
||||
private readonly ProxyService _proxy;
|
||||
private readonly IDataStore _data;
|
||||
private readonly ILogger _logger;
|
||||
|
||||
public MessageDeleted(ProxyService proxy)
|
||||
public MessageDeleted(IDataStore data, ILogger logger)
|
||||
{
|
||||
_proxy = proxy;
|
||||
_data = data;
|
||||
_logger = logger.ForContext<MessageDeleted>();
|
||||
}
|
||||
|
||||
public Task Handle(MessageDeleteEventArgs evt)
|
||||
public async Task Handle(MessageDeleteEventArgs evt)
|
||||
{
|
||||
return _proxy.HandleMessageDeletedAsync(evt);
|
||||
// Delete deleted webhook messages from the data store
|
||||
// (if we don't know whether it's a webhook, delete it just to be safe)
|
||||
if (!evt.Message.WebhookMessage) return;
|
||||
await _data.DeleteMessage(evt.Message.Id);
|
||||
}
|
||||
|
||||
public Task Handle(MessageBulkDeleteEventArgs evt)
|
||||
public async Task Handle(MessageBulkDeleteEventArgs evt)
|
||||
{
|
||||
return _proxy.HandleMessageBulkDeleteAsync(evt);
|
||||
// Same as above, but bulk
|
||||
_logger.Information("Bulk deleting {Count} messages in channel {Channel}", evt.Messages.Count, evt.Channel.Id);
|
||||
await _data.DeleteMessagesBulk(evt.Messages.Select(m => m.Id).ToList());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -45,7 +45,7 @@ namespace PluralKit.Bot
|
||||
var guild = await _proxyCache.GetGuildDataCached(evt.Channel.GuildId);
|
||||
|
||||
// Just run the normal message handling stuff, with a flag to disable autoproxying
|
||||
await _proxy.HandleMessageAsync(evt.Client, guild, account, evt.Message, doAutoProxy: false);
|
||||
await _proxy.HandleMessageAsync(evt.Client, guild, account, evt.Message, allowAutoproxy: false);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,24 +1,126 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
using DSharpPlus;
|
||||
using DSharpPlus.Entities;
|
||||
using DSharpPlus.EventArgs;
|
||||
using DSharpPlus.Exceptions;
|
||||
|
||||
using Sentry;
|
||||
using PluralKit.Core;
|
||||
|
||||
namespace PluralKit.Bot
|
||||
{
|
||||
public class ReactionAdded: IEventHandler<MessageReactionAddEventArgs>
|
||||
{
|
||||
private readonly ProxyService _proxy;
|
||||
private IDataStore _data;
|
||||
private EmbedService _embeds;
|
||||
|
||||
public ReactionAdded(ProxyService proxy)
|
||||
public ReactionAdded(IDataStore data, EmbedService embeds)
|
||||
{
|
||||
_proxy = proxy;
|
||||
_data = data;
|
||||
_embeds = embeds;
|
||||
}
|
||||
|
||||
public Task Handle(MessageReactionAddEventArgs evt)
|
||||
public async Task Handle(MessageReactionAddEventArgs evt)
|
||||
{
|
||||
await TryHandleProxyMessageReactions(evt);
|
||||
}
|
||||
|
||||
private async ValueTask TryHandleProxyMessageReactions(MessageReactionAddEventArgs evt)
|
||||
{
|
||||
return _proxy.HandleReactionAddedAsync(evt);
|
||||
// Only proxies in guild text channels
|
||||
if (evt.Channel.Type != ChannelType.Text) return;
|
||||
|
||||
FullMessage msg;
|
||||
switch (evt.Emoji.Name)
|
||||
{
|
||||
// Message deletion
|
||||
case "\u274C": // Red X
|
||||
if ((msg = await _data.GetMessage(evt.Message.Id)) != null)
|
||||
await HandleDeleteReaction(evt, msg);
|
||||
break;
|
||||
|
||||
case "\u2753": // Red question mark
|
||||
case "\u2754": // White question mark
|
||||
if ((msg = await _data.GetMessage(evt.Message.Id)) != null)
|
||||
await HandleQueryReaction(evt, msg);
|
||||
break;
|
||||
|
||||
case "\U0001F514": // Bell
|
||||
case "\U0001F6CE": // Bellhop bell
|
||||
case "\U0001F3D3": // Ping pong paddle (lol)
|
||||
case "\u23F0": // Alarm clock
|
||||
case "\u2757": // Exclamation mark
|
||||
if ((msg = await _data.GetMessage(evt.Message.Id)) != null)
|
||||
await HandlePingReaction(evt, msg);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
private async ValueTask HandleDeleteReaction(MessageReactionAddEventArgs evt, FullMessage msg)
|
||||
{
|
||||
if (evt.Channel.BotHasAllPermissions(Permissions.ManageMessages)) return;
|
||||
|
||||
// Can only delete your own message
|
||||
if (msg.Message.Sender != evt.User.Id) return;
|
||||
|
||||
try
|
||||
{
|
||||
await evt.Message.DeleteAsync();
|
||||
}
|
||||
catch (NotFoundException)
|
||||
{
|
||||
// Message was deleted by something/someone else before we got to it
|
||||
}
|
||||
|
||||
await _data.DeleteMessage(evt.Message.Id);
|
||||
}
|
||||
|
||||
private async ValueTask HandleQueryReaction(MessageReactionAddEventArgs evt, FullMessage msg)
|
||||
{
|
||||
// Try to DM the user info about the message
|
||||
var member = await evt.Guild.GetMemberAsync(evt.User.Id);
|
||||
try
|
||||
{
|
||||
await member.SendMessageAsync(embed: await _embeds.CreateMemberEmbed(msg.System, msg.Member, evt.Guild, LookupContext.ByNonOwner));
|
||||
await member.SendMessageAsync(embed: await _embeds.CreateMessageInfoEmbed(evt.Client, msg));
|
||||
}
|
||||
catch (UnauthorizedException) { } // No permissions to DM, can't check for this :(
|
||||
|
||||
// And finally remove the original reaction (if we can)
|
||||
if (evt.Channel.BotHasAllPermissions(Permissions.ManageMessages))
|
||||
await evt.Message.DeleteReactionAsync(evt.Emoji, evt.User);
|
||||
}
|
||||
|
||||
private async ValueTask HandlePingReaction(MessageReactionAddEventArgs evt, FullMessage msg)
|
||||
{
|
||||
if (!evt.Channel.BotHasAllPermissions(Permissions.SendMessages)) return;
|
||||
|
||||
// Check if the "pinger" has permission to send messages in this channel
|
||||
// (if not, PK shouldn't send messages on their behalf)
|
||||
var guildUser = await evt.Guild.GetMemberAsync(evt.User.Id);
|
||||
var requiredPerms = Permissions.AccessChannels | Permissions.SendMessages;
|
||||
if ((guildUser.PermissionsIn(evt.Channel) & requiredPerms) != requiredPerms) return;
|
||||
|
||||
if (msg.System.PingsEnabled)
|
||||
{
|
||||
// If the system has pings enabled, go ahead
|
||||
var embed = new DiscordEmbedBuilder().WithDescription($"[Jump to pinged message]({evt.Message.JumpLink})");
|
||||
await evt.Channel.SendMessageAsync($"Psst, **{msg.Member.DisplayName ?? msg.Member.Name}** (<@{msg.Message.Sender}>), you have been pinged by <@{evt.User.Id}>.", embed: embed.Build());
|
||||
}
|
||||
else
|
||||
{
|
||||
// If not, tell them in DMs (if we can)
|
||||
try
|
||||
{
|
||||
await guildUser.SendMessageAsync($"{Emojis.Error} {msg.Member.DisplayName ?? msg.Member.Name}'s system has disabled reaction pings. If you want to mention them anyway, you can copy/paste the following message:");
|
||||
await guildUser.SendMessageAsync($"`<@{msg.Message.Sender}>`");
|
||||
}
|
||||
catch (UnauthorizedException) { }
|
||||
}
|
||||
|
||||
// Finally, remove the original reaction (if we can)
|
||||
if (evt.Channel.BotHasAllPermissions(Permissions.ManageMessages))
|
||||
await evt.Message.DeleteReactionAsync(evt.Emoji, evt.User);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user