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

Revert "feat: remove 2000-character limit for proxied messages"

Browse Source 
This reverts commit 7cc2aab1f0.
This commit is contained in:
spiral 2022-01-21 18:23:58 -05:00
parent 31a129dabf
commit ddbf0e8691
No known key found for this signature in database
GPG Key ID: A6059F0CA0E1BD31
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PluralKit.Bot/Commands/Message.cs
View File

@ -56,6 +56,9 @@ public class ProxiedMessage
var newContent = ctx.RemainderOrNull().NormalizeLineEndSpacing();
if (newContent.Length > 2000)
throw new PKError("PluralKit cannot proxy messages over 2000 characters in length.");
var originalMsg = await _rest.GetMessageOrNull(msg.Message.Channel, msg.Message.Mid);
if (originalMsg == null)
throw new PKError("Could not edit message.");

4
PluralKit.Bot/Proxy/ProxyService.cs
View File

@ -66,6 +66,10 @@ public class ProxyService
if (!_matcher.TryMatch(ctx, members, out var match, message.Content, message.Attachments.Length > 0,
allowAutoproxy)) return false;
// this is hopefully temporary, so not putting it into a separate method
if (message.Content != null && message.Content.Length > 2000)
throw new PKError("PluralKit cannot proxy messages over 2000 characters in length.");
// Permission check after proxy match so we don't get spammed when not actually proxying
if (!CheckBotPermissionsOrError(botPermissions, rootChannel.Id))
return false;

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

@ -100,7 +100,7 @@ public class WebhookExecutorService
private async Task<Message> ExecuteWebhookInner(Webhook webhook, ProxyRequest req, bool hasRetried = false)
{
var guild = await _cache.GetGuild(req.GuildId);
var content = req.Content.Truncate(4000);
var content = req.Content.Truncate(2000);
var allowedMentions = content.ParseMentions();
if (!req.AllowEveryone)