Merge branch 'master' into dirty-button

locale/Messages.resx

@@ -117,13 +117,13 @@
   <data name="DefaultWelcomeMessage" xml:space="preserve">
     <value>{0}, welcome to {1}</value>
   </data>
-  <data name="Loaded1" xml:space="preserve">
+  <data name="Generic1" xml:space="preserve">
       <value>Veemo!</value>
   </data>
-  <data name="Loaded2" xml:space="preserve">
+  <data name="Generic2" xml:space="preserve">
       <value>Woomy!</value>
   </data>
-  <data name="Loaded3" xml:space="preserve">
+  <data name="Generic3" xml:space="preserve">
       <value>Ngyes!</value>
   </data>
   <data name="YouWereBanned" xml:space="preserve">
@@ -585,6 +585,12 @@
   <data name="ButtonReportIssue" xml:space="preserve">
       <value>Report an issue</value>
   </data>
+  <data name="DefaultLeaveMessage" xml:space="preserve">
+      <value>See you soon, {0}!</value>
+  </data>
+  <data name="SettingsLeaveMessage" xml:space="preserve">
+      <value>Leave message</value>
+  </data>
   <data name="InvalidTimeSpan" xml:space="preserve">
       <value>Time specified incorrectly!</value>
   </data>

locale/Messages.ru.resx

@@ -117,13 +117,13 @@
   <data name="DefaultWelcomeMessage" xml:space="preserve">
     <value>{0}, добро пожаловать на сервер {1}</value>
   </data>
-  <data name="Loaded1" xml:space="preserve">
+  <data name="Generic1" xml:space="preserve">
       <value>Виимо!</value>
   </data>
-  <data name="Loaded2" xml:space="preserve">
+  <data name="Generic2" xml:space="preserve">
       <value>Вууми!</value>
   </data>
-  <data name="Loaded3" xml:space="preserve">
+  <data name="Generic3" xml:space="preserve">
       <value>Нгьес!</value>
   </data>
   <data name="PunishmentExpired" xml:space="preserve">
@@ -585,6 +585,12 @@
   <data name="ButtonReportIssue" xml:space="preserve">
       <value>Сообщить о проблеме</value>
   </data>
+  <data name="DefaultLeaveMessage" xml:space="preserve">
+      <value>До скорой встречи, {0}!</value>
+  </data>
+  <data name="SettingsLeaveMessage" xml:space="preserve">
+      <value>Сообщение о выходе</value>
+  </data>
   <data name="InvalidTimeSpan" xml:space="preserve">
       <value>Неправильно указано время!</value>
   </data>

locale/Messages.tt-ru.resx

@@ -117,13 +117,13 @@
   <data name="DefaultWelcomeMessage" xml:space="preserve">
     <value>{0}, добро пожаловать на сервер {1}</value>
   </data>
-  <data name="Loaded1" xml:space="preserve">
+  <data name="Generic1" xml:space="preserve">
       <value>вииимо!</value>
   </data>
-  <data name="Loaded2" xml:space="preserve">
+  <data name="Generic2" xml:space="preserve">
       <value>вуууми!</value>
   </data>
-  <data name="Loaded3" xml:space="preserve">
+  <data name="Generic3" xml:space="preserve">
       <value>нгьес!</value>
   </data>
   <data name="YouWereBanned" xml:space="preserve">
@@ -585,6 +585,12 @@
   <data name="ButtonReportIssue" xml:space="preserve">
       <value>зарепортить баг</value>
   </data>
+  <data name="DefaultLeaveMessage" xml:space="preserve">
+      <value>ну, мы потеряли {0}</value>
+  </data>
+  <data name="SettingsLeaveMessage" xml:space="preserve">
+      <value>до свидания (типо настройка)</value>
+  </data>
   <data name="InvalidTimeSpan" xml:space="preserve">
       <value>ты там правильно напиши таймспан</value>
   </data>

src/Commands/BanCommandGroup.cs

@@ -181,17 +181,19 @@ public class BanCommandGroup : CommandGroup
             await _channelApi.CreateMessageWithEmbedResultAsync(dmChannel.ID, embedResult: dmEmbed, ct: ct);
         }
 
+        var memberData = data.GetOrCreateMemberData(target.ID);
+        memberData.BannedUntil
+            = duration is not null ? DateTimeOffset.UtcNow.Add(duration.Value) : DateTimeOffset.MaxValue;
+
         var banResult = await _guildApi.CreateGuildBanAsync(
             guild.ID, target.ID, reason: $"({executor.GetTag()}) {reason}".EncodeHeader(),
             ct: ct);
         if (!banResult.IsSuccess)
         {
+            memberData.BannedUntil = null;
             return Result.FromError(banResult.Error);
         }
 
