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

Disable autoproxy retriggering on edit

Browse Source
This commit is contained in:
Ske 2020-02-12 17:44:24 +01:00
parent d0d3579b17
commit dc10a8411a
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PluralKit.Bot/Bot.cs
View File

@ -317,7 +317,7 @@ namespace PluralKit.Bot
// no data = no account = no system = no proxy! // no data = no account = no system = no proxy!
try try
{ {
await _proxy.HandleMessageAsync(cachedGuild, cachedAccount, msg); await _proxy.HandleMessageAsync(cachedGuild, cachedAccount, msg, doAutoProxy: true);
} }
catch (PKError e) catch (PKError e)
{ {
@ -420,7 +420,7 @@ namespace PluralKit.Bot
var guild = await _cache.GetGuildDataCached(gc.GuildId); var guild = await _cache.GetGuildDataCached(gc.GuildId);
// Just run the normal message handling stuff // Just run the normal message handling stuff
await _proxy.HandleMessageAsync(guild, account, newMessage); await _proxy.HandleMessageAsync(guild, account, newMessage, doAutoProxy: false);
} }
} }
} }

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

@ -83,7 +83,7 @@ namespace PluralKit.Bot
return null; return null;
} }
public async Task HandleMessageAsync(GuildConfig guild, CachedAccount account, IMessage message) public async Task HandleMessageAsync(GuildConfig guild, CachedAccount account, IMessage message, bool doAutoProxy)
{ {
// Bail early if this isn't in a guild channel // Bail early if this isn't in a guild channel
if (!(message.Channel is ITextChannel channel)) return; if (!(message.Channel is ITextChannel channel)) return;
@ -97,7 +97,11 @@ namespace PluralKit.Bot
// If we didn't get a match by proxy tags, try to get one by autoproxy // If we didn't get a match by proxy tags, try to get one by autoproxy
// Also try if we *did* get a match, but there's no inner text. This happens if someone sends a message that // Also try if we *did* get a match, but there's no inner text. This happens if someone sends a message that
// is equal to someone else's tags, and messages like these should be autoproxied if possible // is equal to someone else's tags, and messages like these should be autoproxied if possible
if (match == null || (match.InnerText.Trim().Length == 0 && message.Attachments.Count == 0))
// All of this should only be done if this call allows autoproxy.
// When a normal message is sent, autoproxy is enabled, but if this method is called from a message *edit*
// event, then autoproxy is disabled. This is so AP doesn't "retrigger" when the original message was escaped.
if (doAutoProxy && (match == null || (match.InnerText.Trim().Length == 0 && message.Attachments.Count == 0)))
match = await GetAutoproxyMatch(account, systemSettingsForGuild, message, channel); match = await GetAutoproxyMatch(account, systemSettingsForGuild, message, channel);
// If we still haven't found any, just yeet // If we still haven't found any, just yeet