Merge branch 'master' into gitinfo

Signed-off-by: Macintxsh <95250141+mctaylors@users.noreply.github.com>

locale/Messages.resx

@@ -660,4 +660,7 @@
   <data name="Version" xml:space="preserve">
       <value>Version: {0}</value>
   </data>
+  <data name="SettingsWelcomeMessagesChannel" xml:space="preserve">
+      <value>Welcome messages channel</value>
+  </data>
 </root>

locale/Messages.ru.resx

@@ -660,4 +660,7 @@
   <data name="Version" xml:space="preserve">
       <value>Версия: {0}</value>
   </data>
+  <data name="SettingsWelcomeMessagesChannel" xml:space="preserve">
+      <value>Канал для приветствий</value>
+  </data>
 </root>

locale/Messages.tt-ru.resx

@@ -660,4 +660,7 @@
   <data name="Version" xml:space="preserve">
       <value>{0}</value>
   </data>
+  <data name="SettingsWelcomeMessagesChannel" xml:space="preserve">
+      <value>канал куда говорить здравствуйте</value>
+  </data>
 </root>

src/Commands/SettingsCommandGroup.cs

@@ -46,6 +46,7 @@ public class SettingsCommandGroup : CommandGroup
         GuildSettings.RenameHoistedUsers,
         GuildSettings.PublicFeedbackChannel,
         GuildSettings.PrivateFeedbackChannel,
+        GuildSettings.WelcomeMessagesChannel,
         GuildSettings.EventNotificationChannel,
         GuildSettings.DefaultRole,
         GuildSettings.MuteRole,

src/Data/GuildSettings.cs

@@ -56,6 +56,11 @@ public static class GuildSettings
     /// </summary>
     public static readonly SnowflakeOption PrivateFeedbackChannel = new("PrivateFeedbackChannel");
 
+    /// <summary>
+    ///     Controls what channel should welcome messages be sent to.
+    /// </summary>
+    public static readonly SnowflakeOption WelcomeMessagesChannel = new("WelcomeMessagesChannel");
+
     public static readonly SnowflakeOption EventNotificationChannel = new("EventNotificationChannel");
     public static readonly SnowflakeOption DefaultRole = new("DefaultRole");
     public static readonly SnowflakeOption MuteRole = new("MuteRole");

src/Data/Options/AllOptionsEnum.cs

@@ -21,6 +21,7 @@ public enum AllOptionsEnum
     [UsedImplicitly] RenameHoistedUsers,
     [UsedImplicitly] PublicFeedbackChannel,
     [UsedImplicitly] PrivateFeedbackChannel,
+    [UsedImplicitly] WelcomeMessagesChannel,
     [UsedImplicitly] EventNotificationChannel,
     [UsedImplicitly] DefaultRole,
     [UsedImplicitly] MuteRole,

src/Messages.Designer.cs

@@ -1190,5 +1190,11 @@ namespace Octobot {
                 return ResourceManager.GetString("Version", resourceCulture);
             }
         }
+
+        internal static string SettingsWelcomeMessagesChannel {
+            get {
+                return ResourceManager.GetString("SettingsWelcomeMessagesChannel", resourceCulture);
+            }
+        }
     }
 }

src/Responders/GuildMemberJoinedResponder.cs

@@ -51,7 +51,7 @@ public class GuildMemberJoinedResponder : IResponder<IGuildMemberAdd>
             return Result.FromError(returnRolesResult.Error);
         }
 
-        if (GuildSettings.PublicFeedbackChannel.Get(cfg).Empty()
+        if (GuildSettings.WelcomeMessagesChannel.Get(cfg).Empty()
             || GuildSettings.WelcomeMessage.Get(cfg) is "off" or "disable" or "disabled")
         {
             return Result.FromSuccess();
@@ -76,7 +76,7 @@ public class GuildMemberJoinedResponder : IResponder<IGuildMemberAdd>
             .Build();
 
         return await _channelApi.CreateMessageWithEmbedResultAsync(
-            GuildSettings.PublicFeedbackChannel.Get(cfg), embedResult: embed,
+            GuildSettings.WelcomeMessagesChannel.Get(cfg), embedResult: embed,
             allowedMentions: Octobot.NoMentions, ct: ct);
     }