eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-04 04:56:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(bot): remove absurdly long links from reply embeds

Browse source
This commit is contained in:
Iris System 2023-07-13 21:02:31 +12:00
parent 46777c2e4d
commit 97e7df5e4d
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
PluralKit.Bot/Proxy/ProxyService.cs
View file

@ -35,6 +35,8 @@ public class ProxyService
private readonly WebhookExecutorService _webhookExecutor; private readonly WebhookExecutorService _webhookExecutor;
private readonly NodaTime.IClock _clock; private readonly NodaTime.IClock _clock;
private static readonly string URL_REGEX = @"(http|https)(:\/\/)?(www\.)?([-a-zA-Z0-9@:%._\+~#=]{1,256})?\.?([a-zA-Z0-9()]{1,6})?\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)$";
public ProxyService(LogChannelService logChannel, ILogger logger, WebhookExecutorService webhookExecutor, public ProxyService(LogChannelService logChannel, ILogger logger, WebhookExecutorService webhookExecutor,
DispatchService dispatch, IDatabase db, RedisService redis, ProxyMatcher matcher, IMetrics metrics, ModelRepository repo, DispatchService dispatch, IDatabase db, RedisService redis, ProxyMatcher matcher, IMetrics metrics, ModelRepository repo,
NodaTime.IClock clock, IDiscordCache cache, DiscordApiClient rest, LastMessageCacheService lastMessage) NodaTime.IClock clock, IDiscordCache cache, DiscordApiClient rest, LastMessageCacheService lastMessage)
@ -384,12 +386,16 @@ public class ProxyService
msg += mentionTail + ">"; msg += mentionTail + ">";
} }
var endsWithUrl = Regex.IsMatch(msg, var endsWithUrl = Regex.IsMatch(msg, URL_REGEX);
@"(http|https)(:\/\/)?(www\.)?([-a-zA-Z0-9@:%._\+~#=]{1,256})?\.?([a-zA-Z0-9()]{1,6})?\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)$");
if (endsWithUrl) if (endsWithUrl)
{ {
var urlTail = repliedTo.Content.Substring(100).Split(" ")[0]; msg += repliedTo.Content.Substring(100).Split(" ")[0];
msg += urlTail + " ";
// replace the entire URL with a placeholder if it's *too* long
if (msg.Length > 300)
msg = Regex.Replace(msg, URL_REGEX, $"*[(very long link removed, click to see original message)]({jumpLink})*");
msg += " ";
} }
var spoilersInOriginalString = Regex.Matches(repliedTo.Content, @"\|\|").Count; var spoilersInOriginalString = Regex.Matches(repliedTo.Content, @"\|\|").Count;