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

Fix image-only proxies where the tags have trailing/leading spaces

Browse Source
This commit is contained in:
Ske 2019-12-26 19:19:06 +01:00
parent 67b5f7f7a6
commit 633627c30a
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PluralKit.Bot/Services/ProxyService.cs
View File

@ -62,7 +62,17 @@ namespace PluralKit.Bot
var prefix = tag.Prefix ?? ""; var prefix = tag.Prefix ?? "";
var suffix = tag.Suffix ?? ""; var suffix = tag.Suffix ?? "";
if (message.Length >= prefix.Length + suffix.Length && message.StartsWith(prefix) && message.EndsWith(suffix)) { var isMatch = message.Length >= prefix.Length + suffix.Length
&& message.StartsWith(prefix) && message.EndsWith(suffix);
// Special case for image-only proxies and proxy tags with spaces
if (!isMatch && message.Trim() == prefix.TrimEnd() + suffix.TrimStart())
{
isMatch = true;
message = prefix + suffix; // To get around substring errors
}
if (isMatch) {
var inner = message.Substring(prefix.Length, message.Length - prefix.Length - suffix.Length); var inner = message.Substring(prefix.Length, message.Length - prefix.Length - suffix.Length);
if (leadingMention != null) inner = $"{leadingMention} {inner}"; if (leadingMention != null) inner = $"{leadingMention} {inner}";
return new ProxyMatch { Member = match.Member, System = match.System, InnerText = inner, ProxyTags = tag}; return new ProxyMatch { Member = match.Member, System = match.System, InnerText = inner, ProxyTags = tag};