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

fix: re-enable error messages for explicit commands

Browse Source
This commit is contained in:
spiral 2021-10-29 17:34:28 -04:00
parent b998636cbe
commit f897ce5a45
No known key found for this signature in database
GPG Key ID: A6059F0CA0E1BD31
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PluralKit.Bot/Bot.cs
View File

@ -253,16 +253,12 @@ namespace PluralKit.Bot
// Once we've sent it to Sentry, report it to the user (if we have permission to)
var reportChannel = handler.ErrorChannelFor(evt);
if (reportChannel != null)
{
var botPerms = PermissionsIn(reportChannel.Value);
if (botPerms.HasFlag(PermissionSet.SendMessages | PermissionSet.EmbedLinks))
{
// i'm just going to disable this for now we need to find something nicer
// await _errorMessageService.SendErrorMessage(reportChannel.Value,
// sentryEvent.EventId.ToString());
}
}
if (reportChannel == null)
return;
var botPerms = PermissionsIn(reportChannel.Value);
if (botPerms.HasFlag(PermissionSet.SendMessages | PermissionSet.EmbedLinks))
await _errorMessageService.SendErrorMessage(reportChannel.Value, sentryEvent.EventId.ToString());
}
}

17
PluralKit.Bot/Handlers/MessageCreated.cs
View File

@ -19,6 +19,7 @@ namespace PluralKit.Bot
public class MessageCreated: IEventHandler<MessageCreateEvent>
{
private readonly Bot _bot;
private readonly Cluster _cluster;
private readonly CommandTree _tree;
private readonly IDiscordCache _cache;
private readonly LastMessageCacheService _lastMessageCache;
@ -31,9 +32,9 @@ namespace PluralKit.Bot
private readonly BotConfig _config;
private readonly DiscordApiClient _rest;
public MessageCreated(LastMessageCacheService lastMessageCache, LoggerCleanService loggerClean,
IMetrics metrics, ProxyService proxy,
CommandTree tree, ILifetimeScope services, IDatabase db, BotConfig config, ModelRepository repo, IDiscordCache cache, Bot bot, DiscordApiClient rest)
public MessageCreated(LastMessageCacheService lastMessageCache, LoggerCleanService loggerClean, IMetrics metrics, ProxyService proxy,
CommandTree tree, ILifetimeScope services, IDatabase db, BotConfig config, ModelRepository repo, IDiscordCache cache,
Bot bot, Cluster cluster, DiscordApiClient rest)
{
_lastMessageCache = lastMessageCache;
_loggerClean = loggerClean;
@ -46,10 +47,18 @@ namespace PluralKit.Bot
_repo = repo;
_cache = cache;
_bot = bot;
_cluster = cluster;
_rest = rest;
}
public ulong? ErrorChannelFor(MessageCreateEvent evt) => evt.ChannelId;
// for now, only return error messages for explicit commands
public ulong? ErrorChannelFor(MessageCreateEvent evt)
{
if (!HasCommandPrefix(evt.Content, _cluster.User?.Id ?? default, out var cmdStart) || cmdStart == evt.Content.Length)
return null;
return evt.ChannelId;
}
private bool IsDuplicateMessage(Message msg) =>
// We consider a message duplicate if it has the same ID as the previous message that hit the gateway