-        var memberData = data.GetOrCreateMemberData(target.ID);
-        memberData.BannedUntil
-            = duration is not null ? DateTimeOffset.UtcNow.Add(duration.Value) : DateTimeOffset.MaxValue;
         memberData.Roles.Clear();
 
         var embed = new EmbedBuilder().WithSmallTitle(

src/Commands/KickCommandGroup.cs

@@ -143,17 +143,19 @@ public class KickCommandGroup : CommandGroup
             await _channelApi.CreateMessageWithEmbedResultAsync(dmChannel.ID, embedResult: dmEmbed, ct: ct);
         }
 
+        var memberData = data.GetOrCreateMemberData(target.ID);
+        memberData.Kicked = true;
+
         var kickResult = await _guildApi.RemoveGuildMemberAsync(
             guild.ID, target.ID, $"({executor.GetTag()}) {reason}".EncodeHeader(),
             ct);
         if (!kickResult.IsSuccess)
         {
+            memberData.Kicked = false;
             return Result.FromError(kickResult.Error);
         }
 
-        var memberData = data.GetOrCreateMemberData(target.ID);
         memberData.Roles.Clear();
-        memberData.Kicked = true;
 
         var title = string.Format(Messages.UserKicked, target.GetTag());
         var description = MarkdownExtensions.BulletPoint(string.Format(Messages.DescriptionActionReason, reason));

src/Commands/PingCommandGroup.cs

@@ -91,7 +91,7 @@ public class PingCommandGroup : CommandGroup
         }
 
         var embed = new EmbedBuilder().WithSmallTitle(bot.GetTag(), bot)
-            .WithTitle($"Sound{Random.Shared.Next(1, 4)}".Localized())
+            .WithTitle($"Generic{Random.Shared.Next(1, 4)}".Localized())
             .WithDescription($"{latency:F0}{Messages.Milliseconds}")
             .WithColour(latency < 250 ? ColorsList.Green : latency < 500 ? ColorsList.Yellow : ColorsList.Red)
             .WithCurrentTimestamp()

src/Commands/SettingsCommandGroup.cs

