docs: Upped version to 5.1.18, updated changelog

add: .translateflags command
add: captcha to timely, configurable in .conf gambling
change: change bonuses for patreon rewards
fix: nunchi message color fix

NadekoBot.sln

@@ -30,6 +30,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nadeko.Medusa", "src\Nadeko
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.Generators", "src\NadekoBot.Generators\NadekoBot.Generators.csproj", "{92770AF3-83EE-49F1-A0BB-79124D19A13D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.GrpcApiBase", "src\NadekoBot.GrpcApiBase\NadekoBot.GrpcApiBase.csproj", "{FB74B9EA-10B9-4542-ACB1-35523A95A587}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -79,6 +81,12 @@ Global
 		{92770AF3-83EE-49F1-A0BB-79124D19A13D}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU
 		{92770AF3-83EE-49F1-A0BB-79124D19A13D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{92770AF3-83EE-49F1-A0BB-79124D19A13D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FB74B9EA-10B9-4542-ACB1-35523A95A587}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB74B9EA-10B9-4542-ACB1-35523A95A587}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FB74B9EA-10B9-4542-ACB1-35523A95A587}.GlobalNadeko|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB74B9EA-10B9-4542-ACB1-35523A95A587}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU
+		{FB74B9EA-10B9-4542-ACB1-35523A95A587}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FB74B9EA-10B9-4542-ACB1-35523A95A587}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -91,6 +99,7 @@ Global
 		{E685977E-31A4-46F4-A5D7-4E3E39E82E43} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
 		{92770AF3-83EE-49F1-A0BB-79124D19A13D} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
 		{2F4CF6D6-0C2F-4944-B204-9508CDA53195} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
+		{FB74B9EA-10B9-4542-ACB1-35523A95A587} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5F3F555C-855F-4BE8-B526-D062D3E8ACA4}

migrate.ps1

@@ -5,6 +5,5 @@ else {
     $migrationName = $args[0]
     dotnet ef migrations add $migrationName -c SqliteContext -p src/NadekoBot/NadekoBot.csproj
     dotnet ef migrations add $migrationName -c PostgreSqlContext -p src/NadekoBot/NadekoBot.csproj
-    dotnet ef migrations add $migrationName -c MysqlContext -p src/NadekoBot/NadekoBot.csproj
 }
 

remove-migration.ps1

@@ -1,4 +1,3 @@
 dotnet ef migrations remove -c SqliteContext -f -p src/NadekoBot/NadekoBot.csproj
 dotnet ef migrations remove -c PostgreSqlContext -f -p src/NadekoBot/NadekoBot.csproj
-dotnet ef migrations remove -c MysqlContext -f -p src/NadekoBot/NadekoBot.csproj
 

src/NadekoBot.Generators/GrpcApiPermGenerator.cs

@@ -0,0 +1,184 @@
+#nullable enable
+using System.CodeDom.Compiler;
+using System.Collections.Immutable;
+using System.Diagnostics;
+using System.Text;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using Newtonsoft.Json;
+
+namespace NadekoBot.Generators
+{
+    public readonly record struct MethodPermData
+    {
+        public readonly ImmutableArray<(string Name, string Value)> MethodPerms;
+        public readonly ImmutableArray<string> NoAuthRequired;
+
+        public MethodPermData(ImmutableArray<(string Name, string Value)> methodPerms,
+            ImmutableArray<string> noAuthRequired)
+        {
+            MethodPerms = methodPerms;
+            NoAuthRequired = noAuthRequired;
+        }
+    }
+
+
+    [Generator]
+    public class GrpcApiPermGenerator : IIncrementalGenerator
+    {
+        public const string GRPC_API_PERM_ATTRIBUTE =
+            """
+            namespace NadekoBot.GrpcApi;
+
+            [System.AttributeUsage(System.AttributeTargets.Method)]
+            public class GrpcApiPermAttribute : System.Attribute
+            {
+                public GuildPerm Value { get; }
+                public GrpcApiPermAttribute(GuildPerm value) => Value = value;
+            }
+            """;
+        
+        public const string GRPC_NO_AUTH_REQUIRED_ATTRIBUTE =
+            """
+            namespace NadekoBot.GrpcApi;
+
+            [System.AttributeUsage(System.AttributeTargets.Method)]
+            public class GrpcNoAuthRequiredAttribute : System.Attribute
+            {
+            }
+            """;
+
+        public void Initialize(IncrementalGeneratorInitializationContext context)
+        {
+            context.RegisterPostInitializationOutput(ctx => ctx.AddSource("GrpcApiPermAttribute.cs",
+                SourceText.From(GRPC_API_PERM_ATTRIBUTE, Encoding.UTF8)));
+            
+            context.RegisterPostInitializationOutput(ctx => ctx.AddSource("GrpcNoAuthRequiredAttribute.cs",
+                SourceText.From(GRPC_NO_AUTH_REQUIRED_ATTRIBUTE, Encoding.UTF8)));
+
+            var perms = context.SyntaxProvider
+                .ForAttributeWithMetadataName(
+                    "NadekoBot.GrpcApi.GrpcApiPermAttribute",
+                    predicate: static (s, _) => s is MethodDeclarationSyntax,
+                    transform: static (ctx, _) => GetMethodSemanticTargets(ctx.SemanticModel, ctx.TargetNode))
+                .Where(static m => m is not null)
+                .Select(static (x, _) => x!.Value)
+                .Collect();
+
+
+            var all = context.SyntaxProvider
+                .ForAttributeWithMetadataName(
+                    "NadekoBot.GrpcApi.GrpcNoAuthRequiredAttribute",
+                    predicate: static (s, _) => s is MethodDeclarationSyntax,
+                    transform: static (ctx, _) => GetNoAuthMethodName(ctx.SemanticModel, ctx.TargetNode))
+                .Collect()
+                .Combine(perms)
+                .Select((x, _) => new MethodPermData(x.Right, x.Left));
+                
+            context.RegisterSourceOutput(all,
+                static (spc, source) => Execute(source, spc));
+        }
+
+        private static string GetNoAuthMethodName(SemanticModel model, SyntaxNode node)
+            => ((MethodDeclarationSyntax)node).Identifier.Text;
+
+        private static (string Name, string Value)? GetMethodSemanticTargets(SemanticModel model, SyntaxNode node)
+        {
+            var method = (MethodDeclarationSyntax)node;
+
+            var name = method.Identifier.Text;
+            var attr = method.AttributeLists
+                .SelectMany(x => x.Attributes)
+                .FirstOrDefault();
+
+            if (attr is null)
+                return null;
+
+            return (name, attr.ArgumentList?.Arguments[0].ToString() ?? "__missing_perm__");
+        }
+
+        private static void Execute(MethodPermData data, SourceProductionContext ctx)
+        {
+            using (var stringWriter = new StringWriter())
+            using (var sw = new IndentedTextWriter(stringWriter))
+            {
+                sw.WriteLine("using System.Collections.Frozen;");
+                sw.WriteLine();
+                sw.WriteLine("namespace NadekoBot.GrpcApi;");
+                sw.WriteLine();
+
+                sw.WriteLine("public partial class GrpcApiPermsInterceptor");
+                sw.WriteLine("{");
+
+                sw.Indent++;
+
+                sw.WriteLine(
+                    "private static FrozenDictionary<string, GuildPerm> _perms = new Dictionary<string, GuildPerm>()");
+                sw.WriteLine("{");
+
+                sw.Indent++;
+                foreach (var field in data.MethodPerms)
+                {
+                    sw.WriteLine("{{ \"{0}\", {1} }},", field.Name, field.Value);
+                }
+
+                sw.Indent--;
+                sw.WriteLine("}.ToFrozenDictionary();");
+
+                sw.WriteLine();
+                sw.WriteLine("private static FrozenSet<string> _noAuthRequired = new HashSet<string>()");
+                sw.WriteLine("{");
+
+                sw.Indent++;
+                foreach (var noauth in data.NoAuthRequired)
+                {
+                    sw.WriteLine("{{ \"{0}\" }},", noauth);
+                }
+
+                sw.WriteLine("");
+
+                sw.Indent--;
+                sw.WriteLine("}.ToFrozenSet();");
+
+                sw.Indent--;
+                sw.WriteLine("}");
+
+                sw.Flush();
+                ctx.AddSource("GrpcApiInterceptor.g.cs", stringWriter.ToString());
+            }
+        }
+
+        private List<TranslationPair> GetFields(string? dataText)
+        {
+            if (string.IsNullOrWhiteSpace(dataText))
+                return new();
+
+            Dictionary<string, string> data;
+            try
+            {
+                var output = JsonConvert.DeserializeObject<Dictionary<string, string>>(dataText!);
+                if (output is null)
+                    return new();
+
+                data = output;
+            }
+            catch
+            {
+                Debug.WriteLine("Failed parsing responses file.");
+                return new();
+            }
+
+            var list = new List<TranslationPair>();
+            foreach (var entry in data)
+            {
+                list.Add(new(
+                    entry.Key,
+                    entry.Value
+                ));
+            }
+
+            return list;
+        }
+    }
+}

src/NadekoBot.Generators/NadekoBot.Generators.csproj

@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" PrivateAssets="all" />
         <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" PrivateAssets="all" GeneratePathProperty="true" />
     </ItemGroup>

src/NadekoBot.GrpcApiBase/NadekoBot.GrpcApiBase.csproj

@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+    
+    <ItemGroup>
+        <PackageReference Include="Google.Protobuf" Version="3.28.2" />
+        <PackageReference Include="Grpc" Version="2.46.6" />
+        <PackageReference Include="Grpc.Tools" Version="2.66.0" PrivateAssets="All" />
+    </ItemGroup>
+    
+    <ItemGroup>
+        <Protobuf Include="protos/*.proto">
+            <GrpcServices>Server</GrpcServices>
+        </Protobuf>
+    </ItemGroup>
+
+</Project>

src/NadekoBot.GrpcApiBase/protos/canvas.proto

@@ -0,0 +1,47 @@
+syntax = "proto3";
+
+option csharp_namespace = "NadekoBot.GrpcApi";
+
+import "google/protobuf/empty.proto";
+
+package ncanvas;
+
+service GrpcNCanvas {
+  rpc GetCanvas(google.protobuf.Empty) returns (CanvasReply);
+  rpc GetPixel(GetPixelRequest) returns (GetPixelReply);
+  rpc SetPixel(SetPixelRequest) returns (SetPixelReply);
+}
+
+message CanvasReply {
+  repeated uint32 pixels = 1;
+  int32 width = 2;
+  int32 height = 3;
+}
+
+message GetPixelRequest {
+  int32 x = 1;
+  int32 y = 2;
+}
+
+message GetPixelReply {
+  string color = 1;
+  uint32 packedColor = 2;
+  int32 positionX = 3;
+  int32 positionY = 4;
+  int64 price = 5;
+  string text = 6;
+  string position = 7;
+}
+
+message SetPixelRequest {
+  string position = 1;
+  string color = 2;
+  string text = 3;
+  int64 price = 4;
+}
+
+message SetPixelReply {
+  string error = 1;
+  bool success = 2;
+  optional GetPixelReply pixel = 3;
+}

src/NadekoBot.GrpcApiBase/protos/exprs.proto

@@ -0,0 +1,89 @@
+syntax = "proto3";
+
+option csharp_namespace = "NadekoBot.GrpcApi";
+
+import "google/protobuf/empty.proto";
+
+package exprs;
+
+service GrpcExprs {
+  rpc GetExprs(GetExprsRequest) returns (GetExprsReply);
+  rpc AddExpr(AddExprRequest) returns (AddExprReply);
+  rpc DeleteExpr(DeleteExprRequest) returns (google.protobuf.Empty);
+
+  rpc GetQuotes(GetQuotesRequest) returns (GetQuotesReply);
+  rpc AddQuote(AddQuoteRequest) returns (AddQuoteReply);
+  rpc DeleteQuote(DeleteQuoteRequest) returns (google.protobuf.Empty);
+}
+
+message DeleteExprRequest {
+  string id = 1;
+  uint64 guildId = 2;
+}
+
+message GetExprsRequest {
+  uint64 guildId = 1;
+  string query = 2;
+  int32 page = 3;
+}
+
+message GetExprsReply {
+  repeated ExprDto expressions = 1;
+  int32 totalCount = 2;
+}
+
+message ExprDto {
+  string id = 1;
+  string trigger = 2;
+  string response = 3;
+
+  bool ca = 4;
+  bool ad = 5;
+  bool dm = 6;
+  bool at = 7;
+}
+
+message AddExprRequest {
+  uint64 guildId = 1;
+  ExprDto expr = 2;
+}
+
+message AddExprReply {
+  string id = 1;
+  bool success = 2;
+}
+
+message GetQuotesRequest {
+  uint64 guildId = 1;
+  string query = 2;
+  int32 page = 3;
+}
+
+message GetQuotesReply {
+  repeated QuoteDto quotes = 1;
+  int32 totalCount = 2;
+}
+
+message QuoteDto {
+  string id = 1;
+  string trigger = 2;
+  string response = 3;
+
+  uint64 authorId = 4;
+  string authorName = 5;
+}
+
+message AddQuoteRequest {
+  uint64 guildId = 1;
+  QuoteDto quote = 2;
+}
+
+message AddQuoteReply {
+  string id = 1;
+  bool success = 2;
+}
+
+message DeleteQuoteRequest {
+  string id = 1;
+  uint64 guildId = 2;
+}

src/NadekoBot.GrpcApiBase/protos/fin.proto

@@ -0,0 +1,60 @@
+syntax = "proto3";
+
+option csharp_namespace = "NadekoBot.GrpcApi";
+
+import "google/protobuf/timestamp.proto";
+
+package fin;
+
+service GrpcFin {
+  rpc GetTransactions(GetTransactionsRequest) returns (GetTransactionsReply);
+  rpc GetHoldings(GetHoldingsRequest) returns (GetHoldingsReply);
+  rpc Withdraw(WithdrawRequest) returns (WithdrawReply);
+  rpc Deposit(DepositRequest) returns (DepositReply);
+}
+
+message GetTransactionsRequest {
+  int32 page = 1;
+  uint64 userId = 2;
+}
+
+message GetTransactionsReply {
+  repeated TransactionReply transactions = 1;
+  int32 total = 2;
+}
+
+message TransactionReply {
+  int64 amount = 1;
+  string note = 2;
+  string type = 3;
+  string extra = 4;
+  google.protobuf.Timestamp timestamp = 5;
+  string id = 6;
+}
+
+message GetHoldingsRequest {
+  uint64 userId = 1;
+}
+
+message GetHoldingsReply {
+  int64 cash = 1;
+  int64 bank = 2;
+}
+
+message WithdrawRequest {
+  uint64 userId = 1;
+  int64 amount = 2;
+}
+
+message WithdrawReply {
+  bool success = 1;
+}
+
+message DepositRequest {
+  uint64 userId = 1;
+  int64 amount = 2;
+}
+
+message DepositReply {
+  bool success = 1;
+}

src/NadekoBot.GrpcApiBase/protos/greet.proto

@@ -0,0 +1,51 @@
+syntax = "proto3";
+
+option csharp_namespace = "NadekoBot.GrpcApi";
+
+package greet;
+
+service GrpcGreet {
+  rpc GetGreetSettings (GetGreetRequest) returns (GrpcGreetSettings);
+  rpc UpdateGreet (UpdateGreetRequest) returns (UpdateGreetReply);
+  rpc TestGreet (TestGreetRequest) returns (TestGreetReply);
+}
+
+message GrpcGreetSettings {
+  string channelId = 1;
+  string message = 2;
+  bool isEnabled = 3;
+  GrpcGreetType type = 4;
+}
+
+message GetGreetRequest {
+  uint64 guildId = 1;
+  GrpcGreetType type = 2;
+}
+
+message UpdateGreetRequest {
+  uint64 guildId = 1;
+  GrpcGreetSettings settings = 2;
+}
+
+enum GrpcGreetType {
+  Greet = 0;
+  GreetDm = 1;
+  Bye = 2;
+  Boost = 3;
+}
+
+message UpdateGreetReply {
+  bool Success = 1;
+}
+
+message TestGreetRequest {
+  uint64 guildId = 1;
+  uint64 channelId = 2;
+  uint64 userId = 3;
+  GrpcGreetType type = 4;
+}
+
+message TestGreetReply {
+  bool success = 1;
+  string error = 2;
+}

src/NadekoBot.GrpcApiBase/protos/other.proto

@@ -0,0 +1,144 @@
+syntax = "proto3";
+
+option csharp_namespace = "NadekoBot.GrpcApi";
+
+import "google/protobuf/empty.proto";
+
+package other;
+
+service GrpcOther {
+  rpc BotOnGuild(BotOnGuildRequest) returns (BotOnGuildReply);
+  rpc GetTextChannels(GetTextChannelsRequest) returns (GetTextChannelsReply);
+  rpc GetRoles(GetRolesRequest) returns (GetRolesReply);
+
+  rpc GetCurrencyLb(GetLbRequest) returns (CurrencyLbReply);
+  rpc GetXpLb(GetLbRequest) returns (XpLbReply);
+  rpc GetWaifuLb(GetLbRequest) returns (WaifuLbReply);
+
+  rpc GetShardStats(google.protobuf.Empty) returns (stream ShardStatsReply);
+  rpc GetCommandFeed(google.protobuf.Empty) returns (stream CommandFeedEntry);
+  rpc GetServerInfo(ServerInfoRequest) returns (GetServerInfoReply);
+}
+
+message CommandFeedEntry {
+  string command = 1;
+}
+
+message GetRolesRequest {
+  uint64 guildId = 1;
+}
+
+message GetRolesReply {
+  repeated RoleReply roles = 1;
+}
+
+message BotOnGuildRequest {
+  uint64 guildId = 1;
+}
+
+message BotOnGuildReply {
+  bool success = 1;
+}
+
+message ShardStatsReply {
+  int32 id = 1;
+  string status = 2;
+
+  int32 guildCount = 3;
+  string uptime = 4;
+  int64 commands = 5;
+}
+
+message GetTextChannelsRequest{
+  uint64 guildId = 1;
+}
+
+message GetTextChannelsReply {
+  repeated TextChannelReply textChannels = 1;
+}
+
+message TextChannelReply {
+  uint64 id = 1;
+  string name = 2;
+}
+
+message CurrencyLbReply {
+  repeated CurrencyLbEntryReply entries = 1;
+}
+
+message CurrencyLbEntryReply {
+  string user = 1;
+  uint64 userId = 2;
+  int64 amount = 3;
+  string avatar = 4;
+}
+
+message GetLbRequest {
+  int32 page = 1;
+  int32 perPage = 2;
+}
+
+message XpLbReply {
+  repeated XpLbEntryReply entries = 1;
+}
+
+message XpLbEntryReply {
+  string user = 1;
+  uint64 userId = 2;
+  int64 totalXp = 3;
+  int64 level = 4;
+}
+
+message WaifuLbReply {
+  repeated WaifuLbEntry entries = 1;
+}
+
+message WaifuLbEntry {
+  string user = 1;
+  string claimedBy = 2;
+  int64 value = 3;
+  bool isMutual = 4;
+}
+
+message ServerInfoRequest {
+  uint64 guildId = 1;
+}
+
+message GetServerInfoReply {
+  uint64 id = 1;
+  string name = 2;
+  string iconUrl = 3;
+  uint64 ownerId = 4;
+  string ownerName = 5;
+  repeated RoleReply roles = 6;
+  repeated EmojiReply emojis = 7;
+  repeated string features = 8;
+  int32 textChannels = 9;
+  int32 voiceChannels = 10;
+  int32 memberCount = 11;
+  int64 createdAt = 12;
+}
+
+message RoleReply {
+  uint64 id = 1;
+  string name = 2;
+  string iconUrl = 3;
+  string color = 4;
+}
+
+message EmojiReply {
+  string name = 1;
+  string url = 2;
+  string code = 3;
+}
+
+message ChannelReply {
+  uint64 id = 1;
+  string name = 2;
+  ChannelType type = 3;
+}
+
+enum ChannelType {
+  Text = 0;
+  Voice = 1;
+}

src/NadekoBot.GrpcApiBase/protos/warn.proto

@@ -0,0 +1,107 @@
+syntax = "proto3";
+
+option csharp_namespace = "NadekoBot.GrpcApi";
+
+package warn;
+
+service GrpcWarn {
+  rpc GetWarnSettings (WarnSettingsRequest) returns (WarnSettingsReply);
+
+  rpc SetWarnExpiry(SetWarnExpiryRequest) returns (SetWarnExpiryReply);
+  rpc AddWarnp (AddWarnpRequest) returns (AddWarnpReply);
+  rpc DeleteWarnp (DeleteWarnpRequest) returns (DeleteWarnpReply);
+
+  rpc GetLatestWarnings(GetLatestWarningsRequest) returns (GetLatestWarningsReply);
+  rpc GetUserWarnings(GetUserWarningsRequest) returns (GetUserWarningsReply);
+
+  rpc ForgiveWarning(ForgiveWarningRequest) returns (ForgiveWarningReply);
+  rpc DeleteWarning(ForgiveWarningRequest) returns (ForgiveWarningReply);
+
+}
+message WarnSettingsRequest {
+  uint64 guildId = 1;
+}
+
+message WarnPunishment {
+  int32 threshold = 1;
+  string action = 2;
+  int32 duration = 3;
+  string role = 4;
+}
+
+message WarnSettingsReply {
+  repeated WarnPunishment punishments = 1;
+  int32 expiryDays = 2;
+  bool deleteOnExpire = 3;
+}
+
+message AddWarnpRequest {
+  uint64 guildId = 1;
+  WarnPunishment punishment = 2;
+}
+
+message AddWarnpReply {
+  bool success = 1;
+}
+
+message DeleteWarnpRequest {
+  uint64 guildId = 1;
+  int32 threshold = 2;
+}
+
+message DeleteWarnpReply {
+  bool success = 1;
+}
+
+message GetUserWarningsRequest {
+  uint64 guildId = 1;
+  string user = 2;
+  int32 page = 3;
+}
+
+message GetUserWarningsReply {
+  repeated Warning warnings = 1;
+  int32 totalCount = 2;
+}
+
+message Warning {
+  string id = 1;
+  string reason = 2;
+  int64 timestamp = 3;
+  int64 weight = 4;
+  bool forgiven = 5;
+  string forgivenBy = 6;
+  string user = 7;
+  uint64 userId = 8;
+  string moderator = 9;
+}
+
+message ForgiveWarningRequest {
+  uint64 guildId = 1;
+  string warnId = 2;
+  string modName = 3;
+}
+
+message ForgiveWarningReply {
+  bool success = 1;
+}
+
+message SetWarnExpiryRequest {
+  uint64 guildId = 1;
+  int32 expiryDays = 2;
+  bool deleteOnExpire = 3;
+}
+
+message SetWarnExpiryReply {
+  bool success = 1;
+}
+
+message GetLatestWarningsRequest {
+  uint64 guildId = 1;
+  int32 page = 2;
+}
+
+message GetLatestWarningsReply {
+  repeated Warning warnings = 1;
+  int32 totalCount = 2;
+}

src/NadekoBot.GrpcApiBase/protos/xp.proto

