diff --git a/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs b/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs index f89d57e9f1..8954374439 100644 --- a/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs +++ b/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs @@ -529,12 +529,9 @@ namespace Tgstation.Server.Host.Components.Chat.Providers lock (mappedChannels) shouldNotAnswer = !mappedChannels.Contains(messageCreateEvent.ChannelID.Value) && !mappedChannels.Contains(0); - var refreshedMessage = !String.IsNullOrWhiteSpace(messageCreateEvent.Content) - ? messageCreateEvent - : (await channelsClient.GetChannelMessageAsync(messageCreateEvent.ChannelID, messageCreateEvent.ID, cancellationToken)).Entity; - var content = NormalizeMentions(refreshedMessage.Content); + var content = NormalizeMentions(messageCreateEvent.Content); var mentionedUs = messageCreateEvent.Mentions.Any(x => x.ID == currentUserId) - || (!shouldNotAnswer && content.Split(' ').First().Equals(ChatManager.CommonMention, StringComparison.OrdinalIgnoreCase)); + || (!shouldNotAnswer && content.Split(' ', StringSplitOptions.RemoveEmptyEntries).First().Equals(ChatManager.CommonMention, StringComparison.OrdinalIgnoreCase)); if (shouldNotAnswer) { diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj index 94e4647da7..b4cad3d15e 100644 --- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -84,7 +84,7 @@ - +