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

Add new internal error message + send rate limiting

Browse Source
This commit is contained in:
Ske 2020-09-20 22:35:05 +02:00
parent eab1cb1645
commit 5269f994cf
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PluralKit.Bot/Bot.cs
View File

@ -33,16 +33,18 @@ namespace PluralKit.Bot
private readonly ILifetimeScope _services; private readonly ILifetimeScope _services;
private readonly PeriodicStatCollector _collector; private readonly PeriodicStatCollector _collector;
private readonly IMetrics _metrics; private readonly IMetrics _metrics;
private readonly ErrorMessageService _errorMessageService;
private bool _hasReceivedReady = false; private bool _hasReceivedReady = false;
private Timer _periodicTask; // Never read, just kept here for GC reasons private Timer _periodicTask; // Never read, just kept here for GC reasons
public Bot(DiscordShardedClient client, ILifetimeScope services, ILogger logger, PeriodicStatCollector collector, IMetrics metrics) public Bot(DiscordShardedClient client, ILifetimeScope services, ILogger logger, PeriodicStatCollector collector, IMetrics metrics, ErrorMessageService errorMessageService)
{ {
_client = client; _client = client;
_services = services; _services = services;
_collector = collector; _collector = collector;
_metrics = metrics; _metrics = metrics;
_errorMessageService = errorMessageService;
_logger = logger.ForContext<Bot>(); _logger = logger.ForContext<Bot>();
} }
@ -164,12 +166,8 @@ namespace PluralKit.Bot
// Once we've sent it to Sentry, report it to the user (if we have permission to) // Once we've sent it to Sentry, report it to the user (if we have permission to)
var reportChannel = handler.ErrorChannelFor(evt); var reportChannel = handler.ErrorChannelFor(evt);
if (reportChannel != null && reportChannel.BotHasAllPermissions(Permissions.SendMessages)) if (reportChannel != null && reportChannel.BotHasAllPermissions(Permissions.SendMessages | Permissions.EmbedLinks))
{ await _errorMessageService.SendErrorMessage(reportChannel, sentryEvent.EventId.ToString());
var eid = sentryEvent.EventId;
await reportChannel.SendMessageFixedAsync(
$"{Emojis.Error} Internal error occurred. Please join the support server (<https://discord.gg/PczBt78>), and send the developer this ID: `{eid}`\nBe sure to include a description of what you were doing to make the error occur.");
}
} }
} }

1
PluralKit.Bot/Modules.cs
View File

@ -73,6 +73,7 @@ namespace PluralKit.Bot
builder.RegisterType<PeriodicStatCollector>().AsSelf().SingleInstance(); builder.RegisterType<PeriodicStatCollector>().AsSelf().SingleInstance();
builder.RegisterType<LastMessageCacheService>().AsSelf().SingleInstance(); builder.RegisterType<LastMessageCacheService>().AsSelf().SingleInstance();
builder.RegisterType<LoggerCleanService>().AsSelf().SingleInstance(); builder.RegisterType<LoggerCleanService>().AsSelf().SingleInstance();
builder.RegisterType<ErrorMessageService>().AsSelf().SingleInstance();
// Sentry stuff // Sentry stuff
builder.Register(_ => new Scope(null)).AsSelf().InstancePerLifetimeScope(); builder.Register(_ => new Scope(null)).AsSelf().InstancePerLifetimeScope();