@@ -0,0 +1,108 @@
+syntax = "proto3";
+
+option csharp_namespace = "NadekoBot.GrpcApi";
+
+package xp;
+
+service GrpcXp {
+  rpc GetXpLb(GetXpLbRequest) returns (GetXpLbReply);
+  rpc ResetUserXp(ResetUserXpRequest) returns (ResetUserXpReply);
+  
+  rpc GetXpSettings(GetXpSettingsRequest) returns (GetXpSettingsReply);
+  
+  rpc AddExclusion(AddExclusionRequest) returns (AddExclusionReply);
+  rpc DeleteExclusion(DeleteExclusionRequest) returns (DeleteExclusionReply);
+  
+  rpc AddReward(AddRewardRequest) returns (AddRewardReply);
+  rpc DeleteReward(DeleteRewardRequest) returns (DeleteRewardReply);
+}
+
+message GetXpLbRequest {
+  uint64 guildId = 1;
+  int32 page = 2;
+}
+
+message GetXpLbReply {
+  repeated XpLbUserReply users = 1;
+  int32 total = 2;
+}
+
+message XpLbUserReply {
+  uint64 userId = 1;
+  string username = 2;
+  int64 xp = 3;
+  int64 level = 4;
+  string avatar = 5;
+}
+
+message ResetUserXpRequest {
+  uint64 guildId = 1;
+  uint64 userId = 2;
+}
+
+message ResetUserXpReply {
+  bool success = 1;
+}
+
+message GetXpSettingsReply {
+  repeated ExclItemReply exclusions = 1;
+  repeated RewItemReply rewards = 2;
+  bool serverExcluded = 3;
+}
+
+message GetXpSettingsRequest {
+  uint64 guildId = 1;
+}
+
+message ExclItemReply {
+  string type = 1;
+  uint64 id = 2;
+  string name = 3;
+}
+
+message RewItemReply {
+  int32 level = 1;
+  string type = 2;
+  string value = 3;
+}
+
+message AddExclusionRequest {
+  uint64 guildId = 1;
+  string type = 2;
+  uint64 id = 3;
+}
+
+message AddExclusionReply {
+  bool success = 1;
+}
+
+message DeleteExclusionRequest {
+  uint64 guildId = 1;
+  string type = 2;
+  uint64 id = 3;
+}
+
+message DeleteExclusionReply {
+  bool success = 1;
+}
+
+message AddRewardRequest {
+  uint64 guildId = 1;
+  int32 level = 2;
+  string type = 3;
+  string value = 4;
+}
+
+message AddRewardReply {
+  bool success = 1;
+}
+
+message DeleteRewardRequest {
+  uint64 guildId = 1;
+  int32 level = 2;
+  string type = 3;
+}
+
+message DeleteRewardReply {
+  bool success = 1;
+}

src/NadekoBot.Tests/GroupGreetTests.cs

@@ -1,76 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using Nadeko.Common;
-using NadekoBot.Services;
-using NUnit.Framework;
-
-namespace NadekoBot.Tests
-{
-    public class GroupGreetTests
-    {
-        private GreetGrouper<int> _grouper;
-
-        [SetUp]
-        public void Setup()
-            => _grouper = new GreetGrouper<int>();
-
-        [Test]
-        public void CreateTest()
-        {
-            var created = _grouper.CreateOrAdd(0, 5);
-            
-            Assert.True(created);
-        }
-        
-        [Test]
-        public void CreateClearTest()
-        {
-            _grouper.CreateOrAdd(0, 5);
-            _grouper.ClearGroup(0, 5, out var items);
-
-            Assert.AreEqual(0, items.Count());
-        }
-        
-        [Test]
-        public void NotCreatedTest()
-        {
-            _grouper.CreateOrAdd(0, 5);
-            var created = _grouper.CreateOrAdd(0, 4);
-            
-            Assert.False(created);
-        }
-        
-        [Test]
-        public void ClearAddedTest()
-        {
-            _grouper.CreateOrAdd(0, 5);
-            _grouper.CreateOrAdd(0, 4);
-            _grouper.ClearGroup(0, 5, out var items);
-
-            var list = items.ToList();
-            
-            Assert.AreEqual(1, list.Count, $"Count was {list.Count}");
-            Assert.AreEqual(4, list[0]);
-        }
-
-        [Test]
-        public async Task ClearManyTest()
-        {
-            _grouper.CreateOrAdd(0, 5);
-            
-            // add 15 items
-            await Enumerable.Range(10, 15)
-                .Select(x => Task.Run(() => _grouper.CreateOrAdd(0, x))).WhenAll();
-            
-            // get 5 at most
-            _grouper.ClearGroup(0, 5, out var items);
-            var list = items.ToList();
-            Assert.AreEqual(5, list.Count, $"Count was {list.Count}");
-
-            // try to get 15, but there should be 10 left
-            _grouper.ClearGroup(0, 15, out items);
-            list = items.ToList();
-            Assert.AreEqual(10, list.Count, $"Count was {list.Count}");
-        }
-    }
-}

src/NadekoBot/Bot.cs

@@ -1,5 +1,6 @@
 #nullable disable
 using DryIoc;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.DependencyInjection;
 using NadekoBot.Common.Configs;
@@ -24,7 +25,7 @@ public sealed class Bot : IBot
     public bool IsReady { get; private set; }
     public int ShardId { get; set; }
 
-    private readonly IBotCredentials _creds;
+    private readonly IBotCreds _creds;
     private readonly CommandService _commandService;
     private readonly DbService _db;
 
@@ -41,6 +42,9 @@ public sealed class Bot : IBot
         _credsProvider = new BotCredsProvider(totalShards, credPath);
         _creds = _credsProvider.GetCreds();
 
+        LogSetup.SetupLogger(shardId, _creds);
+        Log.Information("Pid: {ProcessId}", Environment.ProcessId);
+
         _db = new NadekoDbService(_credsProvider);
 
         var messageCacheSize =
@@ -88,18 +92,18 @@ public sealed class Bot : IBot
 
 
     public IReadOnlyList<ulong> GetCurrentGuildIds()
-        => Client.Guilds.Select(x => x.Id).ToList().ToList();
+        => Client.Guilds.Select(x => x.Id).ToList().AsReadOnly();
 
-    private void AddServices()
+    private async Task AddServices()
     {
-        var startingGuildIdList = GetCurrentGuildIds();
+        var startingGuildIdList = GetCurrentGuildIds().ToList();
         var startTime = Stopwatch.GetTimestamp();
         var bot = Client.CurrentUser;
 
-        using (var uow = _db.GetDbContext())
+        await using (var uow = _db.GetDbContext())
         {
+            AllGuildConfigs = await uow.GuildConfigs.GetAllGuildConfigs(startingGuildIdList);
             uow.EnsureUserCreated(bot.Id, bot.Username, bot.Discriminator, bot.AvatarId);
-            AllGuildConfigs = uow.Set<GuildConfig>().GetAllGuildConfigs(startingGuildIdList).ToImmutableArray();
         }
 
         // var svcs = new StandardKernel(new NinjectSettings()
@@ -109,12 +113,12 @@ public sealed class Bot : IBot
         // });
 
         var svcs = new Container();
-        
+
         // this is required in order for medusa unloading to work
         // svcs.Components.Remove<IPlanner, Planner>();
         // svcs.Components.Add<IPlanner, RemovablePlanner>();
 
-        svcs.AddSingleton<IBotCredentials>(_ => _credsProvider.GetCreds());
+        svcs.AddSingleton<IBotCreds>(_ => _credsProvider.GetCreds());
         svcs.AddSingleton<DbService, DbService>(_db);
         svcs.AddSingleton<IBotCredsProvider>(_credsProvider);
         svcs.AddSingleton<DiscordSocketClient>(Client);
@@ -160,8 +164,9 @@ public sealed class Bot : IBot
         {
             LoadTypeReaders(a);
         }
-        
-        Log.Information("All services loaded in {ServiceLoadTime:F2}s", Stopwatch.GetElapsedTime(startTime) .TotalSeconds);
+
+        Log.Information("All services loaded in {ServiceLoadTime:F2}s",
+            Stopwatch.GetElapsedTime(startTime).TotalSeconds);
     }
 
     private void LoadTypeReaders(Assembly assembly)
@@ -261,11 +266,11 @@ public sealed class Bot : IBot
         var startTime = Stopwatch.GetTimestamp();
 
         await LoginAsync(_creds.Token);
-        
+
         Log.Information("Shard {ShardId} loading services...", Client.ShardId);
         try
         {
-            AddServices();
+            await AddServices();
         }
         catch (Exception ex)
         {
@@ -273,7 +278,9 @@ public sealed class Bot : IBot
             Helpers.ReadErrorAndExit(9);
         }
 
-        Log.Information("Shard {ShardId} connected in {Elapsed:F2}s", Client.ShardId, Stopwatch.GetElapsedTime(startTime).TotalSeconds);
+        Log.Information("Shard {ShardId} connected in {Elapsed:F2}s",
+            Client.ShardId,
+            Stopwatch.GetElapsedTime(startTime).TotalSeconds);
         var commandHandler = Services.GetRequiredService<CommandHandler>();
 
         // start handling messages received in commandhandler
