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

Merge 25de294d85 into 4a947c01fc

Browse source
This commit is contained in:
leo60228 2026-01-20 22:20:02 +00:00 • committed by GitHub
commit 7bd258bdba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
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

@ -1,3 +1,4 @@
using System.Globalization;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
@ -418,13 +419,14 @@ public class ProxyService
// strip out overly excessive line breaks // strip out overly excessive line breaks
msg = Regex.Replace(msg, @"(?:(?:([_\*]) \1)?\n){2,}", "\n"); msg = Regex.Replace(msg, @"(?:(?:([_\*]) \1)?\n){2,}", "\n");
if (msg.Length > 100) if (new StringInfo(msg).LengthInTextElements > 100)
{ {
msg = repliedTo.Content.Substring(0, 100); var msgInfo = new StringInfo(repliedTo.Content);
msg = msgInfo.SubstringByTextElements(0, 100);
var endsWithOpenMention = Regex.IsMatch(msg, @"<[at]?[@#:][!&]?(\w+:)?(\d+)?(:[tTdDfFR])?$"); var endsWithOpenMention = Regex.IsMatch(msg, @"<[at]?[@#:][!&]?(\w+:)?(\d+)?(:[tTdDfFR])?$");
if (endsWithOpenMention) if (endsWithOpenMention)
{ {
var mentionTail = repliedTo.Content.Substring(100).Split(">")[0]; var mentionTail = msgInfo.SubstringByTextElements(100).Split(">")[0];
if (repliedTo.Content.Contains(msg + mentionTail + ">")) if (repliedTo.Content.Contains(msg + mentionTail + ">"))
msg += mentionTail + ">"; msg += mentionTail + ">";
} }
@ -432,7 +434,7 @@ public class ProxyService
var endsWithUrl = Regex.IsMatch(msg, URL_REGEX); var endsWithUrl = Regex.IsMatch(msg, URL_REGEX);
if (endsWithUrl) if (endsWithUrl)
{ {
msg += repliedTo.Content.Substring(100).Split(" ")[0]; msg += msgInfo.SubstringByTextElements(100).Split(" ")[0];
// replace the entire URL with a placeholder if it's *too* long // replace the entire URL with a placeholder if it's *too* long
if (msg.Length > 300) if (msg.Length > 300)
@ -441,6 +443,10 @@ public class ProxyService
msg += " "; msg += " ";
} }
// if it's unreasonably long in code units, just cut it off as a failsafe
if (msg.Length > 500)
msg = msg.Substring(0, 500);
var spoilersInOriginalString = Regex.Matches(repliedTo.Content, @"\|\|").Count; var spoilersInOriginalString = Regex.Matches(repliedTo.Content, @"\|\|").Count;
var spoilersInTruncatedString = Regex.Matches(msg, @"\|\|").Count; var spoilersInTruncatedString = Regex.Matches(msg, @"\|\|").Count;
if (spoilersInTruncatedString % 2 == 1 && spoilersInOriginalString % 2 == 0) if (spoilersInTruncatedString % 2 == 1 && spoilersInOriginalString % 2 == 0)