cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-27 07:04:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'FixByondAndInvertedIf'

Browse Source
This commit is contained in:
Jordan Brown
2022-09-28 14:24:04 -04:00
parent 132823788a c08628f5d1
commit 37561bc2ce
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs
+5 -2
View File
@@ -527,9 +527,12 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
var shouldNotAnswer = !pm;
if (shouldNotAnswer)
lock (mappedChannels)
shouldNotAnswer = !mappedChannels.Contains(messageCreateEvent.ChannelID.Value);
shouldNotAnswer = !mappedChannels.Contains(messageCreateEvent.ChannelID.Value) && !mappedChannels.Contains(0);
var content = NormalizeMentions(messageCreateEvent.Content);
var refreshedMessage = !String.IsNullOrWhiteSpace(messageCreateEvent.Content)
? messageCreateEvent
: (await channelsClient.GetChannelMessageAsync(messageCreateEvent.ChannelID, messageCreateEvent.ID, cancellationToken)).Entity;
var content = NormalizeMentions(refreshedMessage.Content);
var mentionedUs = messageCreateEvent.Mentions.Any(x => x.ID == currentUserId)
|| (!shouldNotAnswer && content.Split(' ').First().Equals(ChatManager.CommonMention, StringComparison.OrdinalIgnoreCase));