@@ -338,26 +345,26 @@ public sealed class Bot : IBot
         if (arg.Exception is { InnerException: WebSocketClosedException { CloseCode: 4014 } })
         {
             Log.Error("""
-                Login failed.
-                
-                *** Please enable privileged intents ***
-                
-                Certain Nadeko features require Discord's privileged gateway intents.
-                These include greeting and goodbye messages, as well as creating the Owner message channels for DM forwarding.
-                
-                How to enable privileged intents:
-                1. Head over to the Discord Developer Portal https://discord.com/developers/applications/
-                2. Select your Application.
-                3. Click on `Bot` in the left side navigation panel, and scroll down to the intents section.
-                4. Enable all intents.
-                5. Restart your bot.
-                
-                Read this only if your bot is in 100 or more servers:
-                
-                You'll need to apply to use the intents with Discord, but for small selfhosts, all that is required is enabling the intents in the developer portal.
-                Yes, this is a new thing from Discord, as of October 2020. No, there's nothing we can do about it. Yes, we're aware it worked before.
-                While waiting for your bot to be accepted, you can change the 'usePrivilegedIntents' inside your creds.yml to 'false', although this will break many of the nadeko's features
-                """);
+                      Login failed.
+
+                      *** Please enable privileged intents ***
+
+                      Certain Nadeko features require Discord's privileged gateway intents.
+                      These include greeting and goodbye messages, as well as creating the Owner message channels for DM forwarding.
+
+                      How to enable privileged intents:
+                      1. Head over to the Discord Developer Portal https://discord.com/developers/applications/
+                      2. Select your Application.
+                      3. Click on `Bot` in the left side navigation panel, and scroll down to the intents section.
+                      4. Enable all intents.
+                      5. Restart your bot.
+
+                      Read this only if your bot is in 100 or more servers:
+
+                      You'll need to apply to use the intents with Discord, but for small selfhosts, all that is required is enabling the intents in the developer portal.
+                      Yes, this is a new thing from Discord, as of October 2020. No, there's nothing we can do about it. Yes, we're aware it worked before.
+                      While waiting for your bot to be accepted, you can change the 'usePrivilegedIntents' inside your creds.yml to 'false', although this will break many of the nadeko's features
+                      """);
             return Task.CompletedTask;
         }
 

src/NadekoBot/Db/Extensions/DiscordUserExtensions.cs

@@ -25,7 +25,6 @@ public static class DiscordUserExtensions
                   {
                       UserId = userId,
                       Username = username,
-                      Discriminator = discrim,
                       AvatarId = avatarId,
                       TotalXp = 0,
                       CurrencyAmount = 0
@@ -33,7 +32,6 @@ public static class DiscordUserExtensions
                   old => new()
                   {
                       Username = username,
-                      Discriminator = discrim,
                       AvatarId = avatarId
                   },
                   () => new()
@@ -49,8 +47,7 @@ public static class DiscordUserExtensions
                   () => new()
                   {
                       UserId = userId,
-                      Username = "Unknown",
-                      Discriminator = "????",
+                      Username = "??Unknown",
                       AvatarId = string.Empty,
                       TotalXp = 0,
                       CurrencyAmount = 0
@@ -87,14 +84,7 @@ public static class DiscordUserExtensions
                             > users.AsQueryable().Where(y => y.UserId == id).Select(y => y.TotalXp).FirstOrDefault())
                 .Count()
            + 1;
-
-    public static async Task<IReadOnlyCollection<DiscordUser>> GetUsersXpLeaderboardFor(this DbSet<DiscordUser> users, int page, int perPage)
-        => await users.ToLinqToDBTable()
-                      .OrderByDescending(x => x.TotalXp)
-                      .Skip(page * perPage)
-                      .Take(perPage)
-                      .ToArrayAsyncLinqToDB();
-
+    
     public static Task<List<DiscordUser>> GetTopRichest(
         this DbSet<DiscordUser> users,
         ulong botId,

src/NadekoBot/Db/Extensions/GuildConfigExtensions.cs

@@ -1,4 +1,5 @@
 #nullable disable
+using LinqToDB.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Db.Models;
 
@@ -32,8 +33,8 @@ public static class GuildConfigExtensions
     {
         var conf = ctx.GuildConfigsForId(guildId,
             set => set.Include(y => y.StreamRole)
-                .Include(y => y.StreamRole.Whitelist)
-                .Include(y => y.StreamRole.Blacklist));
+                      .Include(y => y.StreamRole.Whitelist)
+                      .Include(y => y.StreamRole.Blacklist));
 
         if (conf.StreamRole is null)
             conf.StreamRole = new();
@@ -42,19 +43,27 @@ public static class GuildConfigExtensions
     }
 
     private static IQueryable<GuildConfig> IncludeEverything(this DbSet<GuildConfig> configs)
-        => configs.AsQueryable()
-            .AsSplitQuery()
-            .Include(gc => gc.CommandCooldowns)
-            .Include(gc => gc.FollowedStreams)
-            .Include(gc => gc.StreamRole)
-            .Include(gc => gc.XpSettings)
-            .ThenInclude(x => x.ExclusionList)
-            .Include(gc => gc.DelMsgOnCmdChannels);
+        => configs
+           .AsSplitQuery()
+           .Include(gc => gc.CommandCooldowns)
+           .Include(gc => gc.FollowedStreams)
+           .Include(gc => gc.StreamRole)
+           .Include(gc => gc.DelMsgOnCmdChannels)
+           .Include(gc => gc.XpSettings)
+           .ThenInclude(x => x.ExclusionList);
 
-    public static IEnumerable<GuildConfig> GetAllGuildConfigs(
+    public static async Task<GuildConfig[]> GetAllGuildConfigs(
         this DbSet<GuildConfig> configs,
-        IReadOnlyList<ulong> availableGuilds)
-        => configs.IncludeEverything().AsNoTracking().Where(x => availableGuilds.Contains(x.GuildId)).ToList();
+        List<ulong> availableGuilds)
+    {
+        var result = await configs
+                           .IncludeEverything()
+                           .Where(x => availableGuilds.Contains(x.GuildId))
+                           .AsNoTracking()
+                           .ToArrayAsync();
+
+        return result;
+    }
 
     /// <summary>
     ///     Gets and creates if it doesn't exist a config for a guild.
@@ -80,20 +89,19 @@ public static class GuildConfigExtensions
 
         if (config is null)
         {
-            ctx.Set<GuildConfig>().Add(config = new()
-            {
-                GuildId = guildId,
-                Permissions = Permissionv2.GetDefaultPermlist,
-                WarningsInitialized = true,
-                WarnPunishments = DefaultWarnPunishments
-            });
+            ctx.Set<GuildConfig>()
+               .Add(config = new()
+               {
+                   GuildId = guildId,
+                   Permissions = Permissionv2.GetDefaultPermlist,
+                   WarningsInitialized = true,
+               });
             ctx.SaveChanges();
         }
 
         if (!config.WarningsInitialized)
         {
             config.WarningsInitialized = true;
-            config.WarnPunishments = DefaultWarnPunishments;
         }
 
         return config;
@@ -122,18 +130,18 @@ public static class GuildConfigExtensions
     public static LogSetting LogSettingsFor(this DbContext ctx, ulong guildId)
     {
         var logSetting = ctx.Set<LogSetting>()
-            .AsQueryable()
-            .Include(x => x.LogIgnores)
-            .Where(x => x.GuildId == guildId)
-            .FirstOrDefault();
+                            .AsQueryable()
+                            .Include(x => x.LogIgnores)
+                            .Where(x => x.GuildId == guildId)
+                            .FirstOrDefault();
 
         if (logSetting is null)
         {
             ctx.Set<LogSetting>()
-                .Add(logSetting = new()
-                {
-                    GuildId = guildId
-                });
+               .Add(logSetting = new()
+               {
+                   GuildId = guildId
+               });
             ctx.SaveChanges();
         }
 
@@ -149,18 +157,20 @@ public static class GuildConfigExtensions
 
     public static GuildConfig GcWithPermissionsFor(this DbContext ctx, ulong guildId)
     {
-        var config = ctx.Set<GuildConfig>().AsQueryable()
-            .Where(gc => gc.GuildId == guildId)
-            .Include(gc => gc.Permissions)
-            .FirstOrDefault();
+        var config = ctx.Set<GuildConfig>()
+                        .AsQueryable()
+                        .Where(gc => gc.GuildId == guildId)
+                        .Include(gc => gc.Permissions)
+                        .FirstOrDefault();
 
         if (config is null) // if there is no guildconfig, create new one
         {
-            ctx.Set<GuildConfig>().Add(config = new()
-            {
-                GuildId = guildId,
-                Permissions = Permissionv2.GetDefaultPermlist
-            });
+            ctx.Set<GuildConfig>()
+               .Add(config = new()
+               {
+                   GuildId = guildId,
+                   Permissions = Permissionv2.GetDefaultPermlist
+               });
             ctx.SaveChanges();
         }
         else if (config.Permissions is null || !config.Permissions.Any()) // if no perms, add default ones
@@ -177,21 +187,21 @@ public static class GuildConfigExtensions
 
     public static IEnumerable<FollowedStream> GetFollowedStreams(this DbSet<GuildConfig> configs, List<ulong> included)
         => configs.AsQueryable()
-            .Where(gc => included.Contains(gc.GuildId))
-            .Include(gc => gc.FollowedStreams)
-            .SelectMany(gc => gc.FollowedStreams)
-            .ToList();
+                  .Where(gc => included.Contains(gc.GuildId))
+                  .Include(gc => gc.FollowedStreams)
+                  .SelectMany(gc => gc.FollowedStreams)
+                  .ToList();
 
 
     public static XpSettings XpSettingsFor(this DbContext ctx, ulong guildId)
     {
         var gc = ctx.GuildConfigsForId(guildId,
             set => set.Include(x => x.XpSettings)
-                .ThenInclude(x => x.RoleRewards)
-                .Include(x => x.XpSettings)
-                .ThenInclude(x => x.CurrencyRewards)
-                .Include(x => x.XpSettings)
-                .ThenInclude(x => x.ExclusionList));
+                      .ThenInclude(x => x.RoleRewards)
+                      .Include(x => x.XpSettings)
+                      .ThenInclude(x => x.CurrencyRewards)
+                      .Include(x => x.XpSettings)
+                      .ThenInclude(x => x.ExclusionList));
 
         if (gc.XpSettings is null)
             gc.XpSettings = new();
@@ -201,15 +211,15 @@ public static class GuildConfigExtensions
 
     public static IEnumerable<GeneratingChannel> GetGeneratingChannels(this DbSet<GuildConfig> configs)
         => configs.AsQueryable()
-            .Include(x => x.GenerateCurrencyChannelIds)
-            .Where(x => x.GenerateCurrencyChannelIds.Any())
-            .SelectMany(x => x.GenerateCurrencyChannelIds)
-            .Select(x => new GeneratingChannel
-            {
-                ChannelId = x.ChannelId,
-                GuildId = x.GuildConfig.GuildId
-            })
-            .ToArray();
+                  .Include(x => x.GenerateCurrencyChannelIds)
+                  .Where(x => x.GenerateCurrencyChannelIds.Any())
+                  .SelectMany(x => x.GenerateCurrencyChannelIds)
+                  .Select(x => new GeneratingChannel
+                  {
+                      ChannelId = x.ChannelId,
+                      GuildId = x.GuildConfig.GuildId
+                  })
+                  .ToArray();
 
     public class GeneratingChannel
     {

src/NadekoBot/Db/Extensions/QuoteExtensions.cs

@@ -1,53 +0,0 @@
-#nullable disable
-using Microsoft.EntityFrameworkCore;
-using NadekoBot.Db.Models;
-
-namespace NadekoBot.Db;
-
-public static class QuoteExtensions
-{
-    public static IEnumerable<Quote> GetForGuild(this DbSet<Quote> quotes, ulong guildId)
-        => quotes.AsQueryable().Where(x => x.GuildId == guildId);
-
-    public static IReadOnlyCollection<Quote> GetGroup(
-        this DbSet<Quote> quotes,
-        ulong guildId,
-        int page,
-        OrderType order)
-    {
-        var q = quotes.AsQueryable().Where(x => x.GuildId == guildId);
-        if (order == OrderType.Keyword)
-            q = q.OrderBy(x => x.Keyword);
-        else
-            q = q.OrderBy(x => x.Id);
-
-        return q.Skip(15 * page).Take(15).ToArray();
-    }
-
-    public static async Task<Quote> GetRandomQuoteByKeywordAsync(
-        this DbSet<Quote> quotes,
-        ulong guildId,
-        string keyword)
-    {
-        return (await quotes.AsQueryable().Where(q => q.GuildId == guildId && q.Keyword == keyword).ToArrayAsync())
-            .RandomOrDefault();
-    }
-
-    public static async Task<Quote> SearchQuoteKeywordTextAsync(
-        this DbSet<Quote> quotes,
-        ulong guildId,
-        string keyword,
-        string text)
-    {
-        return (await quotes.AsQueryable()
-                            .Where(q => q.GuildId == guildId
-                                        && (keyword == null || q.Keyword == keyword)
-                                        && (EF.Functions.Like(q.Text.ToUpper(), $"%{text.ToUpper()}%")
-                                            || EF.Functions.Like(q.AuthorName, text)))
-                            .ToArrayAsync())
-               .RandomOrDefault();
-    }
-
-    public static void RemoveAllByKeyword(this DbSet<Quote> quotes, ulong guildId, string keyword)
-        => quotes.RemoveRange(quotes.AsQueryable().Where(x => x.GuildId == guildId && x.Keyword.ToUpper() == keyword));
-}

src/NadekoBot/Db/Extensions/UserXpExtensions.cs

@@ -26,17 +26,6 @@ public static class UserXpExtensions
         return usr;
     }
 
-    public static async Task<IReadOnlyCollection<UserXpStats>> GetUsersFor(
-        this DbSet<UserXpStats> xps,
-        ulong guildId,
-        int page)
-        => await xps.ToLinqToDBTable()
-                    .Where(x => x.GuildId == guildId)
-                    .OrderByDescending(x => x.Xp + x.AwardedXp)
-                    .Skip(page * 9)
-                    .Take(9)
-                    .ToArrayAsyncLinqToDB();
-
     public static async Task<List<UserXpStats>> GetTopUserXps(this DbSet<UserXpStats> xps, ulong guildId, int count)
         => await xps.ToLinqToDBTable()
                     .Where(x => x.GuildId == guildId)
@@ -55,9 +44,6 @@ public static class UserXpExtensions
                     .CountAsyncLinqToDB()
            + 1;
 
-    public static void ResetGuildUserXp(this DbSet<UserXpStats> xps, ulong userId, ulong guildId)
-        => xps.Delete(x => x.UserId == userId && x.GuildId == guildId);
-
     public static void ResetGuildXp(this DbSet<UserXpStats> xps, ulong guildId)
         => xps.Delete(x => x.GuildId == guildId);
 

src/NadekoBot/Db/Models/DiscordUser.cs

@@ -7,7 +7,7 @@ public class DiscordUser : DbEntity
 {
     public ulong UserId { get; set; }
     public string Username { get; set; }
-    public string Discriminator { get; set; }
+    // public string Discriminator { get; set; }
     public string AvatarId { get; set; }
 
     public int? ClubId { get; set; }
@@ -27,9 +27,6 @@ public class DiscordUser : DbEntity
 
     public override string ToString()
     {
-        if (string.IsNullOrWhiteSpace(Discriminator) || Discriminator == "0000")
-            return Username;
-        
-        return Username + "#" + Discriminator;
+        return Username;
     }
 }

src/NadekoBot/Db/Models/FlagTranslateChannel.cs

@@ -0,0 +1,8 @@
+#nullable disable
+namespace NadekoBot.Db.Models;
+
+public class FlagTranslateChannel : DbEntity
+{
+    public ulong GuildId { get; set; }
+    public ulong ChannelId { get; set; }
+}

src/NadekoBot/Db/Models/GuildConfig.cs

@@ -13,21 +13,23 @@ public class GuildConfig : DbEntity
 
     public string AutoAssignRoleIds { get; set; }
 
-    //greet stuff
-    public int AutoDeleteGreetMessagesTimer { get; set; } = 30;
-    public int AutoDeleteByeMessagesTimer { get; set; } = 30;
-
-    public ulong GreetMessageChannelId { get; set; }
-    public ulong ByeMessageChannelId { get; set; }
-
-    public bool SendDmGreetMessage { get; set; }
-    public string DmGreetMessageText { get; set; } = "Welcome to the %server% server, %user%!";
-
-    public bool SendChannelGreetMessage { get; set; }
-    public string ChannelGreetMessageText { get; set; } = "Welcome to the %server% server, %user%!";
-
-    public bool SendChannelByeMessage { get; set; }
-    public string ChannelByeMessageText { get; set; } = "%user% has left!";
+    // //greet stuff
+    // public int AutoDeleteGreetMessagesTimer { get; set; } = 30;
+    // public int AutoDeleteByeMessagesTimer { get; set; } = 30;
+    //
+    // public ulong GreetMessageChannelId { get; set; }
+    // public ulong ByeMessageChannelId { get; set; }
+    //
+    // public bool SendDmGreetMessage { get; set; }
+    // public string DmGreetMessageText { get; set; } = "Welcome to the %server% server, %user%!";
+    //
+    // public bool SendChannelGreetMessage { get; set; }
+    // public string ChannelGreetMessageText { get; set; } = "Welcome to the %server% server, %user%!";
+    //
+    // public bool SendChannelByeMessage { get; set; }
+    // public string ChannelByeMessageText { get; set; } = "%user% has left!";
+    // public bool SendBoostMessage { get; set; }
+    // pulic int BoostMessageDeleteAfter { get; set; }
 
     //self assignable roles
     public bool ExclusiveSelfAssignedRoles { get; set; }
@@ -75,7 +77,6 @@ public class GuildConfig : DbEntity
     public HashSet<UnroleTimer> UnroleTimer { get; set; } = new();
     public HashSet<VcRoleInfo> VcRoleInfos { get; set; }
     public HashSet<CommandAlias> CommandAliases { get; set; } = new();
-    public List<WarningPunishment> WarnPunishments { get; set; } = new();
     public bool WarningsInitialized { get; set; }
     public HashSet<SlowmodeIgnoredUser> SlowmodeIgnoredUsers { get; set; }
     public HashSet<SlowmodeIgnoredRole> SlowmodeIgnoredRoles { get; set; }
@@ -98,10 +99,6 @@ public class GuildConfig : DbEntity
 
     #region Boost Message
 
-    public bool SendBoostMessage { get; set; }
-    public string BoostMessage { get; set; } = "%user% just boosted this server!";
-    public ulong BoostMessageChannelId { get; set; }
-    public int BoostMessageDeleteAfter { get; set; }
     public bool StickyRoles { get; set; }
 
     #endregion

src/NadekoBot/Db/Models/NCanvas/NCanvas.cs

@@ -0,0 +1,19 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace NadekoBot.Db.Models;
+
+public class NCPixel
+{
+    [Key]
+    public int Id { get; set; }
+    
+    public required int Position { get; init; }
+
+    public required long Price { get; init; }
+
+    public required ulong OwnerId { get; init; }
+    public required uint Color { get; init; }
+
+    [MaxLength(256)]
+    public required string Text { get; init; }
+}

src/NadekoBot/Db/Models/punish/WarningPunishment.cs

@@ -3,6 +3,7 @@ namespace NadekoBot.Db.Models;
 
 public class WarningPunishment : DbEntity
 {
+    public ulong GuildId { get; set; }
     public int Count { get; set; }
     public PunishmentAction Punishment { get; set; }
     public int Time { get; set; }

src/NadekoBot/Db/Models/xp/UserXpStats.cs

@@ -8,6 +8,4 @@ public class UserXpStats : DbEntity
     public long Xp { get; set; }
     public long AwardedXp { get; set; }
     public XpNotificationLocation NotifyOnLevelUp { get; set; }
-}
-
-public enum XpNotificationLocation { None, Dm, Channel }
+}

src/NadekoBot/Db/Models/xp/XpNotificationLocation.cs

@@ -0,0 +1,8 @@
+namespace NadekoBot.Db.Models;
+
+public enum XpNotificationLocation
+{
+    None,
+    Dm,
+    Channel
+}

src/NadekoBot/Db/MysqlContext.cs

@@ -1,38 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using NadekoBot.Db.Models;
-
-namespace NadekoBot.Db;
-
-public sealed class MysqlContext : NadekoContext
-{
-    private readonly string _connStr;
-    private readonly string _version;
-
-    protected override string CurrencyTransactionOtherIdDefaultValue
-        => "NULL";
-
-    public MysqlContext(string connStr = "Server=localhost", string version = "8.0")
-    {
-        _connStr = connStr;
-        _version = version;
-    }
-
-    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-    {
-        base.OnConfiguring(optionsBuilder);
-        optionsBuilder
-            .UseLowerCaseNamingConvention()
-            .UseMySql(_connStr, ServerVersion.Parse(_version));
-    }
-
-    protected override void OnModelCreating(ModelBuilder modelBuilder)
-    {
-        base.OnModelCreating(modelBuilder);
-        
-        // mysql is case insensitive by default
-        // we can set binary collation to change that
-        modelBuilder.Entity<ClubInfo>()
-                    .Property(x => x.Name)
-                    .UseCollation("utf8mb4_bin");
-    }
-}

src/NadekoBot/Db/NadekoContext.cs

@@ -10,6 +10,7 @@ namespace NadekoBot.Db;
 public abstract class NadekoContext : DbContext
 {
     public DbSet<GuildConfig> GuildConfigs { get; set; }
+    public DbSet<GreetSettings> GreetSettings { get; set; }
 
     public DbSet<Quote> Quotes { get; set; }
     public DbSet<Reminder> Reminders { get; set; }
@@ -61,7 +62,6 @@ public abstract class NadekoContext : DbContext
     public DbSet<ArchivedTodoListModel> TodosArchive { get; set; }
     public DbSet<HoneypotChannel> HoneyPotChannels { get; set; }
 
-    // todo add guild colors
     // public DbSet<GuildColors> GuildColors { get; set; }
 
 
@@ -73,6 +73,24 @@ public abstract class NadekoContext : DbContext
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
+        #region Flag Translate 
+
+        modelBuilder.Entity<FlagTranslateChannel>()
+                    .HasIndex(x => new { x.GuildId, x.ChannelId })
+                    .IsUnique();
+        
+        #endregion
+        
+        #region NCanvas
+
+        modelBuilder.Entity<NCPixel>()
+                    .HasAlternateKey(x => x.Position);
+
+        modelBuilder.Entity<NCPixel>()
+                    .HasIndex(x => x.OwnerId);
+
+        #endregion
+
         #region QUOTES
 
         var quoteEntity = modelBuilder.Entity<Quote>();
@@ -149,7 +167,7 @@ public abstract class NadekoContext : DbContext
                     .OnDelete(DeleteBehavior.Cascade);
 
         // start antispam 
-        
+
         modelBuilder.Entity<GuildConfig>()
                     .HasOne(x => x.AntiSpamSetting)
                     .WithOne()
@@ -194,11 +212,6 @@ public abstract class NadekoContext : DbContext
                     .WithOne()
                     .OnDelete(DeleteBehavior.Cascade);
 
-        modelBuilder.Entity<GuildConfig>()
-                    .HasMany(x => x.WarnPunishments)
-                    .WithOne()
-                    .OnDelete(DeleteBehavior.Cascade);
-
         modelBuilder.Entity<GuildConfig>()
                     .HasMany(x => x.SlowmodeIgnoredRoles)
                     .WithOne()
@@ -276,6 +289,18 @@ public abstract class NadekoContext : DbContext
 
         #endregion
 
+        #region WarningPunishments
+
+        var warnpunishmentEntity = modelBuilder.Entity<WarningPunishment>(b =>
+        {
+            b.HasAlternateKey(x => new
+            {
+                x.GuildId,
+                x.Count
+            });
+        });
+
+        #endregion
 
         #region Self Assignable Roles
 
@@ -338,6 +363,7 @@ public abstract class NadekoContext : DbContext
             du.HasIndex(x => x.TotalXp);
             du.HasIndex(x => x.CurrencyAmount);
             du.HasIndex(x => x.UserId);
+            du.HasIndex(x => x.Username);
         });
 
         #endregion
@@ -678,6 +704,29 @@ public abstract class NadekoContext : DbContext
                     .OnDelete(DeleteBehavior.Cascade);
 
         #endregion
+
+        #region GreetSettings
+
+        modelBuilder
+            .Entity<GreetSettings>(gs => gs.HasIndex(x => new
+                                           {
+                                               x.GuildId,
+                                               x.GreetType
+                                           })
+                                           .IsUnique());
+
+        modelBuilder.Entity<GreetSettings>(gs =>
+        {
+            gs
+                .Property(x => x.IsEnabled)
+                .HasDefaultValue(false);
+
+            gs
+                .Property(x => x.AutoDeleteTimer)
+                .HasDefaultValue(0);
+        });
+
+        #endregion
     }
 
 #if DEBUG

src/NadekoBot/Db/NadekoDbService.cs

@@ -44,8 +44,6 @@ public sealed class NadekoDbService : DbService
             case "postgres":
             case "pgsql":
                 return new PostgreSqlContext(connString);
-            case "mysql":
-                return new MysqlContext(connString);
             case "sqlite":
                 return new SqliteContext(connString);
             default:

src/NadekoBot/Migrations/MigrationQueries.cs

@@ -5,18 +5,14 @@ namespace NadekoBot.Migrations;
 
 public static class MigrationQueries
 {
+    public static void UpdateUsernames(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.Sql("UPDATE DiscordUser SET Username = '??' + Username WHERE Discriminator = '????';");
+    }
+    
     public static void MigrateRero(MigrationBuilder migrationBuilder)
     {
-        if (migrationBuilder.IsMySql())
-        {
-            migrationBuilder.Sql(
-                @"INSERT IGNORE into reactionroles(guildid, channelid, messageid, emote, roleid, `group`, levelreq, dateadded)
-select guildid, channelid, messageid, emotename, roleid, exclusive, 0, reactionrolemessage.dateadded
-from reactionrole
-left join reactionrolemessage on reactionrolemessage.id = reactionrole.reactionrolemessageid
-left join guildconfigs on reactionrolemessage.guildconfigid = guildconfigs.id;");
-        }
-        else if (migrationBuilder.IsSqlite())
+        if (migrationBuilder.IsSqlite())
         {
             migrationBuilder.Sql(
                 @"insert or ignore into reactionroles(guildid, channelid, messageid, emote, roleid, 'group', levelreq, dateadded)
@@ -27,7 +23,8 @@ left join guildconfigs on reactionrolemessage.guildconfigid = guildconfigs.id;")
         }
         else if (migrationBuilder.IsNpgsql())
         {
-            migrationBuilder.Sql(@"insert into reactionroles(guildid, channelid, messageid, emote, roleid, ""group"", levelreq, dateadded)
+            migrationBuilder.Sql(
+                @"insert into reactionroles(guildid, channelid, messageid, emote, roleid, ""group"", levelreq, dateadded)
             select guildid, channelid, messageid, emotename, roleid, exclusive::int, 0, reactionrolemessage.dateadded
                 from reactionrole
                 left join reactionrolemessage on reactionrolemessage.id = reactionrole.reactionrolemessageid
@@ -42,16 +39,52 @@ left join guildconfigs on reactionrolemessage.guildconfigid = guildconfigs.id;")
 
     public static void GuildConfigCleanup(MigrationBuilder builder)
     {
-        builder.Sql($"""
-                     DELETE FROM "StreamRoleBlacklistedUser" WHERE "StreamRoleSettingsId" is NULL;
-                     """);
-
         builder.Sql($"""
                      DELETE FROM "DelMsgOnCmdChannel" WHERE "GuildConfigId" is NULL;
+                     DELETE FROM "WarningPunishment" WHERE "GuildConfigId" NOT IN (SELECT "Id" from "GuildConfigs");
+                     DELETE FROM "StreamRoleBlacklistedUser" WHERE "StreamRoleSettingsId" is NULL;
+                     DELETE FROM "Permissions" WHERE "GuildConfigId" NOT IN (SELECT "Id" from "GuildConfigs");
                      """);
+    }
 
+    public static void GreetSettingsCopy(MigrationBuilder builder)
+    {
         builder.Sql("""
-                    DELETE FROM "WarningPunishment" WHERE "GuildConfigId" NOT IN (SELECT "Id" from "GuildConfigs");
+                    INSERT INTO GreetSettings (GuildId, GreetType, MessageText, IsEnabled, ChannelId, AutoDeleteTimer)
+                    SELECT GuildId, 0, ChannelGreetMessageText, SendChannelGreetMessage, GreetMessageChannelId, AutoDeleteGreetMessagesTimer
+                    FROM GuildConfigs
+                    WHERE SendChannelGreetMessage = TRUE;
+
+                    INSERT INTO GreetSettings (GuildId, GreetType, MessageText, IsEnabled, ChannelId, AutoDeleteTimer)
+                    SELECT GuildId, 1, DmGreetMessageText, SendDmGreetMessage, GreetMessageChannelId, 0
+                    FROM GuildConfigs
+                    WHERE SendDmGreetMessage = TRUE;
+
+                    INSERT INTO GreetSettings (GuildId, GreetType, MessageText, IsEnabled, ChannelId, AutoDeleteTimer)
+                    SELECT GuildId, 2, ChannelByeMessageText, SendChannelByeMessage, ByeMessageChannelId, AutoDeleteByeMessagesTimer
+                    FROM GuildConfigs
+                    WHERE SendChannelByeMessage = TRUE;
+
+                    INSERT INTO GreetSettings (GuildId, GreetType, MessageText, IsEnabled, ChannelId, AutoDeleteTimer)
+                    SELECT GuildId, 3, BoostMessage, SendBoostMessage, BoostMessageChannelId, BoostMessageDeleteAfter
+                    FROM GuildConfigs
+                    WHERE SendBoostMessage = TRUE;
+                    """);
+    }
+
+    public static void AddGuildIdsToWarningPunishment(MigrationBuilder builder)
+    {
+        builder.Sql("""
+                    DELETE FROM WarningPunishment WHERE GuildConfigId IS NULL OR GuildConfigId NOT IN (SELECT Id FROM GuildConfigs);
+                    UPDATE WarningPunishment 
+                    SET GuildId = (SELECT GuildId FROM GuildConfigs WHERE Id = GuildConfigId);
+                    
+                    DELETE FROM WarningPunishment as wp
+                    WHERE (wp.Count, wp.GuildConfigId) in (
+                        SELECT wp2.Count, wp2.GuildConfigId FROM WarningPunishment as wp2
+                        GROUP BY wp2.Count, wp2.GuildConfigId
+                        HAVING COUNT(id) > 1
+                    );
                     """);
     }
 }

src/NadekoBot/Migrations/Mysql/20220428044612_stondel.cs

@@ -1,26 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace NadekoBot.Migrations.Mysql
-{
-    public partial class stondel : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "deletestreamonlinemessage",
-                table: "guildconfigs",
-                type: "tinyint(1)",
-                nullable: false,
-                defaultValue: false);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "deletestreamonlinemessage",
-                table: "guildconfigs");
-        }
-    }
-}

src/NadekoBot/Migrations/Mysql/20220429044757_bank.cs

@@ -1,41 +0,0 @@
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace NadekoBot.Migrations.Mysql
-{
-    public partial class bank : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "bankusers",
-                columns: table => new
-                {
-                    id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                    userid = table.Column<ulong>(type: "bigint unsigned", nullable: false),
-                    balance = table.Column<long>(type: "bigint", nullable: false),
-                    dateadded = table.Column<DateTime>(type: "datetime(6)", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("pk_bankusers", x => x.id);
-                })
-                .Annotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.CreateIndex(
-                name: "ix_bankusers_userid",
-                table: "bankusers",
-                column: "userid",
-                unique: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "bankusers");
-        }
-    }
-}

src/NadekoBot/Migrations/Mysql/20220504162509_new-rero.cs

@@ -1,120 +0,0 @@
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace NadekoBot.Migrations.Mysql
-{
-    public partial class newrero : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-
-            migrationBuilder.CreateTable(
-                name: "reactionroles",
-                columns: table => new
-                {
-                    id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                    guildid = table.Column<ulong>(type: "bigint unsigned", nullable: false),
-                    channelid = table.Column<ulong>(type: "bigint unsigned", nullable: false),
-                    messageid = table.Column<ulong>(type: "bigint unsigned", nullable: false),
-                    emote = table.Column<string>(type: "varchar(100)", maxLength: 100, nullable: true)
-                        .Annotation("MySql:CharSet", "utf8mb4"),
-                    roleid = table.Column<ulong>(type: "bigint unsigned", nullable: false),
-                    group = table.Column<int>(type: "int", nullable: false),
-                    levelreq = table.Column<int>(type: "int", nullable: false),
-                    dateadded = table.Column<DateTime>(type: "datetime(6)", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("pk_reactionroles", x => x.id);
-                })
-                .Annotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.CreateIndex(
-                name: "ix_reactionroles_guildid",
-                table: "reactionroles",
-                column: "guildid");
-
-            migrationBuilder.CreateIndex(
-                name: "ix_reactionroles_messageid_emote",
-                table: "reactionroles",
-                columns: new[] { "messageid", "emote" },
-                unique: true);
-            
-            MigrationQueries.MigrateRero(migrationBuilder);
-            
-            migrationBuilder.DropTable(
-                name: "reactionrole");
-
-            migrationBuilder.DropTable(
-                name: "reactionrolemessage");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "reactionroles");
-
-            migrationBuilder.CreateTable(
-                name: "reactionrolemessage",
-                columns: table => new
-                {
-                    id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                    guildconfigid = table.Column<int>(type: "int", nullable: false),
-                    channelid = table.Column<ulong>(type: "bigint unsigned", nullable: false),
-                    dateadded = table.Column<DateTime>(type: "datetime(6)", nullable: true),
-                    exclusive = table.Column<bool>(type: "tinyint(1)", nullable: false),
-                    index = table.Column<int>(type: "int", nullable: false),
-                    messageid = table.Column<ulong>(type: "bigint unsigned", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("pk_reactionrolemessage", x => x.id);
-                    table.ForeignKey(
-                        name: "fk_reactionrolemessage_guildconfigs_guildconfigid",
-                        column: x => x.guildconfigid,
-                        principalTable: "guildconfigs",
-                        principalColumn: "id",
-                        onDelete: ReferentialAction.Cascade);
-                })
-                .Annotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.CreateTable(
-                name: "reactionrole",
-                columns: table => new
-                {
-                    id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                    dateadded = table.Column<DateTime>(type: "datetime(6)", nullable: true),
-                    emotename = table.Column<string>(type: "longtext", nullable: true)
-                        .Annotation("MySql:CharSet", "utf8mb4"),
-                    reactionrolemessageid = table.Column<int>(type: "int", nullable: true),
-                    roleid = table.Column<ulong>(type: "bigint unsigned", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("pk_reactionrole", x => x.id);
-                    table.ForeignKey(
-                        name: "fk_reactionrole_reactionrolemessage_reactionrolemessageid",
-                        column: x => x.reactionrolemessageid,
-                        principalTable: "reactionrolemessage",
-                        principalColumn: "id",
-                        onDelete: ReferentialAction.Cascade);
-                })
-                .Annotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.CreateIndex(
-                name: "ix_reactionrole_reactionrolemessageid",
-                table: "reactionrole",
-                column: "reactionrolemessageid");
-
-            migrationBuilder.CreateIndex(
-                name: "ix_reactionrolemessage_guildconfigid",
-                table: "reactionrolemessage",
-                column: "guildconfigid");
-        }
-    }
-}

src/NadekoBot/Migrations/Mysql/20220614071410_patronage-system.cs

@@ -1,175 +0,0 @@
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace NadekoBot.Migrations.Mysql
-{
-    public partial class patronagesystem : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.RenameColumn(
-                name: "patreonuserid",
-                table: "rewardedusers",
-                newName: "platformuserid");
-
-            migrationBuilder.RenameIndex(
-                name: "ix_rewardedusers_patreonuserid",
-                table: "rewardedusers",
-                newName: "ix_rewardedusers_platformuserid");
-
-            migrationBuilder.AlterColumn<long>(
-                name: "xp",
-                table: "userxpstats",
-                type: "bigint",
-                nullable: false,
-                oldClrType: typeof(int),
-                oldType: "int");
-
-            migrationBuilder.AlterColumn<long>(
-                name: "awardedxp",
-                table: "userxpstats",
-                type: "bigint",
-                nullable: false,
-                oldClrType: typeof(int),
-                oldType: "int");
-
-            migrationBuilder.AlterColumn<long>(
-                name: "amountrewardedthismonth",
-                table: "rewardedusers",
-                type: "bigint",
-                nullable: false,
-                oldClrType: typeof(int),
-                oldType: "int");
-
-            migrationBuilder.AlterColumn<bool>(
-                name: "verboseerrors",
-                table: "guildconfigs",
-                type: "tinyint(1)",
-                nullable: false,
-                defaultValue: true,
-                oldClrType: typeof(bool),
-                oldType: "tinyint(1)");
-
-            migrationBuilder.AlterColumn<long>(
-                name: "totalxp",
-                table: "discorduser",
-                type: "bigint",
-                nullable: false,
-                defaultValue: 0L,
-                oldClrType: typeof(int),
-                oldType: "int",
-                oldDefaultValue: 0);
-
-            migrationBuilder.CreateTable(
-                name: "patronquotas",
-                columns: table => new
-                {
-                    userid = table.Column<ulong>(type: "bigint unsigned", nullable: false),
-                    featuretype = table.Column<int>(type: "int", nullable: false),
-                    feature = table.Column<string>(type: "varchar(255)", nullable: false)
-                        .Annotation("MySql:CharSet", "utf8mb4"),
-                    hourlycount = table.Column<uint>(type: "int unsigned", nullable: false),
-                    dailycount = table.Column<uint>(type: "int unsigned", nullable: false),
-                    monthlycount = table.Column<uint>(type: "int unsigned", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("pk_patronquotas", x => new { x.userid, x.featuretype, x.feature });
-                })
-                .Annotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.CreateTable(
-                name: "patrons",
-                columns: table => new
-                {
-                    userid = table.Column<ulong>(type: "bigint unsigned", nullable: false)
-                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                    uniqueplatformuserid = table.Column<string>(type: "varchar(255)", nullable: true)
-                        .Annotation("MySql:CharSet", "utf8mb4"),
-                    amountcents = table.Column<int>(type: "int", nullable: false),
-                    lastcharge = table.Column<DateTime>(type: "datetime(6)", nullable: false),
-                    validthru = table.Column<DateTime>(type: "datetime(6)", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("pk_patrons", x => x.userid);
-                })
-                .Annotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.CreateIndex(
-                name: "ix_patronquotas_userid",
-                table: "patronquotas",
-                column: "userid");
-
-            migrationBuilder.CreateIndex(
-                name: "ix_patrons_uniqueplatformuserid",
-                table: "patrons",
-                column: "uniqueplatformuserid",
-                unique: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "patronquotas");
-
-            migrationBuilder.DropTable(
-                name: "patrons");
-
-            migrationBuilder.RenameColumn(
-                name: "platformuserid",
-                table: "rewardedusers",
-                newName: "patreonuserid");
-
-            migrationBuilder.RenameIndex(
-                name: "ix_rewardedusers_platformuserid",
-                table: "rewardedusers",
-                newName: "ix_rewardedusers_patreonuserid");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "xp",
-                table: "userxpstats",
-                type: "int",
-                nullable: false,
-                oldClrType: typeof(long),
-                oldType: "bigint");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "awardedxp",
-                table: "userxpstats",
-                type: "int",
-                nullable: false,
-                oldClrType: typeof(long),
-                oldType: "bigint");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "amountrewardedthismonth",
-                table: "rewardedusers",
-                type: "int",
-                nullable: false,
-                oldClrType: typeof(long),
-                oldType: "bigint");
-
-            migrationBuilder.AlterColumn<bool>(
-                name: "verboseerrors",
-                table: "guildconfigs",
-                type: "tinyint(1)",
-                nullable: false,
-                oldClrType: typeof(bool),
-                oldType: "tinyint(1)",
-                oldDefaultValue: true);
-
-            migrationBuilder.AlterColumn<int>(
-                name: "totalxp",
-                table: "discorduser",
-                type: "int",
-                nullable: false,
-                defaultValue: 0,
-                oldClrType: typeof(long),
-                oldType: "bigint",
-                oldDefaultValue: 0L);
-        }
-    }
-}

src/NadekoBot/Migrations/Mysql/20220623090718_stondel-db-cache.cs

@@ -1,38 +0,0 @@
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace NadekoBot.Migrations.Mysql
-{
-    public partial class stondeldbcache : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "streamonlinemessages",
-                columns: table => new
-                {
-                    id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                    channelid = table.Column<ulong>(type: "bigint unsigned", nullable: false),
-                    messageid = table.Column<ulong>(type: "bigint unsigned", nullable: false),
-                    type = table.Column<int>(type: "int", nullable: false),
-                    name = table.Column<string>(type: "longtext", nullable: true)
-                        .Annotation("MySql:CharSet", "utf8mb4"),
-                    dateadded = table.Column<DateTime>(type: "datetime(6)", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("pk_streamonlinemessages", x => x.id);
-                })
-                .Annotation("MySql:CharSet", "utf8mb4");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "streamonlinemessages");
-        }
-    }
-}

src/NadekoBot/Migrations/Mysql/20220703194400_logwarns.cs

@@ -1,25 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace NadekoBot.Migrations.Mysql
-{
-    public partial class logwarns : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<ulong>(
-                name: "logwarnsid",
-                table: "logsettings",
-                type: "bigint unsigned",
-                nullable: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "logwarnsid",
-                table: "logsettings");
-        }
-    }
-}

src/NadekoBot/Migrations/Mysql/20220725155953_xpitemshop.cs

@@ -1,44 +0,0 @@
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace NadekoBot.Migrations.Mysql
-{
-    public partial class xpitemshop : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "xpshopowneditem",
-                columns: table => new
-                {
-                    id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                    userid = table.Column<ulong>(type: "bigint unsigned", nullable: false),
-                    itemtype = table.Column<int>(type: "int", nullable: false),
-                    isusing = table.Column<bool>(type: "tinyint(1)", nullable: false),
-                    itemkey = table.Column<string>(type: "varchar(255)", nullable: false)
-                        .Annotation("MySql:CharSet", "utf8mb4"),
-                    dateadded = table.Column<DateTime>(type: "datetime(6)", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("pk_xpshopowneditem", x => x.id);
-                })
-                .Annotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.CreateIndex(
-                name: "ix_xpshopowneditem_userid_itemtype_itemkey",
-                table: "xpshopowneditem",
-                columns: new[] { "userid", "itemtype", "itemkey" },
-                unique: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "xpshopowneditem");
-        }
-    }
-}

src/NadekoBot/Migrations/Mysql/20220727033931_linkonly-channels.cs

@@ -1,26 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace NadekoBot.Migrations.Mysql
-{
-    public partial class linkonlychannels : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<int>(
-                name: "type",
-                table: "imageonlychannels",
-                type: "int",
-                nullable: false,
-                defaultValue: 0);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "type",
-                table: "imageonlychannels");
-        }
-    }
-}

src/NadekoBot/Migrations/Mysql/20220808141855_remove-obsolete-xp-columns.cs

@@ -1,48 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace NadekoBot.Migrations.Mysql
-{
-    public partial class removeobsoletexpcolumns : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "lastlevelup",
-                table: "userxpstats");
-
-            migrationBuilder.DropColumn(
-                name: "lastlevelup",
-                table: "discorduser");
-
-            migrationBuilder.DropColumn(
-                name: "lastxpgain",
-                table: "discorduser");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<DateTime>(
-                name: "lastlevelup",
-                table: "userxpstats",
-                type: "datetime(6)",
-                nullable: false,
-                defaultValueSql: "(UTC_TIMESTAMP)");
-
-            migrationBuilder.AddColumn<DateTime>(
-                name: "lastlevelup",
-                table: "discorduser",
-                type: "datetime(6)",
-                nullable: false,
-                defaultValueSql: "(UTC_TIMESTAMP)");
-
-            migrationBuilder.AddColumn<DateTime>(
-                name: "lastxpgain",
-                table: "discorduser",
-                type: "datetime(6)",
-                nullable: false,
-                defaultValueSql: "(UTC_TIMESTAMP - INTERVAL 1 year)");
-        }
-    }
-}

src/NadekoBot/Migrations/Mysql/20220831142722_banprune.cs

@@ -1,25 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace NadekoBot.Migrations.Mysql
-{
-    public partial class banprune : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<int>(
-                name: "prunedays",
-                table: "bantemplates",
-                type: "int",
-                nullable: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "prunedays",
-                table: "bantemplates");
-        }
-    }
-}

src/NadekoBot/Migrations/Mysql/20220913192520_shop-role-req.cs

@@ -1,25 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace NadekoBot.Migrations.Mysql
-{
-    public partial class shoprolereq : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<ulong>(
-                name: "rolerequirement",
-                table: "shopentry",
-                type: "bigint unsigned",
-                nullable: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "rolerequirement",
-                table: "shopentry");
-        }
-    }
-}

src/NadekoBot/Migrations/Mysql/20220916194514_autopub.cs

@@ -1,41 +0,0 @@
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace NadekoBot.Migrations.Mysql
-{
-    public partial class autopub : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "autopublishchannel",
-                columns: table => new
-                {
-                    id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                    guildid = table.Column<ulong>(type: "bigint unsigned", nullable: false),
-                    channelid = table.Column<ulong>(type: "bigint unsigned", nullable: false),
-                    dateadded = table.Column<DateTime>(type: "datetime(6)", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("pk_autopublishchannel", x => x.id);
-                })
-                .Annotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.CreateIndex(
-                name: "ix_autopublishchannel_guildid",
-                table: "autopublishchannel",
-                column: "guildid",
-                unique: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "autopublishchannel");
-        }
-    }
-}

src/NadekoBot/Migrations/Mysql/20221003175743_gambling-stats.cs

@@ -1,43 +0,0 @@
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace NadekoBot.Migrations.Mysql
-{
-    public partial class gamblingstats : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "gamblingstats",
-                columns: table => new
-                {
-                    id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                    feature = table.Column<string>(type: "varchar(255)", nullable: true)
-                        .Annotation("MySql:CharSet", "utf8mb4"),
-                    bet = table.Column<decimal>(type: "decimal(65,30)", nullable: false),
-                    paidout = table.Column<decimal>(type: "decimal(65,30)", nullable: false),
-                    dateadded = table.Column<DateTime>(type: "datetime(6)", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("pk_gamblingstats", x => x.id);
-                })
-                .Annotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.CreateIndex(
-                name: "ix_gamblingstats_feature",
-                table: "gamblingstats",
-                column: "feature",
-                unique: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "gamblingstats");
-        }
-    }
-}

src/NadekoBot/Migrations/Mysql/20221021192758_toggle-global-expressions.cs

@@ -1,26 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace NadekoBot.Migrations.Mysql
-{
-    public partial class toggleglobalexpressions : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "disableglobalexpressions",
-                table: "guildconfigs",
-                type: "tinyint(1)",
-                nullable: false,
-                defaultValue: false);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "disableglobalexpressions",
-                table: "guildconfigs");
-        }
-    }
-}

src/NadekoBot/Migrations/Mysql/20221118195208_log-thread.cs

@@ -1,35 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace NadekoBot.Migrations.Mysql
-{
-    public partial class logthread : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<ulong>(
-                name: "threadcreatedid",
-                table: "logsettings",
-                type: "bigint unsigned",
-                nullable: true);
-
-            migrationBuilder.AddColumn<ulong>(
-                name: "threaddeletedid",
-                table: "logsettings",
-                type: "bigint unsigned",
-                nullable: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "threadcreatedid",
-                table: "logsettings");
-
-            migrationBuilder.DropColumn(
-                name: "threaddeletedid",
-                table: "logsettings");
-        }
-    }
-}

src/NadekoBot/Migrations/Mysql/20221122204432_feed-text.cs

@@ -1,26 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace NadekoBot.Migrations.Mysql
-{
-    public partial class feedtext : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "message",
-                table: "feedsub",
-                type: "longtext",
-                nullable: true)
-                .Annotation("MySql:CharSet", "utf8mb4");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "message",
-                table: "feedsub");
-        }
-    }
-}

src/NadekoBot/Migrations/Mysql/20240518221440_guidlconfig-cleanup.cs

@@ -1,702 +0,0 @@
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace NadekoBot.Migrations.Mysql
-{
-    /// <inheritdoc />
-    public partial class guidlconfigcleanup : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "fk_antiraidsetting_guildconfigs_guildconfigid",
-                table: "antiraidsetting");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_antispamignore_antispamsetting_antispamsettingid",
-                table: "antispamignore");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_antispamsetting_guildconfigs_guildconfigid",
-                table: "antispamsetting");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_commandalias_guildconfigs_guildconfigid",
-                table: "commandalias");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_commandcooldown_guildconfigs_guildconfigid",
-                table: "commandcooldown");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_delmsgoncmdchannel_guildconfigs_guildconfigid",
-                table: "delmsgoncmdchannel");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_excludeditem_xpsettings_xpsettingsid",
-                table: "excludeditem");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_filterchannelid_guildconfigs_guildconfigid",
-                table: "filterchannelid");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_filteredword_guildconfigs_guildconfigid",
-                table: "filteredword");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_filterlinkschannelid_guildconfigs_guildconfigid",
-                table: "filterlinkschannelid");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_filterwordschannelid_guildconfigs_guildconfigid",
-                table: "filterwordschannelid");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_followedstream_guildconfigs_guildconfigid",
-                table: "followedstream");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_gcchannelid_guildconfigs_guildconfigid",
-                table: "gcchannelid");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_muteduserid_guildconfigs_guildconfigid",
-                table: "muteduserid");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_permissions_guildconfigs_guildconfigid",
-                table: "permissions");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_shopentry_guildconfigs_guildconfigid",
-                table: "shopentry");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_shopentryitem_shopentry_shopentryid",
-                table: "shopentryitem");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_slowmodeignoredrole_guildconfigs_guildconfigid",
-                table: "slowmodeignoredrole");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_slowmodeignoreduser_guildconfigs_guildconfigid",
-                table: "slowmodeignoreduser");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_streamroleblacklisteduser_streamrolesettings_streamrolesetti~",
-                table: "streamroleblacklisteduser");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_streamrolewhitelisteduser_streamrolesettings_streamrolesetti~",
-                table: "streamrolewhitelisteduser");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_unbantimer_guildconfigs_guildconfigid",
-                table: "unbantimer");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_unmutetimer_guildconfigs_guildconfigid",
-                table: "unmutetimer");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_unroletimer_guildconfigs_guildconfigid",
-                table: "unroletimer");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_vcroleinfo_guildconfigs_guildconfigid",
-                table: "vcroleinfo");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_warningpunishment_guildconfigs_guildconfigid",
-                table: "warningpunishment");
-
-            migrationBuilder.DropTable(
-                name: "ignoredvoicepresencechannels");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "streamrolesettingsid",
-                table: "streamrolewhitelisteduser",
-                type: "int",
-                nullable: false,
-                defaultValue: 0,
-                oldClrType: typeof(int),
-                oldType: "int",
-                oldNullable: true);
-
-            migrationBuilder.AlterColumn<int>(
-                name: "streamrolesettingsid",
-                table: "streamroleblacklisteduser",
-                type: "int",
-                nullable: false,
-                defaultValue: 0,
-                oldClrType: typeof(int),
-                oldType: "int",
-                oldNullable: true);
-
-            migrationBuilder.AlterColumn<int>(
-                name: "guildconfigid",
-                table: "delmsgoncmdchannel",
-                type: "int",
-                nullable: false,
-                defaultValue: 0,
-                oldClrType: typeof(int),
-                oldType: "int",
-                oldNullable: true);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_antiraidsetting_guildconfigs_guildconfigid",
-                table: "antiraidsetting",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_antispamignore_antispamsetting_antispamsettingid",
-                table: "antispamignore",
-                column: "antispamsettingid",
-                principalTable: "antispamsetting",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_antispamsetting_guildconfigs_guildconfigid",
-                table: "antispamsetting",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_commandalias_guildconfigs_guildconfigid",
-                table: "commandalias",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_commandcooldown_guildconfigs_guildconfigid",
-                table: "commandcooldown",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_delmsgoncmdchannel_guildconfigs_guildconfigid",
-                table: "delmsgoncmdchannel",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_excludeditem_xpsettings_xpsettingsid",
-                table: "excludeditem",
-                column: "xpsettingsid",
-                principalTable: "xpsettings",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_filterchannelid_guildconfigs_guildconfigid",
-                table: "filterchannelid",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_filteredword_guildconfigs_guildconfigid",
-                table: "filteredword",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_filterlinkschannelid_guildconfigs_guildconfigid",
-                table: "filterlinkschannelid",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_filterwordschannelid_guildconfigs_guildconfigid",
-                table: "filterwordschannelid",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_followedstream_guildconfigs_guildconfigid",
-                table: "followedstream",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_gcchannelid_guildconfigs_guildconfigid",
-                table: "gcchannelid",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_muteduserid_guildconfigs_guildconfigid",
-                table: "muteduserid",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_permissions_guildconfigs_guildconfigid",
-                table: "permissions",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_shopentry_guildconfigs_guildconfigid",
-                table: "shopentry",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_shopentryitem_shopentry_shopentryid",
-                table: "shopentryitem",
-                column: "shopentryid",
-                principalTable: "shopentry",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_slowmodeignoredrole_guildconfigs_guildconfigid",
-                table: "slowmodeignoredrole",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_slowmodeignoreduser_guildconfigs_guildconfigid",
-                table: "slowmodeignoreduser",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_streamroleblacklisteduser_streamrolesettings_streamrolesetti~",
-                table: "streamroleblacklisteduser",
-                column: "streamrolesettingsid",
-                principalTable: "streamrolesettings",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_streamrolewhitelisteduser_streamrolesettings_streamrolesetti~",
-                table: "streamrolewhitelisteduser",
-                column: "streamrolesettingsid",
-                principalTable: "streamrolesettings",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_unbantimer_guildconfigs_guildconfigid",
-                table: "unbantimer",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_unmutetimer_guildconfigs_guildconfigid",
-                table: "unmutetimer",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_unroletimer_guildconfigs_guildconfigid",
-                table: "unroletimer",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_vcroleinfo_guildconfigs_guildconfigid",
-                table: "vcroleinfo",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_warningpunishment_guildconfigs_guildconfigid",
-                table: "warningpunishment",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "fk_antiraidsetting_guildconfigs_guildconfigid",
-                table: "antiraidsetting");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_antispamignore_antispamsetting_antispamsettingid",
-                table: "antispamignore");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_antispamsetting_guildconfigs_guildconfigid",
-                table: "antispamsetting");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_commandalias_guildconfigs_guildconfigid",
-                table: "commandalias");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_commandcooldown_guildconfigs_guildconfigid",
-                table: "commandcooldown");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_delmsgoncmdchannel_guildconfigs_guildconfigid",
-                table: "delmsgoncmdchannel");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_excludeditem_xpsettings_xpsettingsid",
-                table: "excludeditem");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_filterchannelid_guildconfigs_guildconfigid",
-                table: "filterchannelid");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_filteredword_guildconfigs_guildconfigid",
-                table: "filteredword");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_filterlinkschannelid_guildconfigs_guildconfigid",
-                table: "filterlinkschannelid");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_filterwordschannelid_guildconfigs_guildconfigid",
-                table: "filterwordschannelid");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_followedstream_guildconfigs_guildconfigid",
-                table: "followedstream");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_gcchannelid_guildconfigs_guildconfigid",
-                table: "gcchannelid");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_muteduserid_guildconfigs_guildconfigid",
-                table: "muteduserid");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_permissions_guildconfigs_guildconfigid",
-                table: "permissions");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_shopentry_guildconfigs_guildconfigid",
-                table: "shopentry");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_shopentryitem_shopentry_shopentryid",
-                table: "shopentryitem");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_slowmodeignoredrole_guildconfigs_guildconfigid",
-                table: "slowmodeignoredrole");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_slowmodeignoreduser_guildconfigs_guildconfigid",
-                table: "slowmodeignoreduser");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_streamroleblacklisteduser_streamrolesettings_streamrolesetti~",
-                table: "streamroleblacklisteduser");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_streamrolewhitelisteduser_streamrolesettings_streamrolesetti~",
-                table: "streamrolewhitelisteduser");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_unbantimer_guildconfigs_guildconfigid",
-                table: "unbantimer");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_unmutetimer_guildconfigs_guildconfigid",
-                table: "unmutetimer");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_unroletimer_guildconfigs_guildconfigid",
-                table: "unroletimer");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_vcroleinfo_guildconfigs_guildconfigid",
-                table: "vcroleinfo");
-
-            migrationBuilder.DropForeignKey(
-                name: "fk_warningpunishment_guildconfigs_guildconfigid",
-                table: "warningpunishment");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "streamrolesettingsid",
-                table: "streamrolewhitelisteduser",
-                type: "int",
-                nullable: true,
-                oldClrType: typeof(int),
-                oldType: "int");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "streamrolesettingsid",
-                table: "streamroleblacklisteduser",
-                type: "int",
-                nullable: true,
-                oldClrType: typeof(int),
-                oldType: "int");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "guildconfigid",
-                table: "delmsgoncmdchannel",
-                type: "int",
-                nullable: true,
-                oldClrType: typeof(int),
-                oldType: "int");
-
-            migrationBuilder.CreateTable(
-                name: "ignoredvoicepresencechannels",
-                columns: table => new
-                {
-                    id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                    logsettingid = table.Column<int>(type: "int", nullable: true),
-                    channelid = table.Column<ulong>(type: "bigint unsigned", nullable: false),
-                    dateadded = table.Column<DateTime>(type: "datetime(6)", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("pk_ignoredvoicepresencechannels", x => x.id);
-                    table.ForeignKey(
-                        name: "fk_ignoredvoicepresencechannels_logsettings_logsettingid",
-                        column: x => x.logsettingid,
-                        principalTable: "logsettings",
-                        principalColumn: "id");
-                })
-                .Annotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.CreateIndex(
-                name: "ix_ignoredvoicepresencechannels_logsettingid",
-                table: "ignoredvoicepresencechannels",
-                column: "logsettingid");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_antiraidsetting_guildconfigs_guildconfigid",
-                table: "antiraidsetting",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_antispamignore_antispamsetting_antispamsettingid",
-                table: "antispamignore",
-                column: "antispamsettingid",
-                principalTable: "antispamsetting",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_antispamsetting_guildconfigs_guildconfigid",
-                table: "antispamsetting",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_commandalias_guildconfigs_guildconfigid",
-                table: "commandalias",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_commandcooldown_guildconfigs_guildconfigid",
-                table: "commandcooldown",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_delmsgoncmdchannel_guildconfigs_guildconfigid",
-                table: "delmsgoncmdchannel",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_excludeditem_xpsettings_xpsettingsid",
-                table: "excludeditem",
-                column: "xpsettingsid",
-                principalTable: "xpsettings",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_filterchannelid_guildconfigs_guildconfigid",
-                table: "filterchannelid",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_filteredword_guildconfigs_guildconfigid",
-                table: "filteredword",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_filterlinkschannelid_guildconfigs_guildconfigid",
-                table: "filterlinkschannelid",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_filterwordschannelid_guildconfigs_guildconfigid",
-                table: "filterwordschannelid",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_followedstream_guildconfigs_guildconfigid",
-                table: "followedstream",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_gcchannelid_guildconfigs_guildconfigid",
-                table: "gcchannelid",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_muteduserid_guildconfigs_guildconfigid",
-                table: "muteduserid",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_permissions_guildconfigs_guildconfigid",
-                table: "permissions",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_shopentry_guildconfigs_guildconfigid",
-                table: "shopentry",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_shopentryitem_shopentry_shopentryid",
-                table: "shopentryitem",
-                column: "shopentryid",
-                principalTable: "shopentry",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_slowmodeignoredrole_guildconfigs_guildconfigid",
-                table: "slowmodeignoredrole",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_slowmodeignoreduser_guildconfigs_guildconfigid",
-                table: "slowmodeignoreduser",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_streamroleblacklisteduser_streamrolesettings_streamrolesetti~",
-                table: "streamroleblacklisteduser",
-                column: "streamrolesettingsid",
-                principalTable: "streamrolesettings",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_streamrolewhitelisteduser_streamrolesettings_streamrolesetti~",
-                table: "streamrolewhitelisteduser",
-                column: "streamrolesettingsid",
-                principalTable: "streamrolesettings",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_unbantimer_guildconfigs_guildconfigid",
-                table: "unbantimer",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_unmutetimer_guildconfigs_guildconfigid",
-                table: "unmutetimer",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_unroletimer_guildconfigs_guildconfigid",
-                table: "unroletimer",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_vcroleinfo_guildconfigs_guildconfigid",
-                table: "vcroleinfo",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_warningpunishment_guildconfigs_guildconfigid",
-                table: "warningpunishment",
-                column: "guildconfigid",
-                principalTable: "guildconfigs",
-                principalColumn: "id");
-        }
-    }
-}

src/NadekoBot/Migrations/Mysql/20240611180516_remove-patron-limits.cs

@@ -1,44 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace NadekoBot.Migrations.Mysql
-{
-    /// <inheritdoc />
-    public partial class removepatronlimits : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "patronquotas");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "patronquotas",
-                columns: table => new
-                {
-                    userid = table.Column<ulong>(type: "bigint unsigned", nullable: false),
-                    featuretype = table.Column<int>(type: "int", nullable: false),
-                    feature = table.Column<string>(type: "varchar(255)", nullable: false)
-                        .Annotation("MySql:CharSet", "utf8mb4"),
-                    dailycount = table.Column<uint>(type: "int unsigned", nullable: false),
-                    hourlycount = table.Column<uint>(type: "int unsigned", nullable: false),
-                    monthlycount = table.Column<uint>(type: "int unsigned", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("pk_patronquotas", x => new { x.userid, x.featuretype, x.feature });
-                })
-                .Annotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.CreateIndex(
-                name: "ix_patronquotas_userid",
-                table: "patronquotas",
-                column: "userid");
-        }
-    }
-}

src/NadekoBot/Migrations/Mysql/20240627033532_honeypot.cs

@@ -1,36 +0,0 @@
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace NadekoBot.Migrations.Mysql
-{
-    /// <inheritdoc />
-    public partial class honeypot : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "honeypotchannels",
-                columns: table => new
-                {
-                    guildid = table.Column<ulong>(type: "bigint unsigned", nullable: false)
-                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                    channelid = table.Column<ulong>(type: "bigint unsigned", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("pk_honeypotchannels", x => x.guildid);
-                })
-                .Annotation("MySql:CharSet", "utf8mb4");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "honeypotchannels");
-        }
-    }
-}

src/NadekoBot/Migrations/PostgreSql/20220916194523_autopub.cs

@@ -9,12 +9,6 @@ namespace NadekoBot.Migrations.PostgreSql
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.AddColumn<decimal>(
-                name: "rolerequirement",
-                table: "shopentry",
-                type: "numeric(20,0)",
-                nullable: true);
-
             migrationBuilder.CreateTable(
                 name: "autopublishchannel",
                 columns: table => new
@@ -41,10 +35,6 @@ namespace NadekoBot.Migrations.PostgreSql
         {
             migrationBuilder.DropTable(
                 name: "autopublishchannel");
-
-            migrationBuilder.DropColumn(
-                name: "rolerequirement",
-                table: "shopentry");
         }
     }
 }

src/NadekoBot/Migrations/PostgreSql/20240912124719_greet-settings.cs

@@ -0,0 +1,199 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.PostgreSql
+{
+    /// <inheritdoc />
+    public partial class greetsettings : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "greetsettings",
+                columns: table => new
+                {
+                    id = table.Column<int>(type: "integer", nullable: false)
+                              .Annotation("Npgsql:ValueGenerationStrategy",
+                                  NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    guildid = table.Column<decimal>(type: "numeric(20,0)", nullable: false),
+                    greettype = table.Column<int>(type: "integer", nullable: false),
+                    messagetext = table.Column<string>(type: "text", nullable: true),
+                    isenabled = table.Column<bool>(type: "boolean", nullable: false, defaultValue: false),
+                    channelid = table.Column<decimal>(type: "numeric(20,0)", nullable: true),
+                    autodeletetimer = table.Column<int>(type: "integer", nullable: false, defaultValue: 0)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_greetsettings", x => x.id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "ix_greetsettings_guildid_greettype",
+                table: "greetsettings",
+                columns: new[] { "guildid", "greettype" },
+                unique: true);
+
+            MigrationQueries.GreetSettingsCopy(migrationBuilder);
+
+            migrationBuilder.DropColumn(
+                name: "autodeletebyemessagestimer",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "autodeletegreetmessagestimer",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "boostmessage",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "boostmessagechannelid",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "boostmessagedeleteafter",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "byemessagechannelid",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "channelbyemessagetext",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "channelgreetmessagetext",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "dmgreetmessagetext",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "greetmessagechannelid",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "sendboostmessage",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "sendchannelbyemessage",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "sendchannelgreetmessage",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "senddmgreetmessage",
+                table: "guildconfigs");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "greetsettings");
+
+            migrationBuilder.AddColumn<int>(
+                name: "autodeletebyemessagestimer",
+                table: "guildconfigs",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "autodeletegreetmessagestimer",
+                table: "guildconfigs",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<string>(
+                name: "boostmessage",
+                table: "guildconfigs",
+                type: "text",
+                nullable: true);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "boostmessagechannelid",
+                table: "guildconfigs",
+                type: "numeric(20,0)",
+                nullable: false,
+                defaultValue: 0m);
+
+            migrationBuilder.AddColumn<int>(
+                name: "boostmessagedeleteafter",
+                table: "guildconfigs",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "byemessagechannelid",
+                table: "guildconfigs",
+                type: "numeric(20,0)",
+                nullable: false,
+                defaultValue: 0m);
+
+            migrationBuilder.AddColumn<string>(
+                name: "channelbyemessagetext",
+                table: "guildconfigs",
+                type: "text",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "channelgreetmessagetext",
+                table: "guildconfigs",
+                type: "text",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "dmgreetmessagetext",
+                table: "guildconfigs",
+                type: "text",
+                nullable: true);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "greetmessagechannelid",
+                table: "guildconfigs",
+                type: "numeric(20,0)",
+                nullable: false,
+                defaultValue: 0m);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "sendboostmessage",
+                table: "guildconfigs",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "sendchannelbyemessage",
+                table: "guildconfigs",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "sendchannelgreetmessage",
+                table: "guildconfigs",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "senddmgreetmessage",
+                table: "guildconfigs",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+        }
+    }
+}

src/NadekoBot/Migrations/PostgreSql/20241018004623_warn-split.cs

@@ -0,0 +1,71 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.PostgreSql
+{
+    /// <inheritdoc />
+    public partial class warnsplit : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<decimal>(
+                name: "guildid",
+                table: "warningpunishment",
+                type: "numeric(20,0)",
+                nullable: false,
+                defaultValue: 0m);
+
+            MigrationQueries.AddGuildIdsToWarningPunishment(migrationBuilder);
+
+            migrationBuilder.DropForeignKey(
+                name: "fk_warningpunishment_guildconfigs_guildconfigid",
+                table: "warningpunishment");
+
+            migrationBuilder.DropIndex(
+                name: "ix_warningpunishment_guildconfigid",
+                table: "warningpunishment");
+
+            migrationBuilder.DropColumn(
+                name: "guildconfigid",
+                table: "warningpunishment");
+
+            migrationBuilder.AddUniqueConstraint(
+                name: "ak_warningpunishment_guildid_count",
+                table: "warningpunishment",
+                columns: new[] { "guildid", "count" });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropUniqueConstraint(
+                name: "ak_warningpunishment_guildid_count",
+                table: "warningpunishment");
+
+            migrationBuilder.DropColumn(
+                name: "guildid",
+                table: "warningpunishment");
+
+            migrationBuilder.AddColumn<int>(
+                name: "guildconfigid",
+                table: "warningpunishment",
+                type: "integer",
+                nullable: true);
+
+            migrationBuilder.CreateIndex(
+                name: "ix_warningpunishment_guildconfigid",
+                table: "warningpunishment",
+                column: "guildconfigid");
+
+            migrationBuilder.AddForeignKey(
+                name: "fk_warningpunishment_guildconfigs_guildconfigid",
+                table: "warningpunishment",
+                column: "guildconfigid",
+                principalTable: "guildconfigs",
+                principalColumn: "id",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

src/NadekoBot/Migrations/PostgreSql/20241028033704_ncanvas.cs

@@ -0,0 +1,54 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.PostgreSql
+{
+    /// <inheritdoc />
+    public partial class ncanvas : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "ncpixel",
+                columns: table => new
+                {
+                    id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    position = table.Column<int>(type: "integer", nullable: false),
+                    price = table.Column<long>(type: "bigint", nullable: false),
+                    ownerid = table.Column<decimal>(type: "numeric(20,0)", nullable: false),
+                    color = table.Column<long>(type: "bigint", nullable: false),
+                    text = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_ncpixel", x => x.id);
+                    table.UniqueConstraint("ak_ncpixel_position", x => x.position);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "ix_discorduser_username",
+                table: "discorduser",
+                column: "username");
+
+            migrationBuilder.CreateIndex(
+                name: "ix_ncpixel_ownerid",
+                table: "ncpixel",
+                column: "ownerid");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "ncpixel");
+
+            migrationBuilder.DropIndex(
+                name: "ix_discorduser_username",
+                table: "discorduser");
+        }
+    }
+}

src/NadekoBot/Migrations/PostgreSql/20241102022956_no-discrim-and-flag-translate.cs

@@ -0,0 +1,56 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.PostgreSql
+{
+    /// <inheritdoc />
+    public partial class nodiscrimandflagtranslate : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            MigrationQueries.UpdateUsernames(migrationBuilder);
+            
+            migrationBuilder.DropColumn(
+                name: "discriminator",
+                table: "discorduser");
+
+            migrationBuilder.CreateTable(
+                name: "flagtranslatechannel",
+                columns: table => new
+                {
+                    id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    guildid = table.Column<decimal>(type: "numeric(20,0)", nullable: false),
+                    channelid = table.Column<decimal>(type: "numeric(20,0)", nullable: false),
+                    dateadded = table.Column<DateTime>(type: "timestamp without time zone", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_flagtranslatechannel", x => x.id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "ix_flagtranslatechannel_guildid_channelid",
+                table: "flagtranslatechannel",
+                columns: new[] { "guildid", "channelid" },
+                unique: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "flagtranslatechannel");
+
+            migrationBuilder.AddColumn<string>(
+                name: "discriminator",
+                table: "discorduser",
+                type: "text",
+                nullable: true);
+        }
+    }
+}

src/NadekoBot/Migrations/PostgreSql/PostgreSqlContextModelSnapshot.cs

@@ -17,7 +17,7 @@ namespace NadekoBot.Migrations.PostgreSql
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "8.0.4")
+                .HasAnnotation("ProductVersion", "8.0.8")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@@ -751,10 +751,6 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
-                    b.Property<string>("Discriminator")
-                        .HasColumnType("text")
-                        .HasColumnName("discriminator");
-
                     b.Property<bool>("IsClubAdmin")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("boolean")
@@ -799,6 +795,9 @@ namespace NadekoBot.Migrations.PostgreSql
                     b.HasIndex("UserId")
                         .HasDatabaseName("ix_discorduser_userid");
 
+                    b.HasIndex("Username")
+                        .HasDatabaseName("ix_discorduser_username");
+
                     b.ToTable("discorduser", (string)null);
                 });
 
@@ -995,6 +994,37 @@ namespace NadekoBot.Migrations.PostgreSql
                     b.ToTable("filteredword", (string)null);
                 });
 
+            modelBuilder.Entity("NadekoBot.Db.Models.FlagTranslateChannel", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<decimal>("ChannelId")
+                        .HasColumnType("numeric(20,0)")
+                        .HasColumnName("channelid");
+
+                    b.Property<DateTime?>("DateAdded")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("dateadded");
+
+                    b.Property<decimal>("GuildId")
+                        .HasColumnType("numeric(20,0)")
+                        .HasColumnName("guildid");
+
+                    b.HasKey("Id")
+                        .HasName("pk_flagtranslatechannel");
+
+                    b.HasIndex("GuildId", "ChannelId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_flagtranslatechannel_guildid_channelid");
+
+                    b.ToTable("flagtranslatechannel", (string)null);
+                });
+
             modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
@@ -1220,42 +1250,10 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnType("text")
                         .HasColumnName("autoassignroleids");
 
-                    b.Property<int>("AutoDeleteByeMessagesTimer")
-                        .HasColumnType("integer")
-                        .HasColumnName("autodeletebyemessagestimer");
-
-                    b.Property<int>("AutoDeleteGreetMessagesTimer")
-                        .HasColumnType("integer")
-                        .HasColumnName("autodeletegreetmessagestimer");
-
                     b.Property<bool>("AutoDeleteSelfAssignedRoleMessages")
                         .HasColumnType("boolean")
                         .HasColumnName("autodeleteselfassignedrolemessages");
 
-                    b.Property<string>("BoostMessage")
-                        .HasColumnType("text")
-                        .HasColumnName("boostmessage");
-
-                    b.Property<decimal>("BoostMessageChannelId")
-                        .HasColumnType("numeric(20,0)")
-                        .HasColumnName("boostmessagechannelid");
-
-                    b.Property<int>("BoostMessageDeleteAfter")
-                        .HasColumnType("integer")
-                        .HasColumnName("boostmessagedeleteafter");
-
-                    b.Property<decimal>("ByeMessageChannelId")
-                        .HasColumnType("numeric(20,0)")
-                        .HasColumnName("byemessagechannelid");
-
-                    b.Property<string>("ChannelByeMessageText")
-                        .HasColumnType("text")
-                        .HasColumnName("channelbyemessagetext");
-
-                    b.Property<string>("ChannelGreetMessageText")
-                        .HasColumnType("text")
-                        .HasColumnName("channelgreetmessagetext");
-
                     b.Property<bool>("CleverbotEnabled")
                         .HasColumnType("boolean")
                         .HasColumnName("cleverbotenabled");
@@ -1276,10 +1274,6 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnType("boolean")
                         .HasColumnName("disableglobalexpressions");
 
-                    b.Property<string>("DmGreetMessageText")
-                        .HasColumnType("text")
-                        .HasColumnName("dmgreetmessagetext");
-
                     b.Property<bool>("ExclusiveSelfAssignedRoles")
                         .HasColumnType("boolean")
                         .HasColumnName("exclusiveselfassignedroles");
@@ -1300,10 +1294,6 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnType("numeric(20,0)")
                         .HasColumnName("gamevoicechannel");
 
-                    b.Property<decimal>("GreetMessageChannelId")
-                        .HasColumnType("numeric(20,0)")
-                        .HasColumnName("greetmessagechannelid");
-
                     b.Property<decimal>("GuildId")
                         .HasColumnType("numeric(20,0)")
                         .HasColumnName("guildid");
@@ -1328,22 +1318,6 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnType("text")
                         .HasColumnName("prefix");
 
-                    b.Property<bool>("SendBoostMessage")
-                        .HasColumnType("boolean")
-                        .HasColumnName("sendboostmessage");
-
-                    b.Property<bool>("SendChannelByeMessage")
-                        .HasColumnType("boolean")
-                        .HasColumnName("sendchannelbyemessage");
-
-                    b.Property<bool>("SendChannelGreetMessage")
-                        .HasColumnType("boolean")
-                        .HasColumnName("sendchannelgreetmessage");
-
-                    b.Property<bool>("SendDmGreetMessage")
-                        .HasColumnType("boolean")
-                        .HasColumnName("senddmgreetmessage");
-
                     b.Property<bool>("StickyRoles")
                         .HasColumnType("boolean")
                         .HasColumnName("stickyroles");
@@ -1683,6 +1657,49 @@ namespace NadekoBot.Migrations.PostgreSql
                     b.ToTable("muteduserid", (string)null);
                 });
 
+            modelBuilder.Entity("NadekoBot.Db.Models.NCPixel", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<long>("Color")
+                        .HasColumnType("bigint")
+                        .HasColumnName("color");
+
+                    b.Property<decimal>("OwnerId")
+                        .HasColumnType("numeric(20,0)")
+                        .HasColumnName("ownerid");
+
+                    b.Property<int>("Position")
+                        .HasColumnType("integer")
+                        .HasColumnName("position");
+
+                    b.Property<long>("Price")
+                        .HasColumnType("bigint")
+                        .HasColumnName("price");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("text");
+
+                    b.HasKey("Id")
+                        .HasName("pk_ncpixel");
+
+                    b.HasAlternateKey("Position")
+                        .HasName("ak_ncpixel_position");
+
+                    b.HasIndex("OwnerId")
+                        .HasDatabaseName("ix_ncpixel_ownerid");
+
+                    b.ToTable("ncpixel", (string)null);
+                });
+
             modelBuilder.Entity("NadekoBot.Db.Models.NadekoExpression", b =>
                 {
                     b.Property<int>("Id")
@@ -2994,9 +3011,9 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
-                    b.Property<int?>("GuildConfigId")
-                        .HasColumnType("integer")
-                        .HasColumnName("guildconfigid");
+                    b.Property<decimal>("GuildId")
+                        .HasColumnType("numeric(20,0)")
+                        .HasColumnName("guildid");
 
                     b.Property<int>("Punishment")
                         .HasColumnType("integer")
@@ -3013,8 +3030,8 @@ namespace NadekoBot.Migrations.PostgreSql
                     b.HasKey("Id")
                         .HasName("pk_warningpunishment");
 
-                    b.HasIndex("GuildConfigId")
-                        .HasDatabaseName("ix_warningpunishment_guildconfigid");
+                    b.HasAlternateKey("GuildId", "Count")
+                        .HasName("ak_warningpunishment_guildid_count");
 
                     b.ToTable("warningpunishment", (string)null);
                 });
@@ -3163,6 +3180,53 @@ namespace NadekoBot.Migrations.PostgreSql
                     b.ToTable("xpshopowneditem", (string)null);
                 });
 
+            modelBuilder.Entity("NadekoBot.Services.GreetSettings", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AutoDeleteTimer")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(0)
+                        .HasColumnName("autodeletetimer");
+
+                    b.Property<decimal?>("ChannelId")
+                        .HasColumnType("numeric(20,0)")
+                        .HasColumnName("channelid");
+
+                    b.Property<int>("GreetType")
+                        .HasColumnType("integer")
+                        .HasColumnName("greettype");
+
+                    b.Property<decimal>("GuildId")
+                        .HasColumnType("numeric(20,0)")
+                        .HasColumnName("guildid");
+
+                    b.Property<bool>("IsEnabled")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("isenabled");
+
+                    b.Property<string>("MessageText")
+                        .HasColumnType("text")
+                        .HasColumnName("messagetext");
+
+                    b.HasKey("Id")
+                        .HasName("pk_greetsettings");
+
+                    b.HasIndex("GuildId", "GreetType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_greetsettings_guildid_greettype");
+
+                    b.ToTable("greetsettings", (string)null);
+                });
+
             modelBuilder.Entity("NadekoBot.Db.Models.AntiAltSetting", b =>
                 {
                     b.HasOne("NadekoBot.Db.Models.GuildConfig", null)
@@ -3625,15 +3689,6 @@ namespace NadekoBot.Migrations.PostgreSql
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("NadekoBot.Db.Models.WarningPunishment", b =>
-                {
-                    b.HasOne("NadekoBot.Db.Models.GuildConfig", null)
-                        .WithMany("WarnPunishments")
-                        .HasForeignKey("GuildConfigId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .HasConstraintName("fk_warningpunishment_guildconfigs_guildconfigid");
-                });
-
             modelBuilder.Entity("NadekoBot.Db.Models.XpCurrencyReward", b =>
                 {
                     b.HasOne("NadekoBot.Db.Models.XpSettings", "XpSettings")
@@ -3749,8 +3804,6 @@ namespace NadekoBot.Migrations.PostgreSql
 
                     b.Navigation("VcRoleInfos");
 
-                    b.Navigation("WarnPunishments");
-
                     b.Navigation("XpSettings");
                 });
 

src/NadekoBot/Migrations/Sqlite/20240912124710_greet-settings.cs

@@ -0,0 +1,197 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations
+{
+    /// <inheritdoc />
+    public partial class greetsettings : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "GreetSettings",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "INTEGER", nullable: false)
+                              .Annotation("Sqlite:Autoincrement", true),
+                    GuildId = table.Column<ulong>(type: "INTEGER", nullable: false),
+                    GreetType = table.Column<int>(type: "INTEGER", nullable: false),
+                    MessageText = table.Column<string>(type: "TEXT", nullable: true),
+                    IsEnabled = table.Column<bool>(type: "INTEGER", nullable: false, defaultValue: false),
+                    ChannelId = table.Column<ulong>(type: "INTEGER", nullable: true),
+                    AutoDeleteTimer = table.Column<int>(type: "INTEGER", nullable: false, defaultValue: 0)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_GreetSettings", x => x.Id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_GreetSettings_GuildId_GreetType",
+                table: "GreetSettings",
+                columns: new[] { "GuildId", "GreetType" },
+                unique: true);
+            
+            MigrationQueries.GreetSettingsCopy(migrationBuilder);
+
+            migrationBuilder.DropColumn(
+                name: "AutoDeleteByeMessagesTimer",
+                table: "GuildConfigs");
+
+            migrationBuilder.DropColumn(
+                name: "AutoDeleteGreetMessagesTimer",
+                table: "GuildConfigs");
+
+            migrationBuilder.DropColumn(
+                name: "BoostMessage",
+                table: "GuildConfigs");
+
+            migrationBuilder.DropColumn(
+                name: "BoostMessageChannelId",
+                table: "GuildConfigs");
+
+            migrationBuilder.DropColumn(
+                name: "BoostMessageDeleteAfter",
+                table: "GuildConfigs");
+
+            migrationBuilder.DropColumn(
+                name: "ByeMessageChannelId",
+                table: "GuildConfigs");
+
+            migrationBuilder.DropColumn(
+                name: "ChannelByeMessageText",
+                table: "GuildConfigs");
+
+            migrationBuilder.DropColumn(
+                name: "ChannelGreetMessageText",
+                table: "GuildConfigs");
+
+            migrationBuilder.DropColumn(
+                name: "DmGreetMessageText",
+                table: "GuildConfigs");
+
+            migrationBuilder.DropColumn(
+                name: "GreetMessageChannelId",
+                table: "GuildConfigs");
+
+            migrationBuilder.DropColumn(
+                name: "SendBoostMessage",
+                table: "GuildConfigs");
+
+            migrationBuilder.DropColumn(
+                name: "SendChannelByeMessage",
+                table: "GuildConfigs");
+
+            migrationBuilder.DropColumn(
+                name: "SendChannelGreetMessage",
+                table: "GuildConfigs");
+
+            migrationBuilder.DropColumn(
+                name: "SendDmGreetMessage",
+                table: "GuildConfigs");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "GreetSettings");
+
+            migrationBuilder.AddColumn<int>(
+                name: "AutoDeleteByeMessagesTimer",
+                table: "GuildConfigs",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "AutoDeleteGreetMessagesTimer",
+                table: "GuildConfigs",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<string>(
+                name: "BoostMessage",
+                table: "GuildConfigs",
+                type: "TEXT",
+                nullable: true);
+
+            migrationBuilder.AddColumn<ulong>(
+                name: "BoostMessageChannelId",
+                table: "GuildConfigs",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: 0ul);
+
+            migrationBuilder.AddColumn<int>(
+                name: "BoostMessageDeleteAfter",
+                table: "GuildConfigs",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<ulong>(
+                name: "ByeMessageChannelId",
+                table: "GuildConfigs",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: 0ul);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ChannelByeMessageText",
+                table: "GuildConfigs",
+                type: "TEXT",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ChannelGreetMessageText",
+                table: "GuildConfigs",
+                type: "TEXT",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "DmGreetMessageText",
+                table: "GuildConfigs",
+                type: "TEXT",
+                nullable: true);
+
+            migrationBuilder.AddColumn<ulong>(
+                name: "GreetMessageChannelId",
+                table: "GuildConfigs",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: 0ul);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "SendBoostMessage",
+                table: "GuildConfigs",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "SendChannelByeMessage",
+                table: "GuildConfigs",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "SendChannelGreetMessage",
+                table: "GuildConfigs",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "SendDmGreetMessage",
+                table: "GuildConfigs",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: false);
+        }
+    }
+}

src/NadekoBot/Migrations/Sqlite/20241018004612_warn-split.cs

@@ -0,0 +1,72 @@
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations
+{
+    /// <inheritdoc />
+    public partial class warnsplit : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<ulong>(
+                name: "GuildId",
+                table: "WarningPunishment",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: 0ul);
+            
+            MigrationQueries.AddGuildIdsToWarningPunishment(migrationBuilder);
+            
+            migrationBuilder.DropForeignKey(
+                name: "FK_WarningPunishment_GuildConfigs_GuildConfigId",
+                table: "WarningPunishment");
+
+            migrationBuilder.DropIndex(
+                name: "IX_WarningPunishment_GuildConfigId",
+                table: "WarningPunishment");
+
+            migrationBuilder.DropColumn(
+                name: "GuildConfigId",
+                table: "WarningPunishment");
+
+            migrationBuilder.AddUniqueConstraint(
+                name: "AK_WarningPunishment_GuildId_Count",
+                table: "WarningPunishment",
+                columns: new[] { "GuildId", "Count" });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropUniqueConstraint(
+                name: "AK_WarningPunishment_GuildId_Count",
+                table: "WarningPunishment");
+
+            migrationBuilder.DropColumn(
+                name: "GuildId",
+                table: "WarningPunishment");
+
+            migrationBuilder.AddColumn<int>(
+                name: "GuildConfigId",
+                table: "WarningPunishment",
+                type: "INTEGER",
+                nullable: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_WarningPunishment_GuildConfigId",
+                table: "WarningPunishment",
+                column: "GuildConfigId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_WarningPunishment_GuildConfigs_GuildConfigId",
+                table: "WarningPunishment",
+                column: "GuildConfigId",
+                principalTable: "GuildConfigs",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

src/NadekoBot/Migrations/Sqlite/20241028033656_ncanvas.cs

@@ -0,0 +1,53 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations
+{
+    /// <inheritdoc />
+    public partial class ncanvas : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "NCPixel",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "INTEGER", nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    Position = table.Column<int>(type: "INTEGER", nullable: false),
+                    Price = table.Column<long>(type: "INTEGER", nullable: false),
+                    OwnerId = table.Column<ulong>(type: "INTEGER", nullable: false),
+                    Color = table.Column<uint>(type: "INTEGER", nullable: false),
+                    Text = table.Column<string>(type: "TEXT", maxLength: 256, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_NCPixel", x => x.Id);
+                    table.UniqueConstraint("AK_NCPixel_Position", x => x.Position);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_DiscordUser_Username",
+                table: "DiscordUser",
+                column: "Username");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_NCPixel_OwnerId",
+                table: "NCPixel",
+                column: "OwnerId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "NCPixel");
+
+            migrationBuilder.DropIndex(
+                name: "IX_DiscordUser_Username",
+                table: "DiscordUser");
+        }
+    }
+}

src/NadekoBot/Migrations/Sqlite/20241102022949_no-discrim-and-flag-translate.cs

@@ -0,0 +1,55 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations
+{
+    /// <inheritdoc />
+    public partial class nodiscrimandflagtranslate : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            MigrationQueries.UpdateUsernames(migrationBuilder);
+            
+            migrationBuilder.DropColumn(
+                name: "Discriminator",
+                table: "DiscordUser");
+
+            migrationBuilder.CreateTable(
+                name: "FlagTranslateChannel",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "INTEGER", nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    GuildId = table.Column<ulong>(type: "INTEGER", nullable: false),
+                    ChannelId = table.Column<ulong>(type: "INTEGER", nullable: false),
+                    DateAdded = table.Column<DateTime>(type: "TEXT", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_FlagTranslateChannel", x => x.Id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_FlagTranslateChannel_GuildId_ChannelId",
+                table: "FlagTranslateChannel",
+                columns: new[] { "GuildId", "ChannelId" },
+                unique: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "FlagTranslateChannel");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Discriminator",
+                table: "DiscordUser",
+                type: "TEXT",
+                nullable: true);
+        }
+    }
+}

src/NadekoBot/Migrations/Sqlite/NadekoSqliteContextModelSnapshot.cs

@@ -15,7 +15,7 @@ namespace NadekoBot.Migrations
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "8.0.4");
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.8");
 
             modelBuilder.Entity("NadekoBot.Db.Models.AntiAltSetting", b =>
                 {
@@ -560,9 +560,6 @@ namespace NadekoBot.Migrations
                     b.Property<DateTime?>("DateAdded")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("Discriminator")
-                        .HasColumnType("TEXT");
-
                     b.Property<bool>("IsClubAdmin")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("INTEGER")
@@ -596,6 +593,8 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("UserId");
 
+                    b.HasIndex("Username");
+
                     b.ToTable("DiscordUser");
                 });
 
@@ -741,6 +740,29 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
+            modelBuilder.Entity("NadekoBot.Db.Models.FlagTranslateChannel", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<ulong>("ChannelId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("DateAdded")
+                        .HasColumnType("TEXT");
+
+                    b.Property<ulong>("GuildId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GuildId", "ChannelId")
+                        .IsUnique();
+
+                    b.ToTable("FlagTranslateChannel");
+                });
+
             modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
@@ -907,33 +929,9 @@ namespace NadekoBot.Migrations
                     b.Property<string>("AutoAssignRoleIds")
                         .HasColumnType("TEXT");
 
-                    b.Property<int>("AutoDeleteByeMessagesTimer")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("AutoDeleteGreetMessagesTimer")
-                        .HasColumnType("INTEGER");
-
                     b.Property<bool>("AutoDeleteSelfAssignedRoleMessages")
                         .HasColumnType("INTEGER");
 
-                    b.Property<string>("BoostMessage")
-                        .HasColumnType("TEXT");
-
-                    b.Property<ulong>("BoostMessageChannelId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("BoostMessageDeleteAfter")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<ulong>("ByeMessageChannelId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("ChannelByeMessageText")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ChannelGreetMessageText")
-                        .HasColumnType("TEXT");
-
                     b.Property<bool>("CleverbotEnabled")
                         .HasColumnType("INTEGER");
 
@@ -949,9 +947,6 @@ namespace NadekoBot.Migrations
                     b.Property<bool>("DisableGlobalExpressions")
                         .HasColumnType("INTEGER");
 
-                    b.Property<string>("DmGreetMessageText")
-                        .HasColumnType("TEXT");
-
                     b.Property<bool>("ExclusiveSelfAssignedRoles")
                         .HasColumnType("INTEGER");
 
@@ -967,9 +962,6 @@ namespace NadekoBot.Migrations
                     b.Property<ulong?>("GameVoiceChannel")
                         .HasColumnType("INTEGER");
 
-                    b.Property<ulong>("GreetMessageChannelId")
-                        .HasColumnType("INTEGER");
-
                     b.Property<ulong>("GuildId")
                         .HasColumnType("INTEGER");
 
@@ -988,18 +980,6 @@ namespace NadekoBot.Migrations
                     b.Property<string>("Prefix")
                         .HasColumnType("TEXT");
 
-                    b.Property<bool>("SendBoostMessage")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("SendChannelByeMessage")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("SendChannelGreetMessage")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("SendDmGreetMessage")
-                        .HasColumnType("INTEGER");
-
                     b.Property<bool>("StickyRoles")
                         .HasColumnType("INTEGER");
 
@@ -1255,6 +1235,38 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
+            modelBuilder.Entity("NadekoBot.Db.Models.NCPixel", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("Color")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<ulong>("OwnerId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Position")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("Price")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasAlternateKey("Position");
+
+                    b.HasIndex("OwnerId");
+
+                    b.ToTable("NCPixel");
+                });
+
             modelBuilder.Entity("NadekoBot.Db.Models.NadekoExpression", b =>
                 {
                     b.Property<int>("Id")
@@ -2225,7 +2237,7 @@ namespace NadekoBot.Migrations
                     b.Property<DateTime?>("DateAdded")
                         .HasColumnType("TEXT");
 
-                    b.Property<int?>("GuildConfigId")
+                    b.Property<ulong>("GuildId")
                         .HasColumnType("INTEGER");
 
                     b.Property<int>("Punishment")
@@ -2239,7 +2251,7 @@ namespace NadekoBot.Migrations
 
                     b.HasKey("Id");
 
-                    b.HasIndex("GuildConfigId");
+                    b.HasAlternateKey("GuildId", "Count");
 
                     b.ToTable("WarningPunishment");
                 });
@@ -2351,6 +2363,42 @@ namespace NadekoBot.Migrations
                     b.ToTable("XpShopOwnedItem");
                 });
 
+            modelBuilder.Entity("NadekoBot.Services.GreetSettings", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("AutoDeleteTimer")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasDefaultValue(0);
+
+                    b.Property<ulong?>("ChannelId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("GreetType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<ulong>("GuildId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsEnabled")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("MessageText")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GuildId", "GreetType")
+                        .IsUnique();
+
+                    b.ToTable("GreetSettings");
+                });
+
             modelBuilder.Entity("NadekoBot.Db.Models.AntiAltSetting", b =>
                 {
                     b.HasOne("NadekoBot.Db.Models.GuildConfig", null)
@@ -2766,14 +2814,6 @@ namespace NadekoBot.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("NadekoBot.Db.Models.WarningPunishment", b =>
-                {
-                    b.HasOne("NadekoBot.Db.Models.GuildConfig", null)
-                        .WithMany("WarnPunishments")
-                        .HasForeignKey("GuildConfigId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
             modelBuilder.Entity("NadekoBot.Db.Models.XpCurrencyReward", b =>
                 {
                     b.HasOne("NadekoBot.Db.Models.XpSettings", "XpSettings")
@@ -2886,8 +2926,6 @@ namespace NadekoBot.Migrations
 
                     b.Navigation("VcRoleInfos");
 
-                    b.Navigation("WarnPunishments");
-
                     b.Navigation("XpSettings");
                 });
 

src/NadekoBot/Modules/Administration/AutoAssignableRoles/AutoAssignRoleCommands.cs

@@ -24,6 +24,13 @@ public partial class Administration
                 await Response().Error(strs.hierarchy).SendAsync();
                 return;
             }
+            
+            // the user can't aar the role which is greater or equal to the bot's highest role
+            if (role.Position >= ((SocketGuild)ctx.Guild).CurrentUser.GetRoles().Max(x => x.Position))
+            {
+                await Response().Error(strs.hierarchy).SendAsync();
+                return;
+            }
 
             var roles = await _service.ToggleAarAsync(ctx.Guild.Id, role.Id);
             if (roles.Count == 0)

src/NadekoBot/Modules/Administration/AutoPublishService.cs

@@ -1,4 +1,3 @@
-#nullable disable
 using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
 using NadekoBot.Common.ModuleBehaviors;
@@ -11,26 +10,26 @@ public class AutoPublishService : IExecNoCommand, IReadyExecutor, INService
     private readonly DbService _db;
     private readonly DiscordSocketClient _client;
     private readonly IBotCredsProvider _creds;
-    private ConcurrentDictionary<ulong, ulong> _enabled;
+    private ConcurrentDictionary<ulong, ulong> _enabled = new();
 
     public AutoPublishService(DbService db, DiscordSocketClient client, IBotCredsProvider creds)
     {
         _db = db;
         _client = client;
         _creds = creds;
-    } 
-    
-    public async Task ExecOnNoCommandAsync(IGuild guild, IUserMessage msg)
+    }
+
+    public async Task ExecOnNoCommandAsync(IGuild? guild, IUserMessage msg)
     {
         if (guild is null)
             return;
-        
+
         if (msg.Channel.GetChannelType() != ChannelType.News)
             return;
 
         if (!_enabled.TryGetValue(guild.Id, out var cid) || cid != msg.Channel.Id)
             return;
-        
+
         await msg.CrosspostAsync(new RequestOptions()
         {
             RetryMode = RetryMode.AlwaysFail
@@ -40,22 +39,34 @@ public class AutoPublishService : IExecNoCommand, IReadyExecutor, INService
     public async Task OnReadyAsync()
     {
         var creds = _creds.GetCreds();
-        
+
         await using var ctx = _db.GetDbContext();
         var items = await ctx.GetTable<AutoPublishChannel>()
-            .Where(x => Linq2DbExpressions.GuildOnShard(x.GuildId, creds.TotalShards, _client.ShardId))
-            .ToListAsyncLinqToDB();
+                             .Where(x => Linq2DbExpressions.GuildOnShard(x.GuildId, creds.TotalShards, _client.ShardId))
+                             .ToListAsyncLinqToDB();
 
         _enabled = items
-            .ToDictionary(x => x.GuildId, x => x.ChannelId)
-            .ToConcurrent();
+                   .ToDictionary(x => x.GuildId, x => x.ChannelId)
+                   .ToConcurrent();
+        
+        _client.LeftGuild += ClientOnLeftGuild;
     }
-    
+
+    private async Task ClientOnLeftGuild(SocketGuild guild)
+    {
+        await using var ctx = _db.GetDbContext();
+        _enabled.TryRemove(guild.Id, out _);
+
+        await ctx.GetTable<AutoPublishChannel>()
+                 .Where(x => x.GuildId == guild.Id)
+                 .DeleteAsync();
+    }
+
     public async Task<bool> ToggleAutoPublish(ulong guildId, ulong channelId)
     {
         await using var ctx = _db.GetDbContext();
         var deleted = await ctx.GetTable<AutoPublishChannel>()
-            .DeleteAsync(x => x.GuildId == guildId && x.ChannelId == channelId);
+                               .DeleteAsync(x => x.GuildId == guildId && x.ChannelId == channelId);
 
         if (deleted != 0)
         {
@@ -64,22 +75,22 @@ public class AutoPublishService : IExecNoCommand, IReadyExecutor, INService
         }
 
         await ctx.GetTable<AutoPublishChannel>()
-            .InsertOrUpdateAsync(() => new()
-                {
-                    GuildId = guildId,
-                    ChannelId = channelId,
-                    DateAdded = DateTime.UtcNow,
-                },
-                old => new()
-                {
-                    ChannelId = channelId,
-                    DateAdded = DateTime.UtcNow,
-                },
-                () => new()
-                {
-                    GuildId = guildId
-                });
-        
+                 .InsertOrUpdateAsync(() => new()
+                     {
+                         GuildId = guildId,
+                         ChannelId = channelId,
+                         DateAdded = DateTime.UtcNow,
+                     },
+                     old => new()
+                     {
+                         ChannelId = channelId,
+                         DateAdded = DateTime.UtcNow,
+                     },
+                     () => new()
+                     {
+                         GuildId = guildId
+                     });
+
         _enabled[guildId] = channelId;
 
         return true;

src/NadekoBot/Modules/Administration/DangerousCommands/CleanupCommands.cs

@@ -2,15 +2,19 @@
 
 namespace NadekoBot.Modules.Administration;
 
-public partial class Administration 
+public partial class Administration
 {
     [Group]
     public partial class CleanupCommands : CleanupModuleBase
     {
         private readonly ICleanupService _svc;
+        private readonly IBotCredsProvider _creds;
 
-        public CleanupCommands(ICleanupService svc)
-            => _svc = svc;
+        public CleanupCommands(ICleanupService svc, IBotCredsProvider creds)
+        {
+            _svc = svc;
+            _creds = creds;
+        }
 
         [Cmd]
         [OwnerOnly]
@@ -39,5 +43,32 @@ public partial class Administration
 
             await Response().Text("This guild's bot data will be saved.").SendAsync();
         }
+
+        [Cmd]
+        [OwnerOnly]
+        public async Task LeaveUnkeptServers(int startShardId, int shardMultiplier = 3000)
+        {
+            var keptGuildCount = await _svc.GetKeptGuildCount();
+
+            var response = await PromptUserConfirmAsync(new EmbedBuilder()
+                .WithDescription($"""
+                                  Do you want the bot to leave all unkept servers?
+
+                                  There are currently {keptGuildCount} kept servers.   
+
+                                  **This is a highly destructive and irreversible action.**
+                                  """));
+
+            if (!response)
+                return;
+
+            for (var shardId = startShardId; shardId < _creds.GetCreds().TotalShards; shardId++)
+            {
+                await _svc.StartLeavingUnkeptServers(shardId);
+                await Task.Delay(shardMultiplier * 1000);
+            }
+
+            await ctx.OkAsync();
+        }
     }
 }

src/NadekoBot/Modules/Administration/DangerousCommands/CleanupService.cs

@@ -9,9 +9,12 @@ namespace NadekoBot.Modules.Administration.DangerousCommands;
 
 public sealed class CleanupService : ICleanupService, IReadyExecutor, INService
 {
+    private TypedKey<KeepReport> _cleanupReportKey = new("cleanup:report");
+    private TypedKey<bool> _cleanupTriggerKey = new("cleanup:trigger");
+
+    private TypedKey<int> _keepTriggerKey = new("keep:trigger");
+
     private readonly IPubSub _pubSub;
-    private TypedKey<KeepReport> _keepReportKey = new("cleanup:report");
-    private TypedKey<bool> _keepTriggerKey = new("cleanup:trigger");
     private readonly DiscordSocketClient _client;
     private ConcurrentDictionary<int, ulong[]> guildIds = new();
     private readonly IBotCredsProvider _creds;
@@ -29,11 +32,90 @@ public sealed class CleanupService : ICleanupService, IReadyExecutor, INService
         _db = db;
     }
 
+    public async Task OnReadyAsync()
+    {
+        await _pubSub.Sub(_cleanupTriggerKey, OnCleanupTrigger);
+        await _pubSub.Sub(_keepTriggerKey, InternalTriggerKeep);
+
+        _client.JoinedGuild += ClientOnJoinedGuild;
+
+        if (_client.ShardId == 0)
+            await _pubSub.Sub(_cleanupReportKey, OnKeepReport);
+    }
+
+    private bool keepTriggered = false;
+
+    private async ValueTask InternalTriggerKeep(int shardId)
+    {
+        if (_client.ShardId != shardId)
+            return;
+
+        if (keepTriggered)
+            return;
+
+        keepTriggered = true;
+        try
+        {
+            var allGuildIds = _client.Guilds.Select(x => x.Id).ToArray();
+
+            HashSet<ulong> dontDelete;
+            await using (var db = _db.GetDbContext())
+            {
+                await using var ctx = db.CreateLinqToDBContext();
+                var table = ctx.CreateTable<KeptGuilds>(tableOptions: TableOptions.CheckExistence);
+
+                var dontDeleteList = await table
+                                           .Where(x => allGuildIds.Contains(x.GuildId))
+                                           .Select(x => x.GuildId)
+                                           .ToListAsyncLinqToDB();
+
+                dontDelete = dontDeleteList.ToHashSet();
+            }
+
+            Log.Information("Leaving {RemainingCount} guilds, 1 every second. {DontDeleteCount} will remain",
+                allGuildIds.Length - dontDelete.Count,
+                dontDelete.Count);
+            
+            foreach (var guildId in allGuildIds)
+            {
+                if (dontDelete.Contains(guildId))
+                    continue;
+
+                await Task.Delay(1016);
+
+                SocketGuild? guild = null;
+                try
+                {
+                    guild = _client.GetGuild(guildId);
+
+                    if (guild is null)
+                    {
+                        Log.Warning("Unable to find guild {GuildId}", guildId);
+                        continue;
+                    }
+
+                    await guild.LeaveAsync();
+                }
+                catch (Exception ex)
+                {
+                    Log.Warning("Unable to leave guild {GuildName} [{GuildId}]: {ErrorMessage}",
+                        guild?.Name,
+                        guildId,
+                        ex.Message);
+                }
+            }
+        }
+        finally
+        {
+            keepTriggered = false;
+        }
+    }
+
     public async Task<KeepResult?> DeleteMissingGuildDataAsync()
     {
         guildIds = new();
         var totalShards = _creds.GetCreds().TotalShards;
-        await _pubSub.Pub(_keepTriggerKey, true);
+        await _pubSub.Pub(_cleanupTriggerKey, true);
         var counter = 0;
         while (guildIds.Keys.Count < totalShards)
         {
@@ -124,6 +206,18 @@ public sealed class CleanupService : ICleanupService, IReadyExecutor, INService
                  .Where(x => !tempTable.Select(x => x.GuildId)
                                        .Contains(x.GuildId))
                  .DeleteAsync();
+        
+        // delete autopublish channels
+        await ctx.GetTable<AutoPublishChannel>()
+                 .Where(x => !tempTable.Select(x => x.GuildId)
+                                       .Contains(x.GuildId))
+                 .DeleteAsync();
+        
+        // delete greet settings
+        await ctx.GetTable<GreetSettings>()
+                 .Where(x => !tempTable.Select(x => x.GuildId)
+                                       .Contains(x.GuildId))
+                 .DeleteAsync();
 
         return new()
         {
@@ -135,9 +229,7 @@ public sealed class CleanupService : ICleanupService, IReadyExecutor, INService
     {
         await using var db = _db.GetDbContext();
         await using var ctx = db.CreateLinqToDBContext();
-
         var table = ctx.CreateTable<KeptGuilds>(tableOptions: TableOptions.CheckExistence);
-        
         if (await table.AnyAsyncLinqToDB(x => x.GuildId == guildId))
             return false;
 
@@ -149,30 +241,31 @@ public sealed class CleanupService : ICleanupService, IReadyExecutor, INService
         return true;
     }
 
+    public async Task<int> GetKeptGuildCount()
+    {
+        await using var db = _db.GetDbContext();
+        await using var ctx = db.CreateLinqToDBContext();
+        var table = ctx.CreateTable<KeptGuilds>(tableOptions: TableOptions.CheckExistence);
+        return await table.CountAsync();
+    }
+
+    public async Task StartLeavingUnkeptServers(int shardId)
+        => await _pubSub.Pub(_keepTriggerKey, shardId);
+
     private ValueTask OnKeepReport(KeepReport report)
     {
         guildIds[report.ShardId] = report.GuildIds;
         return default;
     }
 
-    public async Task OnReadyAsync()
-    {
-        await _pubSub.Sub(_keepTriggerKey, OnKeepTrigger);
-        
-        _client.JoinedGuild += ClientOnJoinedGuild;
-
-        if (_client.ShardId == 0)
-            await _pubSub.Sub(_keepReportKey, OnKeepReport);
-    }
-
     private async Task ClientOnJoinedGuild(SocketGuild arg)
     {
         await KeepGuild(arg.Id);
     }
 
-    private ValueTask OnKeepTrigger(bool arg)
+    private ValueTask OnCleanupTrigger(bool arg)
     {
-        _pubSub.Pub(_keepReportKey,
+        _pubSub.Pub(_cleanupReportKey,
             new KeepReport()
             {
                 ShardId = _client.ShardId,

src/NadekoBot/Modules/Administration/DangerousCommands/DangerousCommands.cs

@@ -138,8 +138,7 @@ public partial class Administration
         [OwnerOnly]
         public Task DeleteXp()
             => ConfirmActionInternalAsync("Delete Xp", () => _xcs.DeleteXp());
-
-
+        
         [Cmd]
         [OwnerOnly]
         public Task DeleteWaifus()

src/NadekoBot/Modules/Administration/DangerousCommands/_common/ICleanupService.cs

@@ -4,4 +4,6 @@ public interface ICleanupService
 {
     Task<KeepResult?> DeleteMissingGuildDataAsync();
     Task<bool> KeepGuild(ulong guildId);
+    Task<int> GetKeptGuildCount();
+    Task StartLeavingUnkeptServers(int shardId);
 }

src/NadekoBot/Modules/Administration/GreetBye/GreetCommands.cs

@@ -8,236 +8,240 @@ public partial class Administration
         [Cmd]
         [RequireContext(ContextType.Guild)]
         [UserPerm(GuildPerm.ManageGuild)]
-        public async Task Boost()
-        {
-            var enabled = await _service.ToggleBoost(ctx.Guild.Id, ctx.Channel.Id);
-
-            if (enabled)
-                await Response().Confirm(strs.boost_on).SendAsync();
-            else
-                await Response().Pending(strs.boost_off).SendAsync();
-        }
+        public Task Boost()
+            => Toggle(GreetType.Boost);
 
         [Cmd]
         [RequireContext(ContextType.Guild)]
         [UserPerm(GuildPerm.ManageGuild)]
-        public async Task BoostDel(int timer = 30)
+        public Task BoostDel(int timer = 30)
+            => SetDel(GreetType.Boost, timer);
+
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(GuildPerm.ManageGuild)]
+        public Task BoostMsg([Leftover] string? text = null)
+            => SetMsg(GreetType.Boost, text);
+
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(GuildPerm.ManageGuild)]
+        public Task Greet()
+            => Toggle(GreetType.Greet);
+
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(GuildPerm.ManageGuild)]
+        public Task GreetDel(int timer = 30)
+            => SetDel(GreetType.Greet, timer);
+
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(GuildPerm.ManageGuild)]
+        public Task GreetMsg([Leftover] string? text = null)
+            => SetMsg(GreetType.Greet, text);
+
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(GuildPerm.ManageGuild)]
+        public Task GreetDm()
+            => Toggle(GreetType.GreetDm);
+
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(GuildPerm.ManageGuild)]
+        public Task GreetDmMsg([Leftover] string? text = null)
+            => SetMsg(GreetType.GreetDm, text);
+
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(GuildPerm.ManageGuild)]
+        public Task Bye()
+            => Toggle(GreetType.Bye);
+
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(GuildPerm.ManageGuild)]
+        public Task ByeDel(int timer = 30)
+            => SetDel(GreetType.Bye, timer);
+
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(GuildPerm.ManageGuild)]
+        public Task ByeMsg([Leftover] string? text = null)
+            => SetMsg(GreetType.Bye, text);
+
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(GuildPerm.ManageGuild)]
+        public Task GreetTest([Leftover] IGuildUser? user = null)
+            => Test(GreetType.Greet, user);
+
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(GuildPerm.ManageGuild)]
+        public Task GreetDmTest([Leftover] IGuildUser? user = null)
+            => Test(GreetType.GreetDm, user);
+
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(GuildPerm.ManageGuild)]
+        [Ratelimit(5)]
+        public Task ByeTest([Leftover] IGuildUser? user = null)
+            => Test(GreetType.Bye, user);
+
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(GuildPerm.ManageGuild)]
+        [Ratelimit(5)]
+        public Task BoostTest([Leftover] IGuildUser? user = null)
+            => Test(GreetType.Boost, user);
+
+
+        public async Task Toggle(GreetType type)
+        {
+            var enabled = await _service.SetGreet(ctx.Guild.Id, ctx.Channel.Id, type);
+
+            if (enabled)
+                await Response()
+                      .Confirm(
+                          type switch
+                          {
+                              GreetType.Boost => strs.boost_on,
+                              GreetType.Greet => strs.greet_on,
+                              GreetType.Bye => strs.bye_on,
+                              GreetType.GreetDm => strs.greetdm_on,
+                              _ => strs.error
+                          }
+                      )
+                      .SendAsync();
+            else
+                await Response()
+                      .Pending(
+                          type switch
+                          {
+                              GreetType.Boost => strs.boost_off,
+                              GreetType.Greet => strs.greet_off,
+                              GreetType.Bye => strs.bye_off,
+                              GreetType.GreetDm => strs.greetdm_off,
+                              _ => strs.error
+                          }
+                      )
+                      .SendAsync();
+        }
+
+
+        public async Task SetDel(GreetType type, int timer)
         {
             if (timer is < 0 or > 600)
                 return;
 
-            await _service.SetBoostDel(ctx.Guild.Id, timer);
+            await _service.SetDeleteTimer(ctx.Guild.Id, type, timer);
 
             if (timer > 0)
-                await Response().Confirm(strs.boostdel_on(timer)).SendAsync();
+                await Response()
+                      .Confirm(
+                          type switch
+                          {
+                              GreetType.Boost => strs.boostdel_on(timer),
+                              GreetType.Greet => strs.greetdel_on(timer),
+                              GreetType.Bye => strs.byedel_on(timer),
+                              _ => strs.error
+                          }
+                      )
+                      .SendAsync();
             else
-                await Response().Pending(strs.boostdel_off).SendAsync();
+                await Response()
+                      .Pending(
+                          type switch
+                          {
+                              GreetType.Boost => strs.boostdel_off,
+                              GreetType.Greet => strs.greetdel_off,
+                              GreetType.Bye => strs.byedel_off,
+                              _ => strs.error
+                          })
+                      .SendAsync();
         }
 
-        [Cmd]
-        [RequireContext(ContextType.Guild)]
-        [UserPerm(GuildPerm.ManageGuild)]
-        public async Task BoostMsg([Leftover] string? text = null)
+
+        public async Task SetMsg(GreetType type, string? text = null)
         {
             if (string.IsNullOrWhiteSpace(text))
             {
-                var boostMessage = _service.GetBoostMessage(ctx.Guild.Id);
-                await Response().Confirm(strs.boostmsg_cur(boostMessage?.SanitizeMentions())).SendAsync();
+                var conf = await _service.GetGreetSettingsAsync(ctx.Guild.Id, type);
+                var msg = conf?.MessageText ?? GreetService.GetDefaultGreet(type);
+                await Response()
+                      .Confirm(
+                          type switch
+                          {
+                              GreetType.Boost => strs.boostmsg_cur(msg),
+                              GreetType.Greet => strs.greetmsg_cur(msg),
+                              GreetType.Bye => strs.byemsg_cur(msg),
+                              GreetType.GreetDm => strs.greetdmmsg_cur(msg),
+                              _ => strs.error
+                          })
+                      .SendAsync();
                 return;
             }
 
-            var sendBoostEnabled = _service.SetBoostMessage(ctx.Guild.Id, ref text);
+            var isEnabled = await _service.SetMessage(ctx.Guild.Id, type, text);
 
-            await Response().Confirm(strs.boostmsg_new).SendAsync();
-            if (!sendBoostEnabled)
-                await Response().Pending(strs.boostmsg_enable($"`{prefix}boost`")).SendAsync();
-        }
+            await Response()
+                  .Confirm(type switch
+                  {
+                      GreetType.Boost => strs.boostmsg_new,
+                      GreetType.Greet => strs.greetmsg_new,
+                      GreetType.Bye => strs.byemsg_new,
+                      GreetType.GreetDm => strs.greetdmmsg_new,
+                      _ => strs.error
+                  })
+                  .SendAsync();
 
-        [Cmd]
-        [RequireContext(ContextType.Guild)]
-        [UserPerm(GuildPerm.ManageGuild)]
-        public async Task GreetDel(int timer = 30)
-        {
-            if (timer is < 0 or > 600)
-                return;
 
-            await _service.SetGreetDel(ctx.Guild.Id, timer);
-
-            if (timer > 0)
-                await Response().Confirm(strs.greetdel_on(timer)).SendAsync();
-            else
-                await Response().Pending(strs.greetdel_off).SendAsync();
-        }
-
-        [Cmd]
-        [RequireContext(ContextType.Guild)]
-        [UserPerm(GuildPerm.ManageGuild)]
-        public async Task Greet()
-        {
-            var enabled = await _service.SetGreet(ctx.Guild.Id, ctx.Channel.Id);
-
-            if (enabled)
-                await Response().Confirm(strs.greet_on).SendAsync();
-            else
-                await Response().Pending(strs.greet_off).SendAsync();
-        }
-
-        [Cmd]
-        [RequireContext(ContextType.Guild)]
-        [UserPerm(GuildPerm.ManageGuild)]
-        public async Task GreetMsg([Leftover] string? text = null)
-        {
-            if (string.IsNullOrWhiteSpace(text))
+            if (!isEnabled)
             {
-                var greetMsg = _service.GetGreetMsg(ctx.Guild.Id);
-                await Response().Confirm(strs.greetmsg_cur(greetMsg?.SanitizeMentions())).SendAsync();
-                return;
+                await SendGreetEnableHint(type);
             }
-
-            var sendGreetEnabled = _service.SetGreetMessage(ctx.Guild.Id, ref text);
-
-            await Response().Confirm(strs.greetmsg_new).SendAsync();
-
-            if (!sendGreetEnabled)
-                await Response().Pending(strs.greetmsg_enable($"`{prefix}greet`")).SendAsync();
         }
 
-        [Cmd]
-        [RequireContext(ContextType.Guild)]
-        [UserPerm(GuildPerm.ManageGuild)]
-        public async Task GreetDm()
+        private static string GetCmdName(GreetType type)
         {
-            var enabled = await _service.SetGreetDm(ctx.Guild.Id);
-
-            if (enabled)
-                await Response().Confirm(strs.greetdm_on).SendAsync();
-            else
-                await Response().Confirm(strs.greetdm_off).SendAsync();
-        }
-
-        [Cmd]
-        [RequireContext(ContextType.Guild)]
-        [UserPerm(GuildPerm.ManageGuild)]
-        public async Task GreetDmMsg([Leftover] string? text = null)
-        {
-            if (string.IsNullOrWhiteSpace(text))
+            var cmdName = type switch
             {
-                var dmGreetMsg = _service.GetDmGreetMsg(ctx.Guild.Id);
-                await Response().Confirm(strs.greetdmmsg_cur(dmGreetMsg?.SanitizeMentions())).SendAsync();
-                return;
-            }
-
-            var sendGreetEnabled = _service.SetGreetDmMessage(ctx.Guild.Id, ref text);
-
-            await Response().Confirm(strs.greetdmmsg_new).SendAsync();
-            if (!sendGreetEnabled)
-                await Response().Pending(strs.greetdmmsg_enable($"`{prefix}greetdm`")).SendAsync();
+                GreetType.Greet => "greet",
+                GreetType.Bye => "bye",
+                GreetType.Boost => "boost",
+                GreetType.GreetDm => "greetdm",
+                _ => "unknown_command"
+            };
+            return cmdName;
         }
 
-        [Cmd]
-        [RequireContext(ContextType.Guild)]
-        [UserPerm(GuildPerm.ManageGuild)]
-        public async Task Bye()
+        public async Task Test(GreetType type, IGuildUser? user = null)
         {
-            var enabled = await _service.SetBye(ctx.Guild.Id, ctx.Channel.Id);
+            user ??= (IGuildUser)ctx.User;
 
-            if (enabled)
-                await Response().Confirm(strs.bye_on).SendAsync();
-            else
-                await Response().Confirm(strs.bye_off).SendAsync();
+            await _service.Test(ctx.Guild.Id, type, (ITextChannel)ctx.Channel, user);
+            var conf = await _service.GetGreetSettingsAsync(ctx.Guild.Id, type);
+
+            if (conf?.IsEnabled is not true)
+                await SendGreetEnableHint(type);
         }
 
-        [Cmd]
-        [RequireContext(ContextType.Guild)]
-        [UserPerm(GuildPerm.ManageGuild)]
-        public async Task ByeMsg([Leftover] string? text = null)
+        private async Task SendGreetEnableHint(GreetType type)
         {
-            if (string.IsNullOrWhiteSpace(text))
+            var cmd = $"`{prefix}{GetCmdName(type)}`";
+
+            var str = type switch
             {
-                var byeMsg = _service.GetByeMessage(ctx.Guild.Id);
-                await Response().Confirm(strs.byemsg_cur(byeMsg?.SanitizeMentions())).SendAsync();
-                return;
-            }
+                GreetType.Greet => strs.greetmsg_enable(cmd),
+                GreetType.Bye => strs.byemsg_enable(cmd),
+                GreetType.Boost => strs.boostmsg_enable(cmd),
+                GreetType.GreetDm => strs.greetdmmsg_enable(cmd),
+                _ => strs.error
+            };
 
-            var sendByeEnabled = _service.SetByeMessage(ctx.Guild.Id, ref text);
-
-            await Response().Confirm(strs.byemsg_new).SendAsync();
-            if (!sendByeEnabled)
-                await Response().Pending(strs.byemsg_enable($"`{prefix}bye`")).SendAsync();
-        }
-
-        [Cmd]
-        [RequireContext(ContextType.Guild)]
-        [UserPerm(GuildPerm.ManageGuild)]
-        public async Task ByeDel(int timer = 30)
-        {
-            await _service.SetByeDel(ctx.Guild.Id, timer);
-
-            if (timer > 0)
-                await Response().Confirm(strs.byedel_on(timer)).SendAsync();
-            else
-                await Response().Pending(strs.byedel_off).SendAsync();
-        }
-
-
-        [Cmd]
-        [RequireContext(ContextType.Guild)]
-        [UserPerm(GuildPerm.ManageGuild)]
-        [Ratelimit(5)]
-        public async Task ByeTest([Leftover] IGuildUser? user = null)
-        {
-            user ??= (IGuildUser)ctx.User;
-
-            await _service.ByeTest((ITextChannel)ctx.Channel, user);
-            var enabled = _service.GetByeEnabled(ctx.Guild.Id);
-            if (!enabled)
-                await Response().Pending(strs.byemsg_enable($"`{prefix}bye`")).SendAsync();
-        }
-
-        [Cmd]
-        [RequireContext(ContextType.Guild)]
-        [UserPerm(GuildPerm.ManageGuild)]
-        [Ratelimit(5)]
-        public async Task GreetTest([Leftover] IGuildUser? user = null)
-        {
-            user ??= (IGuildUser)ctx.User;
-
-            await _service.GreetTest((ITextChannel)ctx.Channel, user);
-            var enabled = _service.GetGreetEnabled(ctx.Guild.Id);
-            if (!enabled)
-                await Response().Pending(strs.greetmsg_enable($"`{prefix}greet`")).SendAsync();
-        }
-
-        [Cmd]
-        [RequireContext(ContextType.Guild)]
-        [UserPerm(GuildPerm.ManageGuild)]
-        [Ratelimit(5)]
-        public async Task GreetDmTest([Leftover] IGuildUser? user = null)
-        {
-            user ??= (IGuildUser)ctx.User;
-
-            var success = await _service.GreetDmTest(user);
-            if (success)
-                await ctx.OkAsync();
-            else
-                await ctx.WarningAsync();
-            var enabled = _service.GetGreetDmEnabled(ctx.Guild.Id);
-            if (!enabled)
-                await Response().Pending(strs.greetdmmsg_enable($"`{prefix}greetdm`")).SendAsync();
-        }
-
-        [Cmd]
-        [RequireContext(ContextType.Guild)]
-        [UserPerm(GuildPerm.ManageGuild)]
-        [Ratelimit(5)]
-        public async Task BoostTest([Leftover] IGuildUser? user = null)
-        {
-            user ??= (IGuildUser)ctx.User;
-
-            await _service.BoostTest((ITextChannel)ctx.Channel, user);
-            var enabled = _service.GetBoostEnabled(ctx.Guild.Id);
-            if (!enabled)
-                await Response().Pending(strs.boostmsg_enable($"`{prefix}boost`")).SendAsync();
+            await Response().Pending(str).SendAsync();
         }
     }
 }

src/NadekoBot/Modules/Administration/GreetBye/GreetGrouper.cs

@@ -1,71 +0,0 @@
-namespace NadekoBot.Services;
-
-public class GreetGrouper<T>
-{
-    private readonly Dictionary<ulong, HashSet<T>> _group;
-    private readonly object _locker = new();
-
-    public GreetGrouper()
-        => _group = new();
-
-
-    /// <summary>
-    ///     Creates a group, if group already exists, adds the specified user
-    /// </summary>
-    /// <param name="guildId">Id of the server for which to create group for</param>
-    /// <param name="toAddIfExists">User to add if group already exists</param>
-    /// <returns></returns>
-    public bool CreateOrAdd(ulong guildId, T toAddIfExists)
-    {
-        lock (_locker)
-        {
-            if (_group.TryGetValue(guildId, out var list))
-            {
-                list.Add(toAddIfExists);
-                return false;
-            }
-
-            _group[guildId] = new();
-            return true;
-        }
-    }
-
-    /// <summary>
-    ///     Remove the specified amount of items from the group. If all items are removed, group will be removed.
-    /// </summary>
-    /// <param name="guildId">Id of the group</param>
-    /// <param name="count">Maximum number of items to retrieve</param>
-    /// <param name="items">Items retrieved</param>
-    /// <returns>Whether the group has no more items left and is deleted</returns>
-    public bool ClearGroup(ulong guildId, int count, out IReadOnlyCollection<T> items)
-    {
-        lock (_locker)
-        {
-            if (_group.TryGetValue(guildId, out var set))
-            {
-                // if we want more than there are, return everything
-                if (count >= set.Count)
-                {
-                    items = set;
-                    _group.Remove(guildId);
-                    return true;
-                }
-
-                // if there are more in the group than what's needed
-                // take the requested number, remove them from the set
-                // and return them
-                var toReturn = set.TakeWhile(_ => count-- != 0).ToList();
-                foreach (var item in toReturn)
-                    set.Remove(item);
-
-                items = toReturn;
-                // returning falsemeans group is not yet deleted
-                // because there are items left
-                return false;
-            }
-
-            items = Array.Empty<T>();
-            return true;
-        }
-    }
-}

src/NadekoBot/Modules/Administration/GreetBye/GreetService.cs

@@ -1,63 +1,101 @@
+using LinqToDB;
+using LinqToDB.EntityFrameworkCore;
+using LinqToDB.Tools;
 using NadekoBot.Common.ModuleBehaviors;
-using NadekoBot.Db.Models;
 using System.Threading.Channels;
 
 namespace NadekoBot.Services;
 
 public class GreetService : INService, IReadyExecutor
 {
-    public bool GroupGreets
-        => _bss.Data.GroupGreets;
-
     private readonly DbService _db;
 
-    private readonly ConcurrentDictionary<ulong, GreetSettings> _guildConfigsCache;
+    private ConcurrentDictionary<GreetType, ConcurrentHashSet<ulong>> _enabled = new();
+
     private readonly DiscordSocketClient _client;
 
-    private readonly GreetGrouper<IGuildUser> _greets = new();
-    private readonly GreetGrouper<IUser> _byes = new();
-    private readonly BotConfigService _bss;
     private readonly IReplacementService _repSvc;
+    private readonly IBotCache _cache;
     private readonly IMessageSenderService _sender;
 
+    private readonly Channel<(GreetSettings, IUser, ITextChannel?)> _greetQueue =
+        Channel.CreateBounded<(GreetSettings, IUser, ITextChannel?)>(
+            new BoundedChannelOptions(60)
+            {
+                FullMode = BoundedChannelFullMode.DropOldest
+            });
+
     public GreetService(
         DiscordSocketClient client,
-        IBot bot,
         DbService db,
-        BotConfigService bss,
         IMessageSenderService sender,
-        IReplacementService repSvc)
+        IReplacementService repSvc,
+        IBotCache cache
+    )
     {
         _db = db;
         _client = client;
-        _bss = bss;
         _repSvc = repSvc;
+        _cache = cache;
         _sender = sender;
 
-        _guildConfigsCache = new(bot.AllGuildConfigs.ToDictionary(g => g.GuildId, GreetSettings.Create));
 
-        _client.UserJoined += OnUserJoined;
-        _client.UserLeft += OnUserLeft;
-
-        bot.JoinedGuild += OnBotJoinedGuild;
-        _client.LeftGuild += OnClientLeftGuild;
-
-        _client.GuildMemberUpdated += ClientOnGuildMemberUpdated;
+        foreach (var type in Enum.GetValues<GreetType>())
+        {
+            _enabled[type] = new();
+        }
     }
 
     public async Task OnReadyAsync()
     {
+        // cache all enabled guilds
+        await using (var uow = _db.GetDbContext())
+        {
+            var guilds = _client.Guilds.Select(x => x.Id).ToList();
+            var enabled = await uow.GetTable<GreetSettings>()
+                                   .Where(x => x.GuildId.In(guilds))
+                                   .Where(x => x.IsEnabled)
+                                   .Select(x => new
+                                   {
+                                       x.GuildId,
+                                       x.GreetType
+                                   })
+                                   .ToListAsync();
+
+            foreach (var e in enabled)
+            {
+                _enabled[e.GreetType].Add(e.GuildId);
+            }
+        }
+
+        _client.UserJoined += OnUserJoined;
+        _client.UserLeft += OnUserLeft;
+
+        _client.LeftGuild += OnClientLeftGuild;
+
+        _client.GuildMemberUpdated += ClientOnGuildMemberUpdated;
+
         while (true)
         {
-            var (conf, user, compl) = await _greetDmQueue.Reader.ReadAsync();
-            var res = await GreetDmUserInternal(conf, user);
-            compl.TrySetResult(res);
-            await Task.Delay(2000);
+            try
+            {
+                var (conf, user, ch) = await _greetQueue.Reader.ReadAsync();
+                await GreetUsers(conf, ch, user);
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, "Greet Loop almost crashed. Please report this!");
+            }
+
+            await Task.Delay(2016);
         }
     }
 
     private Task ClientOnGuildMemberUpdated(Cacheable<SocketGuildUser, ulong> optOldUser, SocketGuildUser newUser)
     {
+        if (!_enabled[GreetType.Boost].Contains(newUser.Guild.Id))
+            return Task.CompletedTask;
+
         // if user is a new booster
         // or boosted again the same server
         if ((optOldUser.Value is { PremiumSince: null } && newUser is { PremiumSince: not null })
@@ -65,60 +103,74 @@ public class GreetService : INService, IReadyExecutor
                 && newUser.PremiumSince is { } newDate
                 && newDate > oldDate))
         {
-            var conf = GetOrAddSettingsForGuild(newUser.Guild.Id);
-            if (!conf.SendBoostMessage)
-                return Task.CompletedTask;
+            _ = Task.Run(async () =>
+            {
+                var conf = await GetGreetSettingsAsync(newUser.Guild.Id, GreetType.Boost);
 
-            _ = Task.Run(TriggerBoostMessage(conf, newUser));
+                if (conf is null || !conf.IsEnabled)
+                    return;
+
+                ITextChannel? channel = null;
+                if (conf.ChannelId is { } cid)
+                    channel = newUser.Guild.GetTextChannel(cid);
+
+                if (channel is null)
+                    return;
+
+                await GreetUsers(conf, channel, newUser);
+            });
         }
 
         return Task.CompletedTask;
     }
 
-    private Func<Task> TriggerBoostMessage(GreetSettings conf, SocketGuildUser user)
-        => async () =>
-        {
-            var channel = user.Guild.GetTextChannel(conf.BoostMessageChannelId);
-            if (channel is null)
-                return;
-
-            await SendBoostMessage(conf, user, channel);
-        };
-
-    private async Task<bool> SendBoostMessage(GreetSettings conf, IGuildUser user, ITextChannel channel)
+    private async Task OnClientLeftGuild(SocketGuild guild)
     {
-        if (string.IsNullOrWhiteSpace(conf.BoostMessage))
-            return false;
-
-        var toSend = SmartText.CreateFrom(conf.BoostMessage);
-
-        try
+        foreach (var gt in Enum.GetValues<GreetType>())
         {
-            var newContent = await _repSvc.ReplaceAsync(toSend,
-                new(client: _client, guild: user.Guild, channel: channel, users: user));
-            var toDelete = await _sender.Response(channel).Text(newContent).Sanitize(false).SendAsync();
-            if (conf.BoostMessageDeleteAfter > 0)
-                toDelete.DeleteAfter(conf.BoostMessageDeleteAfter);
-
-            return true;
-        }
-        catch (Exception ex)
-        {
-            Log.Error(ex, "Error sending boost message");
+            _enabled[gt].TryRemove(guild.Id);
         }
 
-        return false;
+        await using var uow = _db.GetDbContext();
+        await uow.GetTable<GreetSettings>()
+                 .Where(x => x.GuildId == guild.Id)
+                 .DeleteAsync();
     }
 
-    private Task OnClientLeftGuild(SocketGuild arg)
+    private Task OnUserJoined(IGuildUser user)
     {
-        _guildConfigsCache.TryRemove(arg.Id, out _);
-        return Task.CompletedTask;
-    }
+        _ = Task.Run(async () =>
+        {
+            try
+            {
+                if (_enabled[GreetType.Greet].Contains(user.GuildId))
+                {
+                    var conf = await GetGreetSettingsAsync(user.GuildId, GreetType.Greet);
+                    if (conf?.ChannelId is ulong cid)
+                    {
+                        var channel = await user.Guild.GetTextChannelAsync(cid);
+                        if (channel is not null)
+                        {
+                            await _greetQueue.Writer.WriteAsync((conf, user, channel));
+                        }
+                    }
+                }
 
-    private Task OnBotJoinedGuild(GuildConfig gc)
-    {
-        _guildConfigsCache[gc.GuildId] = GreetSettings.Create(gc);
+
+                if (_enabled[GreetType.GreetDm].Contains(user.GuildId))
+                {
+                    var confDm = await GetGreetSettingsAsync(user.GuildId, GreetType.GreetDm);
+                    if (confDm is not null)
+                    {
+                        await _greetQueue.Writer.WriteAsync((confDm, user, null));
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, "Error in GreetService.OnUserJoined. This should not happen. Please report it");
+            }
+        });
         return Task.CompletedTask;
     }
 
@@ -126,37 +178,27 @@ public class GreetService : INService, IReadyExecutor
     {
         _ = Task.Run(async () =>
         {
+            if (!_enabled[GreetType.Bye].Contains(guild.Id))
+                return;
+
             try
             {
-                var conf = GetOrAddSettingsForGuild(guild.Id);
+                var conf = await GetGreetSettingsAsync(guild.Id, GreetType.Bye);
 
-                if (!conf.SendChannelByeMessage)
+                if (conf?.ChannelId is not { } cid)
                     return;
-                var channel = guild.TextChannels.FirstOrDefault(c => c.Id == conf.ByeMessageChannelId);
 
+                var channel = guild.GetChannel(cid) as ITextChannel;
                 if (channel is null) //maybe warn the server owner that the channel is missing
-                    return;
-
-                if (GroupGreets)
                 {
-                    // if group is newly created, greet that user right away,
-                    // but any user which joins in the next 5 seconds will
-                    // be greeted in a group greet
-                    if (_byes.CreateOrAdd(guild.Id, user))
-                    {
-                        // greet single user
-                        await ByeUsers(conf, channel, new[] { user });
-                        var groupClear = false;
-                        while (!groupClear)
-                        {
-                            await Task.Delay(5000);
-                            groupClear = _byes.ClearGroup(guild.Id, 5, out var toBye);
-                            await ByeUsers(conf, channel, toBye);
-                        }
-                    }
+                    Log.Warning("Channel {ChannelId} in {GuildId} was not found. Bye message will be disabled",
+                        conf.ChannelId,
+                        conf.GuildId);
+                    await SetGreet(guild.Id, null, GreetType.Bye, false);
+                    return;
                 }
-                else
-                    await ByeUsers(conf, channel, new[] { user });
+
+                await _greetQueue.Writer.WriteAsync((conf, user, channel));
             }
             catch
             {
@@ -166,98 +208,63 @@ public class GreetService : INService, IReadyExecutor
         return Task.CompletedTask;
     }
 
-    public string? GetDmGreetMsg(ulong id)
+    private TypedKey<GreetSettings?> GreetSettingsKey(ulong gid, GreetType type)
+        => new($"greet_settings:{gid}:{type}");
+
+    public async Task<GreetSettings?> GetGreetSettingsAsync(ulong gid, GreetType type)
+        => await _cache.GetOrAddAsync<GreetSettings?>(GreetSettingsKey(gid, type),
+            () => InternalGetGreetSettingsAsync(gid, type),
+            TimeSpan.FromSeconds(3));
+
+    private async Task<GreetSettings?> InternalGetGreetSettingsAsync(ulong gid, GreetType type)
     {
-        using var uow = _db.GetDbContext();
-        return uow.GuildConfigsForId(id, set => set).DmGreetMessageText;
+        await using var uow = _db.GetDbContext();
+        var res = await uow.GetTable<GreetSettings>()
+                           .Where(x => x.GuildId == gid && x.GreetType == type)
+                           .FirstOrDefaultAsync();
+
+        if (res is not null)
+            res.MessageText ??= GetDefaultGreet(type);
+
+        return res;
     }
 
-    public string? GetGreetMsg(ulong gid)
+    private async Task GreetUsers(GreetSettings conf, ITextChannel? channel, IUser user)
     {
-        using var uow = _db.GetDbContext();
-        return uow.GuildConfigsForId(gid, set => set).ChannelGreetMessageText;
-    }
+        if (conf.GreetType == GreetType.GreetDm)
+        {
+            if (user is not IGuildUser gu)
+                return;
 
-    public string? GetBoostMessage(ulong gid)
-    {
-        using var uow = _db.GetDbContext();
-        return uow.GuildConfigsForId(gid, set => set).BoostMessage;
-    }
+            await GreetDmUserInternal(conf, gu);
+            return;
+        }
 
-    public GreetSettings GetGreetSettings(ulong gid)
-    {
-        if (_guildConfigsCache.TryGetValue(gid, out var gs))
-            return gs;
-
-        using var uow = _db.GetDbContext();
-        return GreetSettings.Create(uow.GuildConfigsForId(gid, set => set));
-    }
-
-    private Task ByeUsers(GreetSettings conf, ITextChannel channel, IUser user)
-        => ByeUsers(conf, channel, new[] { user });
-
-    private async Task ByeUsers(GreetSettings conf, ITextChannel channel, IReadOnlyCollection<IUser> users)
-    {
-        if (!users.Any())
+        if (channel is null)
             return;
 
         var repCtx = new ReplacementContext(client: _client,
             guild: channel.Guild,
             channel: channel,
-            users: users.ToArray());
+            user: user);
 
-        var text = SmartText.CreateFrom(conf.ChannelByeMessageText);
+        var text = SmartText.CreateFrom(conf.MessageText);
         text = await _repSvc.ReplaceAsync(text, repCtx);
         try
         {
             var toDelete = await _sender.Response(channel).Text(text).Sanitize(false).SendAsync();
-            if (conf.AutoDeleteByeMessagesTimer > 0)
-                toDelete.DeleteAfter(conf.AutoDeleteByeMessagesTimer);
+            if (conf.AutoDeleteTimer > 0)
+                toDelete.DeleteAfter(conf.AutoDeleteTimer);
         }
-        catch (HttpException ex) when (ex.DiscordCode == DiscordErrorCode.InsufficientPermissions
-                                       || ex.DiscordCode == DiscordErrorCode.MissingPermissions
-                                       || ex.DiscordCode == DiscordErrorCode.UnknownChannel)
+        catch (HttpException ex) when (ex.DiscordCode is DiscordErrorCode.InsufficientPermissions
+                                           or DiscordErrorCode.MissingPermissions
+                                           or DiscordErrorCode.UnknownChannel)
         {
             Log.Warning(ex,
-                "Missing permissions to send a bye message, the bye message will be disabled on server: {GuildId}",
+                "Missing permissions to send a {GreetType} message, it will be disabled on server: {GuildId}",
+                conf.GreetType,
                 channel.GuildId);
-            await SetBye(channel.GuildId, channel.Id, false);
-        }
-        catch (Exception ex)
-        {
-            Log.Warning(ex, "Error embeding bye message");
-        }
-    }
-
-    private Task GreetUsers(GreetSettings conf, ITextChannel channel, IGuildUser user)
-        => GreetUsers(conf, channel, new[] { user });
-
-    private async Task GreetUsers(GreetSettings conf, ITextChannel channel, IReadOnlyCollection<IGuildUser> users)
-    {
-        if (users.Count == 0)
-            return;
-
-        var repCtx = new ReplacementContext(client: _client,
-            guild: channel.Guild,
-            channel: channel,
-            users: users.ToArray());
-
-        var text = SmartText.CreateFrom(conf.ChannelGreetMessageText);
-        text = await _repSvc.ReplaceAsync(text, repCtx);
-        try
-        {
-            var toDelete = await _sender.Response(channel).Text(text).Sanitize(false).SendAsync();
-            if (conf.AutoDeleteGreetMessagesTimer > 0)
-                toDelete.DeleteAfter(conf.AutoDeleteGreetMessagesTimer);
-        }
-        catch (HttpException ex) when (ex.DiscordCode == DiscordErrorCode.InsufficientPermissions
-                                       || ex.DiscordCode == DiscordErrorCode.MissingPermissions
-                                       || ex.DiscordCode == DiscordErrorCode.UnknownChannel)
-        {
-            Log.Warning(ex,
-                "Missing permissions to send a bye message, the greet message will be disabled on server: {GuildId}",
-                channel.GuildId);
-            await SetGreet(channel.GuildId, channel.Id, false);
+            await SetGreet(channel.GuildId, channel.Id, conf.GreetType, false);
         }
         catch (Exception ex)
         {
@@ -265,33 +272,12 @@ public class GreetService : INService, IReadyExecutor
         }
     }
 
-    private readonly Channel<(GreetSettings, IGuildUser, TaskCompletionSource<bool>)> _greetDmQueue =
-        Channel.CreateBounded<(GreetSettings, IGuildUser, TaskCompletionSource<bool>)>(new BoundedChannelOptions(60)
-        {
-            // The limit of 60 users should be only hit when there's a raid. In that case 
-            // probably the best thing to do is to drop newest (raiding) users
-            FullMode = BoundedChannelFullMode.DropNewest
-        });
-
-
-    private async Task<bool> GreetDmUser(GreetSettings conf, IGuildUser user)
-    {
-        var completionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-        await _greetDmQueue.Writer.WriteAsync((conf, user, completionSource));
-        return await completionSource.Task;
-    }
-
     private async Task<bool> GreetDmUserInternal(GreetSettings conf, IGuildUser user)
     {
         try
         {
-            // var rep = new ReplacementBuilder()
-            // .WithUser(user)
-            // .WithServer(_client, (SocketGuild)user.Guild)
-            // .Build();
-
-            var repCtx = new ReplacementContext(client: _client, guild: user.Guild, users: user);
-            var smartText = SmartText.CreateFrom(conf.DmGreetMessageText);
+            var repCtx = new ReplacementContext(client: _client, guild: user.Guild, user: user);
+            var smartText = SmartText.CreateFrom(conf.MessageText);
             smartText = await _repSvc.ReplaceAsync(smartText, repCtx);
 
             if (smartText is SmartPlainText pt)
@@ -351,8 +337,9 @@ public class GreetService : INService, IReadyExecutor
 
             await _sender.Response(user).Text(smartText).Sanitize(false).SendAsync();
         }
-        catch
+        catch (Exception ex)
         {
+            Log.Warning(ex, "Unable to send Greet DM. Probably the user has closed DMs");
             return false;
         }
 
@@ -366,303 +353,156 @@ public class GreetService : INService, IReadyExecutor
             IconUrl = user.Guild.IconUrl
         };
 
-    private Task OnUserJoined(IGuildUser user)
-    {
-        _ = Task.Run(async () =>
-        {
-            try
-            {
-                var conf = GetOrAddSettingsForGuild(user.GuildId);
 
-                if (conf.SendChannelGreetMessage)
-                {
-                    var channel = await user.Guild.GetTextChannelAsync(conf.GreetMessageChannelId);
-                    if (channel is not null)
+    public static string GetDefaultGreet(GreetType greetType)
+        => greetType switch
+        {
+            GreetType.Boost => "%user.mention% has boosted the server!",
+            GreetType.Greet => "%user.mention% has joined the server!",
+            GreetType.Bye => "%user.name% has left the server!",
+            GreetType.GreetDm => "Welcome to the server %user.name%",
+            _ => "%user.name% did something new!"
+        };
+
+    public async Task<bool> SetGreet(
+        ulong guildId,
+        ulong? channelId,
+        GreetType greetType,
+        bool? value = null)
+    {
+        await using var uow = _db.GetDbContext();
+        var q = uow.GetTable<GreetSettings>();
+
+        if (value is null)
+            value = !_enabled[greetType].Contains(guildId);
+
+        if (value is { } v)
+        {
+            await q
+                .InsertOrUpdateAsync(() => new()
                     {
-                        if (GroupGreets)
-                        {
-                            // if group is newly created, greet that user right away,
-                            // but any user which joins in the next 5 seconds will
-                            // be greeted in a group greet
-                            if (_greets.CreateOrAdd(user.GuildId, user))
-                            {
-                                // greet single user
-                                await GreetUsers(conf, channel, new[] { user });
-                                var groupClear = false;
-                                while (!groupClear)
-                                {
-                                    await Task.Delay(5000);
-                                    groupClear = _greets.ClearGroup(user.GuildId, 5, out var toGreet);
-                                    await GreetUsers(conf, channel, toGreet);
-                                }
-                            }
-                        }
-                        else
-                            await GreetUsers(conf, channel, new[] { user });
-                    }
-                }
-
-                if (conf.SendDmGreetMessage)
-                    await GreetDmUser(conf, user);
-            }
-            catch
-            {
-                // ignored
-            }
-        });
-        return Task.CompletedTask;
-    }
-
-    public string? GetByeMessage(ulong gid)
-    {
-        using var uow = _db.GetDbContext();
-        return uow.GuildConfigsForId(gid, set => set).ChannelByeMessageText;
-    }
-
-    public GreetSettings GetOrAddSettingsForGuild(ulong guildId)
-    {
-        if (_guildConfigsCache.TryGetValue(guildId, out var settings))
-            return settings;
-
-        using (var uow = _db.GetDbContext())
-        {
-            var gc = uow.GuildConfigsForId(guildId, set => set);
-            settings = GreetSettings.Create(gc);
+                        GuildId = guildId,
+                        GreetType = greetType,
+                        IsEnabled = v,
+                        ChannelId = channelId,
+                    },
+                    (old) => new()
+                    {
+                        IsEnabled = v,
+                        ChannelId = channelId,
+                    },
+                    () => new()
+                    {
+                        GuildId = guildId,
+                        GreetType = greetType,
+                    });
         }
 
-        _guildConfigsCache.TryAdd(guildId, settings);
-        return settings;
+        if (value is true)
+        {
+            _enabled[greetType].Add(guildId);
+            return true;
+        }
+
+        _enabled[greetType].TryRemove(guildId);
+        return false;
     }
 
-    public async Task<bool> SetGreet(ulong guildId, ulong channelId, bool? value = null)
+
+    public async Task<bool> SetMessage(ulong guildId, GreetType greetType, string? message)
     {
-        await using var uow = _db.GetDbContext();
-        var conf = uow.GuildConfigsForId(guildId, set => set);
-        var enabled = conf.SendChannelGreetMessage = value ?? !conf.SendChannelGreetMessage;
-        conf.GreetMessageChannelId = channelId;
+        await using (var uow = _db.GetDbContext())
+        {
+            await uow.GetTable<GreetSettings>()
+                     .InsertOrUpdateAsync(() => new()
+                         {
+                             GuildId = guildId,
+                             GreetType = greetType,
+                             MessageText = message
+                         },
+                         x => new()
+                         {
+                             MessageText = message
+                         },
+                         () => new()
+                         {
+                             GuildId = guildId,
+                             GreetType = greetType
+                         });
+        }
 
-        var toAdd = GreetSettings.Create(conf);
-        _guildConfigsCache[guildId] = toAdd;
+        var conf = await GetGreetSettingsAsync(guildId, greetType);
 
-        await uow.SaveChangesAsync();
-        return enabled;
+        return conf?.IsEnabled ?? false;
     }
 
-    public bool SetGreetMessage(ulong guildId, ref string message)
+    public async Task<bool> SetDeleteTimer(ulong guildId, GreetType greetType, int timer)
     {
-        message = message.SanitizeMentions();
-
-        if (string.IsNullOrWhiteSpace(message))
-            throw new ArgumentNullException(nameof(message));
-
-        using var uow = _db.GetDbContext();
-        var conf = uow.GuildConfigsForId(guildId, set => set);
-        conf.ChannelGreetMessageText = message;
-        var greetMsgEnabled = conf.SendChannelGreetMessage;
-
-        var toAdd = GreetSettings.Create(conf);
-        _guildConfigsCache.AddOrUpdate(guildId, toAdd, (_, _) => toAdd);
-
-        uow.SaveChanges();
-        return greetMsgEnabled;
-    }
-
-    public async Task<bool> SetGreetDm(ulong guildId, bool? value = null)
-    {
-        await using var uow = _db.GetDbContext();
-        var conf = uow.GuildConfigsForId(guildId, set => set);
-        var enabled = conf.SendDmGreetMessage = value ?? !conf.SendDmGreetMessage;
-
-        var toAdd = GreetSettings.Create(conf);
-        _guildConfigsCache[guildId] = toAdd;
-
-        await uow.SaveChangesAsync();
-        return enabled;
-    }
-
-    public bool SetGreetDmMessage(ulong guildId, ref string? message)
-    {
-        message = message?.SanitizeMentions();
-
-        if (string.IsNullOrWhiteSpace(message))
-            throw new ArgumentNullException(nameof(message));
-
-        using var uow = _db.GetDbContext();
-        var conf = uow.GuildConfigsForId(guildId, set => set);
-        conf.DmGreetMessageText = message;
-
-        var toAdd = GreetSettings.Create(conf);
-        _guildConfigsCache[guildId] = toAdd;
-
-        uow.SaveChanges();
-        return conf.SendDmGreetMessage;
-    }
-
-    public async Task<bool> SetBye(ulong guildId, ulong channelId, bool? value = null)
-    {
-        await using var uow = _db.GetDbContext();
-        var conf = uow.GuildConfigsForId(guildId, set => set);
-        var enabled = conf.SendChannelByeMessage = value ?? !conf.SendChannelByeMessage;
-        conf.ByeMessageChannelId = channelId;
-
-        var toAdd = GreetSettings.Create(conf);
-        _guildConfigsCache[guildId] = toAdd;
-
-        await uow.SaveChangesAsync();
-        return enabled;
-    }
-
-    public bool SetByeMessage(ulong guildId, ref string? message)
-    {
-        message = message?.SanitizeMentions();
-
-        if (string.IsNullOrWhiteSpace(message))
-            throw new ArgumentNullException(nameof(message));
-
-        using var uow = _db.GetDbContext();
-        var conf = uow.GuildConfigsForId(guildId, set => set);
-        conf.ChannelByeMessageText = message;
-
-        var toAdd = GreetSettings.Create(conf);
-        _guildConfigsCache[guildId] = toAdd;
-
-        uow.SaveChanges();
-        return conf.SendChannelByeMessage;
-    }
-
-    public async Task SetByeDel(ulong guildId, int timer)
-    {
-        if (timer is < 0 or > 600)
-            return;
-
-        await using var uow = _db.GetDbContext();
-        var conf = uow.GuildConfigsForId(guildId, set => set);
-        conf.AutoDeleteByeMessagesTimer = timer;
-
-        var toAdd = GreetSettings.Create(conf);
-        _guildConfigsCache[guildId] = toAdd;
-
-        await uow.SaveChangesAsync();
-    }
-
-    public async Task SetGreetDel(ulong guildId, int timer)
-    {
-        if (timer is < 0 or > 600)
-            return;
-
-        await using var uow = _db.GetDbContext();
-        var conf = uow.GuildConfigsForId(guildId, set => set);
-        conf.AutoDeleteGreetMessagesTimer = timer;
-
-        var toAdd = GreetSettings.Create(conf);
-        _guildConfigsCache[guildId] = toAdd;
-
-        await uow.SaveChangesAsync();
-    }
-
-    public bool SetBoostMessage(ulong guildId, ref string message)
-    {
-        using var uow = _db.GetDbContext();
-        var conf = uow.GuildConfigsForId(guildId, set => set);
-        conf.BoostMessage = message;
-
-        var toAdd = GreetSettings.Create(conf);
-        _guildConfigsCache[guildId] = toAdd;
-
-        uow.SaveChanges();
-        return conf.SendBoostMessage;
-    }
-
-    public async Task SetBoostDel(ulong guildId, int timer)
-    {
-        if (timer is < 0 or > 600)
+        if (timer < 0 || timer > 3600)
             throw new ArgumentOutOfRangeException(nameof(timer));
 
-        await using var uow = _db.GetDbContext();
-        var conf = uow.GuildConfigsForId(guildId, set => set);
-        conf.BoostMessageDeleteAfter = timer;
+        await using (var uow = _db.GetDbContext())
+        {
+            await uow.GetTable<GreetSettings>()
+                     .InsertOrUpdateAsync(() => new()
+                         {
+                             GuildId = guildId,
+                             GreetType = greetType,
+                             AutoDeleteTimer = timer,
+                         },
+                         x => new()
+                         {
+                             AutoDeleteTimer = timer
+                         },
+                         () => new()
+                         {
+                             GuildId = guildId,
+                             GreetType = greetType
+                         });
+        }
 
-        var toAdd = GreetSettings.Create(conf);
-        _guildConfigsCache[guildId] = toAdd;
+        var conf = await GetGreetSettingsAsync(guildId, greetType);
 
-        await uow.SaveChangesAsync();
+        return conf?.IsEnabled ?? false;
     }
 
-    public async Task<bool> ToggleBoost(ulong guildId, ulong channelId, bool? forceState = null)
+
+    public async Task<bool> Test(
+        ulong guildId,
+        GreetType type,
+        IMessageChannel channel,
+        IGuildUser user)
     {
-        await using var uow = _db.GetDbContext();
-        var conf = uow.GuildConfigsForId(guildId, set => set);
+        var conf = await GetGreetSettingsAsync(guildId, type);
+        if (conf is null)
+        {
+            conf = new GreetSettings()
+            {
+                ChannelId = channel.Id,
+                GreetType = type,
+                IsEnabled = false,
+                GuildId = guildId,
+                AutoDeleteTimer = 30,
+                MessageText = GetDefaultGreet(type)
+            };
+        }
 
-        if (forceState is not bool fs)
-            conf.SendBoostMessage = !conf.SendBoostMessage;
-        else
-            conf.SendBoostMessage = fs;
-
-        conf.BoostMessageChannelId = channelId;
-        await uow.SaveChangesAsync();
-
-        var toAdd = GreetSettings.Create(conf);
-        _guildConfigsCache[guildId] = toAdd;
-        return conf.SendBoostMessage;
+        await SendMessage(conf, channel, user);
+        return true;
     }
 
-    #region Get Enabled Status
-
-    public bool GetGreetDmEnabled(ulong guildId)
+    public async Task<bool> SendMessage(GreetSettings conf, IMessageChannel channel, IGuildUser user)
     {
-        using var uow = _db.GetDbContext();
-        var conf = uow.GuildConfigsForId(guildId, set => set);
-        return conf.SendDmGreetMessage;
+        if (conf.GreetType == GreetType.GreetDm)
+        {
+            await _greetQueue.Writer.WriteAsync((conf, user, null));
+            return true;
+        }
+
+        if (channel is not ITextChannel ch)
+            return false;
+
+        await GreetUsers(conf, ch, user);
+        return true;
     }
-
-    public bool GetGreetEnabled(ulong guildId)
-    {
-        using var uow = _db.GetDbContext();
-        var conf = uow.GuildConfigsForId(guildId, set => set);
-        return conf.SendChannelGreetMessage;
-    }
-
-    public bool GetByeEnabled(ulong guildId)
-    {
-        using var uow = _db.GetDbContext();
-        var conf = uow.GuildConfigsForId(guildId, set => set);
-        return conf.SendChannelByeMessage;
-    }
-
-    public bool GetBoostEnabled(ulong guildId)
-    {
-        using var uow = _db.GetDbContext();
-        var conf = uow.GuildConfigsForId(guildId, set => set);
-        return conf.SendBoostMessage;
-    }
-
-    #endregion
-
-    #region Test Messages
-
-    public Task ByeTest(ITextChannel channel, IGuildUser user)
-    {
-        var conf = GetOrAddSettingsForGuild(user.GuildId);
-        return ByeUsers(conf, channel, user);
-    }
-
-    public Task GreetTest(ITextChannel channel, IGuildUser user)
-    {
-        var conf = GetOrAddSettingsForGuild(user.GuildId);
-        return GreetUsers(conf, channel, user);
-    }
-
-    public Task<bool> GreetDmTest(IGuildUser user)
-    {
-        var conf = GetOrAddSettingsForGuild(user.GuildId);
-        return GreetDmUser(conf, user);
-    }
-
-    public Task<bool> BoostTest(ITextChannel channel, IGuildUser user)
-    {
-        var conf = GetOrAddSettingsForGuild(user.GuildId);
-        return SendBoostMessage(conf, user, channel);
-    }
-
-    #endregion
 }

src/NadekoBot/Modules/Administration/GreetBye/GreetSettings.cs

@@ -1,45 +1,21 @@
-using NadekoBot.Db.Models;
-
 namespace NadekoBot.Services;
 
+public enum GreetType
+{
+    Greet,
+    GreetDm,
+    Bye,
+    Boost,
+}
+
 public class GreetSettings
 {
-    public int AutoDeleteGreetMessagesTimer { get; set; }
-    public int AutoDeleteByeMessagesTimer { get; set; }
-
-    public ulong GreetMessageChannelId { get; set; }
-    public ulong ByeMessageChannelId { get; set; }
-
-    public bool SendDmGreetMessage { get; set; }
-    public string? DmGreetMessageText { get; set; }
-
-    public bool SendChannelGreetMessage { get; set; }
-    public string? ChannelGreetMessageText { get; set; }
-
-    public bool SendChannelByeMessage { get; set; }
-    public string? ChannelByeMessageText { get; set; }
-
-    public bool SendBoostMessage { get; set; }
-    public string? BoostMessage { get; set; }
-    public int BoostMessageDeleteAfter { get; set; }
-    public ulong BoostMessageChannelId { get; set; }
-
-    public static GreetSettings Create(GuildConfig g)
-        => new()
-        {
-            AutoDeleteByeMessagesTimer = g.AutoDeleteByeMessagesTimer,
-            AutoDeleteGreetMessagesTimer = g.AutoDeleteGreetMessagesTimer,
-            GreetMessageChannelId = g.GreetMessageChannelId,
-            ByeMessageChannelId = g.ByeMessageChannelId,
-            SendDmGreetMessage = g.SendDmGreetMessage,
-            DmGreetMessageText = g.DmGreetMessageText,
-            SendChannelGreetMessage = g.SendChannelGreetMessage,
-            ChannelGreetMessageText = g.ChannelGreetMessageText,
-            SendChannelByeMessage = g.SendChannelByeMessage,
-            ChannelByeMessageText = g.ChannelByeMessageText,
-            SendBoostMessage = g.SendBoostMessage,
-            BoostMessage = g.BoostMessage,
-            BoostMessageDeleteAfter = g.BoostMessageDeleteAfter,
-            BoostMessageChannelId = g.BoostMessageChannelId
-        };
+    public int Id { get; set; }
+    
+    public ulong GuildId { get; set; }
+    public GreetType GreetType { get; set; }
+    public string? MessageText { get; set; }
+    public bool IsEnabled { get; set; }
+    public ulong? ChannelId { get; set; }
+    public int AutoDeleteTimer { get; set; }
 }