@@ -39,6 +39,7 @@ public class SettingsCommandGroup : CommandGroup
     [
         GuildSettings.Language,
         GuildSettings.WelcomeMessage,
+        GuildSettings.LeaveMessage,
         GuildSettings.ReceiveStartupMessages,
         GuildSettings.RemoveRolesOnMute,
         GuildSettings.ReturnRolesOnRejoin,

src/Data/GuildSettings.cs

@@ -13,17 +13,29 @@ public static class GuildSettings
     public static readonly LanguageOption Language = new("Language", "en");
 
     /// <summary>
-    ///     Controls what message should be sent in <see cref="PublicFeedbackChannel" /> when a new member joins the server.
+    ///     Controls what message should be sent in <see cref="PublicFeedbackChannel" /> when a new member joins the guild.
     /// </summary>
     /// <remarks>
     ///     <list type="bullet">
     ///         <item>No message will be sent if set to "off", "disable" or "disabled".</item>
-    ///         <item><see cref="Messages.DefaultWelcomeMessage" /> will be sent if set to "default" or "reset"</item>
+    ///         <item><see cref="Messages.DefaultWelcomeMessage" /> will be sent if set to "default" or "reset".</item>
     ///     </list>
     /// </remarks>
     /// <seealso cref="GuildMemberJoinedResponder" />
     public static readonly Option<string> WelcomeMessage = new("WelcomeMessage", "default");
 
+    /// <summary>
+    ///     Controls what message should be sent in <see cref="PublicFeedbackChannel" /> when a member leaves the guild.
+    /// </summary>
+    /// <remarks>
+    ///     <list type="bullet">
+    ///         <item>No message will be sent if set to "off", "disable" or "disabled".</item>
+    ///         <item><see cref="Messages.DefaultLeaveMessage" /> will be sent if set to "default" or "reset".</item>
+    ///     </list>
+    /// </remarks>
+    /// <seealso cref="GuildMemberLeftResponder" />
+    public static readonly Option<string> LeaveMessage = new("LeaveMessage", "default");
+
     /// <summary>
     ///     Controls whether or not the <see cref="Messages.Ready" /> message should be sent
     ///     in <see cref="PrivateFeedbackChannel" /> on startup.

src/Data/Options/AllOptionsEnum.cs

@@ -14,6 +14,7 @@ public enum AllOptionsEnum
 {
     [UsedImplicitly] Language,
     [UsedImplicitly] WelcomeMessage,
+    [UsedImplicitly] LeaveMessage,
     [UsedImplicitly] ReceiveStartupMessages,
     [UsedImplicitly] RemoveRolesOnMute,
     [UsedImplicitly] ReturnRolesOnRejoin,

src/Messages.Designer.cs

@@ -66,21 +66,21 @@ namespace Octobot {
             }
         }
 
-        internal static string Loaded1 {
+        internal static string Generic1 {
             get {
-                return ResourceManager.GetString("Loaded1", resourceCulture);
+                return ResourceManager.GetString("Generic1", resourceCulture);
             }
         }
 
-        internal static string Loaded2 {
+        internal static string Generic2 {
             get {
-                return ResourceManager.GetString("Loaded2", resourceCulture);
+                return ResourceManager.GetString("Generic2", resourceCulture);
             }
         }
 
-        internal static string Loaded3 {
+        internal static string Generic3 {
             get {
-                return ResourceManager.GetString("Loaded3", resourceCulture);
+                return ResourceManager.GetString("Generic3", resourceCulture);
             }
         }
 
@@ -1037,18 +1037,26 @@ namespace Octobot {
             }
         }
 
-        internal static string InvalidTimeSpan
+        internal static string DefaultLeaveMessage {
-        {
+            get {
-            get
+                return ResourceManager.GetString("DefaultLeaveMessage", resourceCulture);
-            {
+            }
+        }
+
+        internal static string SettingsLeaveMessage {
+            get {
+                return ResourceManager.GetString("SettingsLeaveMessage", resourceCulture);
+            }
+        }
+
+        internal static string InvalidTimeSpan {
+            get {
                 return ResourceManager.GetString("InvalidTimeSpan", resourceCulture);
             }
         }
 
-        internal static string UserInfoKicked
+        internal static string UserInfoKicked {
-        {
+            get {
-            get
-            {
                 return ResourceManager.GetString("UserInfoKicked", resourceCulture);
             }
         }

src/Responders/GuildLoadedResponder.cs

@@ -88,7 +88,7 @@ public class GuildLoadedResponder : IResponder<IGuildCreate>
         var i = Random.Shared.Next(1, 4);
 
         var embed = new EmbedBuilder().WithSmallTitle(bot.GetTag(), bot)
-            .WithTitle($"Loaded{i}".Localized())
+            .WithTitle($"Generic{i}".Localized())
             .WithDescription(Messages.Ready)
             .WithCurrentTimestamp()
             .WithColour(ColorsList.Blue)

src/Responders/GuildMemberLeftResponder.cs

@@ -0,0 +1,73 @@
+using JetBrains.Annotations;
+using Octobot.Data;
+using Octobot.Extensions;
+using Octobot.Services;
+using Remora.Discord.API.Abstractions.Gateway.Events;
+using Remora.Discord.API.Abstractions.Rest;
+using Remora.Discord.Extensions.Embeds;
+using Remora.Discord.Gateway.Responders;
+using Remora.Results;
+
+namespace Octobot.Responders;
+
+/// <summary>
+///     Handles sending a guild's <see cref="GuildSettings.LeaveMessage" /> if one is set.
+/// </summary>
+/// <seealso cref="GuildSettings.LeaveMessage" />
+[UsedImplicitly]
+public class GuildMemberLeftResponder : IResponder<IGuildMemberRemove>
+{
+    private readonly IDiscordRestChannelAPI _channelApi;
+    private readonly IDiscordRestGuildAPI _guildApi;
+    private readonly GuildDataService _guildData;
+
+    public GuildMemberLeftResponder(
+        IDiscordRestChannelAPI channelApi, GuildDataService guildData, IDiscordRestGuildAPI guildApi)
+    {
+        _channelApi = channelApi;
+        _guildData = guildData;
+        _guildApi = guildApi;
+    }
+
+    public async Task<Result> RespondAsync(IGuildMemberRemove gatewayEvent, CancellationToken ct = default)
+    {
+        var user = gatewayEvent.User;
+        var data = await _guildData.GetData(gatewayEvent.GuildID, ct);
+        var cfg = data.Settings;
+
+        var memberData = data.GetOrCreateMemberData(user.ID);
+        if (memberData.BannedUntil is not null || memberData.Kicked)
+        {
+            return Result.FromSuccess();
+        }
+
+        if (GuildSettings.WelcomeMessagesChannel.Get(cfg).Empty()
+            || GuildSettings.LeaveMessage.Get(cfg) is "off" or "disable" or "disabled")
+        {
+            return Result.FromSuccess();
+        }
+
+        Messages.Culture = GuildSettings.Language.Get(cfg);
+        var leaveMessage = GuildSettings.LeaveMessage.Get(cfg) is "default" or "reset"
+            ? Messages.DefaultLeaveMessage
+            : GuildSettings.LeaveMessage.Get(cfg);
+
+        var guildResult = await _guildApi.GetGuildAsync(gatewayEvent.GuildID, ct: ct);
+        if (!guildResult.IsDefined(out var guild))
+        {
+            return Result.FromError(guildResult);
+        }
+
+        var embed = new EmbedBuilder()
+            .WithSmallTitle(string.Format(leaveMessage, user.GetTag(), guild.Name), user)
+            .WithGuildFooter(guild)
+            .WithTimestamp(DateTimeOffset.UtcNow)
+            .WithColour(ColorsList.Black)
+            .Build();
+
+        return await _channelApi.CreateMessageWithEmbedResultAsync(
+            GuildSettings.WelcomeMessagesChannel.Get(cfg), embedResult: embed,
+            allowedMentions: Octobot.NoMentions, ct: ct);
+    }
+}
+