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

Disable message attachments as a temporary fix

Browse Source
This commit is contained in:
Ske 2019-12-23 01:53:01 +01:00
parent 265184f4f6
commit 3fdfaeab01
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PluralKit.Bot/Bot.cs
View File

@ -201,7 +201,8 @@ namespace PluralKit.Bot
private async Task UpdatePeriodic() private async Task UpdatePeriodic()
{ {
// Change bot status // Change bot status
await _client.SetGameAsync($"pk;help | in {_client.Guilds.Count} servers"); // await _client.SetGameAsync($"pk;help | in {_client.Guilds.Count} servers");
await _client.SetGameAsync($"Attachments disabled for tonight, sorry | in {_client.Guilds.Count} servers");
await _collector.CollectStats(); await _collector.CollectStats();

10
PluralKit.Bot/Services/WebhookExecutorService.cs
View File

@ -58,12 +58,12 @@ namespace PluralKit.Bot
mfd.Add(new StringContent(FixClyde(name).Truncate(80)), "username"); mfd.Add(new StringContent(FixClyde(name).Truncate(80)), "username");
if (avatarUrl != null) mfd.Add(new StringContent(avatarUrl), "avatar_url"); if (avatarUrl != null) mfd.Add(new StringContent(avatarUrl), "avatar_url");
var attachmentChunks = ChunkAttachmentsOrThrow(attachments, 8 * 1024 * 1024); /*var attachmentChunks = ChunkAttachmentsOrThrow(attachments, 8 * 1024 * 1024);
if (attachmentChunks.Count > 0) if (attachmentChunks.Count > 0)
{ {
_logger.Information($"Invoking webhook with {attachments.Count} attachments totalling {attachments.Select(a => a.Size).Sum() / 1024 / 1024} MiB in {attachmentChunks.Count} chunks"); _logger.Information("Invoking webhook with {AttachmentCount} attachments totalling {AttachmentSize} MiB in {AttachmentChunks} chunks", attachments.Count, attachments.Select(a => a.Size).Sum() / 1024 / 1024, attachmentChunks.Count);
await AddAttachmentsToMultipart(mfd, attachmentChunks.First()); await AddAttachmentsToMultipart(mfd, attachmentChunks.First());
} }*/
HttpResponseMessage response; HttpResponseMessage response;
using (_metrics.Measure.Timer.Time(BotMetrics.WebhookResponseTime)) using (_metrics.Measure.Timer.Time(BotMetrics.WebhookResponseTime))
@ -90,7 +90,7 @@ namespace PluralKit.Bot
} }
// If we have any leftover attachment chunks, send those // If we have any leftover attachment chunks, send those
if (attachmentChunks.Count > 1) /*if (attachmentChunks.Count > 1)
{ {
// Deliberately not adding a content, just the remaining files // Deliberately not adding a content, just the remaining files
foreach (var chunk in attachmentChunks.Skip(1)) foreach (var chunk in attachmentChunks.Skip(1))
@ -104,7 +104,7 @@ namespace PluralKit.Bot
// also don't error check, the real message itself is already sent // also don't error check, the real message itself is already sent
await _client.PostAsync($"{DiscordConfig.APIUrl}webhooks/{webhook.Id}/{webhook.Token}", mfd); await _client.PostAsync($"{DiscordConfig.APIUrl}webhooks/{webhook.Id}/{webhook.Token}", mfd);
} }
} }*/
// At this point we're sure we have a 2xx status code, so just assume success // At this point we're sure we have a 2xx status code, so just assume success
// TODO: can we do this without a round-trip to a string? // TODO: can we do this without a round-trip to a string?