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

Ignore proxying messages with no content and no attachment

Browse Source
This commit is contained in:
Ske 2019-07-15 21:37:34 +02:00
parent 6668cd8d2d
commit 206d403526
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,11 +92,15 @@ namespace PluralKit.Bot
// Find a member with proxy tags matching the message // Find a member with proxy tags matching the message
var match = GetProxyTagMatch(message.Content, results); var match = GetProxyTagMatch(message.Content, results);
if (match == null) return; if (match == null) return;
// We know message.Channel can only be ITextChannel as PK doesn't work in DMs/groups // We know message.Channel can only be ITextChannel as PK doesn't work in DMs/groups
// Afterwards we ensure the bot has the right permissions, otherwise bail early // Afterwards we ensure the bot has the right permissions, otherwise bail early
if (!await EnsureBotPermissions(message.Channel as ITextChannel)) return; if (!await EnsureBotPermissions(message.Channel as ITextChannel)) return;
// Can't proxy a message with no content and no attachment
if (match.InnerText.Trim().Length == 0 && message.Attachments.Count == 0)
return;
// Fetch a webhook for this channel, and send the proxied message // Fetch a webhook for this channel, and send the proxied message
var webhook = await _webhookCache.GetWebhook(message.Channel as ITextChannel); var webhook = await _webhookCache.GetWebhook(message.Channel as ITextChannel);
var hookMessageId = await ExecuteWebhook(webhook, match.InnerText, match.ProxyName, match.Member.AvatarUrl, message.Attachments.FirstOrDefault()); var hookMessageId = await ExecuteWebhook(webhook, match.InnerText, match.ProxyName, match.Member.AvatarUrl, message.Attachments.FirstOrDefault());