From 59ca76ba6b82850c2f3645f1bbde625636af3a8a Mon Sep 17 00:00:00 2001 From: Octol1ttle Date: Sun, 11 Jun 2023 21:43:45 +0500 Subject: [PATCH] Fix duplicates being sent if public and private feedback channels are the same Signed-off-by: Octol1ttle --- Commands/BanCommandGroup.cs | 18 ++++++++++-------- Commands/KickCommandGroup.cs | 9 +++++---- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Commands/BanCommandGroup.cs b/Commands/BanCommandGroup.cs index 1b83a34..be554e6 100644 --- a/Commands/BanCommandGroup.cs +++ b/Commands/BanCommandGroup.cs @@ -143,14 +143,15 @@ public class BanCommandGroup : CommandGroup { var builtArray = new[] { logBuilt }; // Not awaiting to reduce response time - if (cfg.PrivateFeedbackChannel != channelId.Value) - _ = _channelApi.CreateMessageAsync( - cfg.PrivateFeedbackChannel.ToDiscordSnowflake(), embeds: builtArray, - ct: CancellationToken); if (cfg.PublicFeedbackChannel != channelId.Value) _ = _channelApi.CreateMessageAsync( cfg.PublicFeedbackChannel.ToDiscordSnowflake(), embeds: builtArray, ct: CancellationToken); + if (cfg.PrivateFeedbackChannel != cfg.PublicFeedbackChannel + && cfg.PrivateFeedbackChannel != channelId.Value) + _ = _channelApi.CreateMessageAsync( + cfg.PrivateFeedbackChannel.ToDiscordSnowflake(), embeds: builtArray, + ct: CancellationToken); } } @@ -238,14 +239,15 @@ public class BanCommandGroup : CommandGroup { var builtArray = new[] { logBuilt }; // Not awaiting to reduce response time - if (cfg.PrivateFeedbackChannel != channelId.Value) - _ = _channelApi.CreateMessageAsync( - cfg.PrivateFeedbackChannel.ToDiscordSnowflake(), embeds: builtArray, - ct: CancellationToken); if (cfg.PublicFeedbackChannel != channelId.Value) _ = _channelApi.CreateMessageAsync( cfg.PublicFeedbackChannel.ToDiscordSnowflake(), embeds: builtArray, ct: CancellationToken); + if (cfg.PrivateFeedbackChannel != cfg.PublicFeedbackChannel + && cfg.PrivateFeedbackChannel != channelId.Value) + _ = _channelApi.CreateMessageAsync( + cfg.PrivateFeedbackChannel.ToDiscordSnowflake(), embeds: builtArray, + ct: CancellationToken); } if (!responseEmbed.IsDefined(out var built)) diff --git a/Commands/KickCommandGroup.cs b/Commands/KickCommandGroup.cs index dcce144..5d384ef 100644 --- a/Commands/KickCommandGroup.cs +++ b/Commands/KickCommandGroup.cs @@ -126,14 +126,15 @@ public class KickCommandGroup : CommandGroup { var builtArray = new[] { logBuilt }; // Not awaiting to reduce response time - if (cfg.PrivateFeedbackChannel != channelId.Value) - _ = _channelApi.CreateMessageAsync( - cfg.PrivateFeedbackChannel.ToDiscordSnowflake(), embeds: builtArray, - ct: CancellationToken); if (cfg.PublicFeedbackChannel != channelId.Value) _ = _channelApi.CreateMessageAsync( cfg.PublicFeedbackChannel.ToDiscordSnowflake(), embeds: builtArray, ct: CancellationToken); + if (cfg.PrivateFeedbackChannel != cfg.PublicFeedbackChannel + && cfg.PrivateFeedbackChannel != channelId.Value) + _ = _channelApi.CreateMessageAsync( + cfg.PrivateFeedbackChannel.ToDiscordSnowflake(), embeds: builtArray, + ct: CancellationToken); } }