From 26cc76a71e0b047978c17e08dfa3ffb6c991e056 Mon Sep 17 00:00:00 2001 From: Nora <51166756+AnalogFeelings@users.noreply.github.com> Date: Thu, 21 Nov 2024 20:31:27 +0100 Subject: [PATCH] [Bot -> All] Rename SammBot.Bot to SammBot. --- SammBot.sln | 2 +- Source/{SammBot.Bot => SammBot}/EntryPoint.cs | 4 ++-- .../20221009171828_InitialCreate.Designer.cs | 4 ++-- .../Migrations/20221009171828_InitialCreate.cs | 2 +- ...012182248_GuildConfig_LoggingWelcome.Designer.cs | 12 ++++++------ .../20221012182248_GuildConfig_LoggingWelcome.cs | 2 +- .../20230218141010_NewWelcomeFormat.Designer.cs | 12 ++++++------ .../Migrations/20230218141010_NewWelcomeFormat.cs | 2 +- .../20230219194706_AddGeneratedIds.Designer.cs | 12 ++++++------ .../Migrations/20230219194706_AddGeneratedIds.cs | 2 +- .../20230318162015_AlternateIndices.Designer.cs | 12 ++++++------ .../Migrations/20230318162015_AlternateIndices.cs | 2 +- .../20230531234928_RemovePronouns.Designer.cs | 10 +++++----- .../Migrations/20230531234928_RemovePronouns.cs | 2 +- .../Migrations/BotDatabaseModelSnapshot.cs | 10 +++++----- .../Modules/BotAdminModule.cs | 2 +- .../{SammBot.Bot => SammBot}/Modules/FunModule.cs | 4 ++-- .../Modules/GuildConfigModule.cs | 4 ++-- .../{SammBot.Bot => SammBot}/Modules/HelpModule.cs | 2 +- .../Modules/InformationModule.cs | 4 ++-- .../Modules/ModerationModule.cs | 4 ++-- .../Modules/RandomModule.cs | 4 ++-- .../Modules/UserTagsModule.cs | 4 ++-- .../{SammBot.Bot => SammBot}/Modules/UtilsModule.cs | 4 ++-- .../Resources/Twemoji/1f494.png | Bin .../Resources/Twemoji/1f496.png | Bin .../Resources/Twemoji/1f497.png | Bin .../Resources/Twemoji/1f49b.png | Bin .../Resources/Twemoji/1f49d.png | Bin .../Resources/Twemoji/274c.png | Bin .../Resources/Twemoji/2764.png | Bin .../SammBot.Bot.csproj => SammBot/SammBot.csproj} | 0 .../SammBot.csproj.DotSettings} | 0 .../Services/CommandService.cs | 2 +- .../Services/DatabaseService.cs | 2 +- .../Services/EventLoggingService.cs | 2 +- .../Services/HttpService.cs | 2 +- .../Services/InformationService.cs | 2 +- .../Services/RandomService.cs | 4 ++-- .../Services/SettingsService.cs | 2 +- .../Services/StartupService.cs | 2 +- Source/{SammBot.Bot => SammBot}/example_config.json | 0 42 files changed, 70 insertions(+), 70 deletions(-) rename Source/{SammBot.Bot => SammBot}/EntryPoint.cs (99%) rename Source/{SammBot.Bot => SammBot}/Migrations/20221009171828_InitialCreate.Designer.cs (98%) rename Source/{SammBot.Bot => SammBot}/Migrations/20221009171828_InitialCreate.cs (99%) rename Source/{SammBot.Bot => SammBot}/Migrations/20221012182248_GuildConfig_LoggingWelcome.Designer.cs (93%) rename Source/{SammBot.Bot => SammBot}/Migrations/20221012182248_GuildConfig_LoggingWelcome.cs (99%) rename Source/{SammBot.Bot => SammBot}/Migrations/20230218141010_NewWelcomeFormat.Designer.cs (93%) rename Source/{SammBot.Bot => SammBot}/Migrations/20230218141010_NewWelcomeFormat.cs (99%) rename Source/{SammBot.Bot => SammBot}/Migrations/20230219194706_AddGeneratedIds.Designer.cs (93%) rename Source/{SammBot.Bot => SammBot}/Migrations/20230219194706_AddGeneratedIds.cs (99%) rename Source/{SammBot.Bot => SammBot}/Migrations/20230318162015_AlternateIndices.Designer.cs (93%) rename Source/{SammBot.Bot => SammBot}/Migrations/20230318162015_AlternateIndices.cs (96%) rename Source/{SammBot.Bot => SammBot}/Migrations/20230531234928_RemovePronouns.Designer.cs (93%) rename Source/{SammBot.Bot => SammBot}/Migrations/20230531234928_RemovePronouns.cs (98%) rename Source/{SammBot.Bot => SammBot}/Migrations/BotDatabaseModelSnapshot.cs (93%) rename Source/{SammBot.Bot => SammBot}/Modules/BotAdminModule.cs (99%) rename Source/{SammBot.Bot => SammBot}/Modules/FunModule.cs (99%) rename Source/{SammBot.Bot => SammBot}/Modules/GuildConfigModule.cs (99%) rename Source/{SammBot.Bot => SammBot}/Modules/HelpModule.cs (99%) rename Source/{SammBot.Bot => SammBot}/Modules/InformationModule.cs (99%) rename Source/{SammBot.Bot => SammBot}/Modules/ModerationModule.cs (99%) rename Source/{SammBot.Bot => SammBot}/Modules/RandomModule.cs (99%) rename Source/{SammBot.Bot => SammBot}/Modules/UserTagsModule.cs (99%) rename Source/{SammBot.Bot => SammBot}/Modules/UtilsModule.cs (99%) rename Source/{SammBot.Bot => SammBot}/Resources/Twemoji/1f494.png (100%) rename Source/{SammBot.Bot => SammBot}/Resources/Twemoji/1f496.png (100%) rename Source/{SammBot.Bot => SammBot}/Resources/Twemoji/1f497.png (100%) rename Source/{SammBot.Bot => SammBot}/Resources/Twemoji/1f49b.png (100%) rename Source/{SammBot.Bot => SammBot}/Resources/Twemoji/1f49d.png (100%) rename Source/{SammBot.Bot => SammBot}/Resources/Twemoji/274c.png (100%) rename Source/{SammBot.Bot => SammBot}/Resources/Twemoji/2764.png (100%) rename Source/{SammBot.Bot/SammBot.Bot.csproj => SammBot/SammBot.csproj} (100%) rename Source/{SammBot.Bot/SammBot.Bot.csproj.DotSettings => SammBot/SammBot.csproj.DotSettings} (100%) rename Source/{SammBot.Bot => SammBot}/Services/CommandService.cs (99%) rename Source/{SammBot.Bot => SammBot}/Services/DatabaseService.cs (98%) rename Source/{SammBot.Bot => SammBot}/Services/EventLoggingService.cs (99%) rename Source/{SammBot.Bot => SammBot}/Services/HttpService.cs (99%) rename Source/{SammBot.Bot => SammBot}/Services/InformationService.cs (97%) rename Source/{SammBot.Bot => SammBot}/Services/RandomService.cs (96%) rename Source/{SammBot.Bot => SammBot}/Services/SettingsService.cs (98%) rename Source/{SammBot.Bot => SammBot}/Services/StartupService.cs (99%) rename Source/{SammBot.Bot => SammBot}/example_config.json (100%) diff --git a/SammBot.sln b/SammBot.sln index 6e65c81b..d19e8780 100644 --- a/SammBot.sln +++ b/SammBot.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.31717.71 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SammBot", "Source\SammBot.Bot\SammBot.Bot.csproj", "{5C9C0C3D-EE4A-4699-BC0D-5B1256EFC97C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SammBot", "Source\SammBot\SammBot.csproj", "{5C9C0C3D-EE4A-4699-BC0D-5B1256EFC97C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SammBot.Library", "Source\SammBot.Library\SammBot.Library.csproj", "{E93C6BE7-371F-4030-AE5C-CB4941B49759}" EndProject diff --git a/Source/SammBot.Bot/EntryPoint.cs b/Source/SammBot/EntryPoint.cs similarity index 99% rename from Source/SammBot.Bot/EntryPoint.cs rename to Source/SammBot/EntryPoint.cs index 3b23cb45..23b436d4 100644 --- a/Source/SammBot.Bot/EntryPoint.cs +++ b/Source/SammBot/EntryPoint.cs @@ -24,7 +24,6 @@ using Discord.Interactions; using Discord.WebSocket; using Microsoft.Extensions.DependencyInjection; -using SammBot.Bot.Services; using SammBot.Library; using System; using System.Diagnostics; @@ -34,8 +33,9 @@ using System.Threading; using System.Threading.Tasks; using SammBot.Library.Services; +using SammBot.Services; -namespace SammBot.Bot; +namespace SammBot; /// /// A class containing all of the startup logic. diff --git a/Source/SammBot.Bot/Migrations/20221009171828_InitialCreate.Designer.cs b/Source/SammBot/Migrations/20221009171828_InitialCreate.Designer.cs similarity index 98% rename from Source/SammBot.Bot/Migrations/20221009171828_InitialCreate.Designer.cs rename to Source/SammBot/Migrations/20221009171828_InitialCreate.Designer.cs index 7ff9d07d..90e01105 100644 --- a/Source/SammBot.Bot/Migrations/20221009171828_InitialCreate.Designer.cs +++ b/Source/SammBot/Migrations/20221009171828_InitialCreate.Designer.cs @@ -3,11 +3,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using SammBot.Bot.Services; +using SammBot.Services; #nullable disable -namespace SammBot.Bot.Migrations +namespace SammBot.Migrations { [DbContext(typeof(DatabaseService))] [Migration("20221009171828_InitialCreate")] diff --git a/Source/SammBot.Bot/Migrations/20221009171828_InitialCreate.cs b/Source/SammBot/Migrations/20221009171828_InitialCreate.cs similarity index 99% rename from Source/SammBot.Bot/Migrations/20221009171828_InitialCreate.cs rename to Source/SammBot/Migrations/20221009171828_InitialCreate.cs index 96d90f83..eb026985 100644 --- a/Source/SammBot.Bot/Migrations/20221009171828_InitialCreate.cs +++ b/Source/SammBot/Migrations/20221009171828_InitialCreate.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SammBot.Bot.Migrations +namespace SammBot.Migrations { public partial class InitialCreate : Migration { diff --git a/Source/SammBot.Bot/Migrations/20221012182248_GuildConfig_LoggingWelcome.Designer.cs b/Source/SammBot/Migrations/20221012182248_GuildConfig_LoggingWelcome.Designer.cs similarity index 93% rename from Source/SammBot.Bot/Migrations/20221012182248_GuildConfig_LoggingWelcome.Designer.cs rename to Source/SammBot/Migrations/20221012182248_GuildConfig_LoggingWelcome.Designer.cs index 9338e50f..16628577 100644 --- a/Source/SammBot.Bot/Migrations/20221012182248_GuildConfig_LoggingWelcome.Designer.cs +++ b/Source/SammBot/Migrations/20221012182248_GuildConfig_LoggingWelcome.Designer.cs @@ -3,11 +3,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using SammBot.Bot.Services; +using SammBot.Services; #nullable disable -namespace SammBot.Bot.Migrations +namespace SammBot.Migrations { [DbContext(typeof(DatabaseService))] [Migration("20221012182248_GuildConfig_LoggingWelcome")] @@ -18,7 +18,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.9"); - modelBuilder.Entity("SammBot.Bot.Database.GuildConfig", b => + modelBuilder.Entity("SammBot.Database.GuildConfig", b => { b.Property("GuildId") .ValueGeneratedOnAdd() @@ -64,7 +64,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("GuildConfigs"); }); - modelBuilder.Entity("SammBot.Bot.Database.Pronoun", b => + modelBuilder.Entity("SammBot.Database.Pronoun", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -93,7 +93,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("Pronouns"); }); - modelBuilder.Entity("SammBot.Bot.Database.UserTag", b => + modelBuilder.Entity("SammBot.Database.UserTag", b => { b.Property("Id") .HasColumnType("TEXT"); @@ -118,7 +118,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("UserTags"); }); - modelBuilder.Entity("SammBot.Bot.Database.UserWarning", b => + modelBuilder.Entity("SammBot.Database.UserWarning", b => { b.Property("Id") .HasColumnType("TEXT"); diff --git a/Source/SammBot.Bot/Migrations/20221012182248_GuildConfig_LoggingWelcome.cs b/Source/SammBot/Migrations/20221012182248_GuildConfig_LoggingWelcome.cs similarity index 99% rename from Source/SammBot.Bot/Migrations/20221012182248_GuildConfig_LoggingWelcome.cs rename to Source/SammBot/Migrations/20221012182248_GuildConfig_LoggingWelcome.cs index f07a7526..9b7fdfd7 100644 --- a/Source/SammBot.Bot/Migrations/20221012182248_GuildConfig_LoggingWelcome.cs +++ b/Source/SammBot/Migrations/20221012182248_GuildConfig_LoggingWelcome.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SammBot.Bot.Migrations +namespace SammBot.Migrations { public partial class GuildConfig_LoggingWelcome : Migration { diff --git a/Source/SammBot.Bot/Migrations/20230218141010_NewWelcomeFormat.Designer.cs b/Source/SammBot/Migrations/20230218141010_NewWelcomeFormat.Designer.cs similarity index 93% rename from Source/SammBot.Bot/Migrations/20230218141010_NewWelcomeFormat.Designer.cs rename to Source/SammBot/Migrations/20230218141010_NewWelcomeFormat.Designer.cs index be43d6fd..5f93bb94 100644 --- a/Source/SammBot.Bot/Migrations/20230218141010_NewWelcomeFormat.Designer.cs +++ b/Source/SammBot/Migrations/20230218141010_NewWelcomeFormat.Designer.cs @@ -3,11 +3,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using SammBot.Bot.Services; +using SammBot.Services; #nullable disable -namespace SammBot.Bot.Migrations +namespace SammBot.Migrations { [DbContext(typeof(DatabaseService))] [Migration("20230218141010_NewWelcomeFormat")] @@ -19,7 +19,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "7.0.2"); - modelBuilder.Entity("SammBot.Bot.Database.GuildConfig", b => + modelBuilder.Entity("SammBot.Database.GuildConfig", b => { b.Property("GuildId") .ValueGeneratedOnAdd() @@ -66,7 +66,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("GuildConfigs"); }); - modelBuilder.Entity("SammBot.Bot.Database.Pronoun", b => + modelBuilder.Entity("SammBot.Database.Pronoun", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -101,7 +101,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("Pronouns"); }); - modelBuilder.Entity("SammBot.Bot.Database.UserTag", b => + modelBuilder.Entity("SammBot.Database.UserTag", b => { b.Property("Id") .HasColumnType("TEXT"); @@ -128,7 +128,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("UserTags"); }); - modelBuilder.Entity("SammBot.Bot.Database.UserWarning", b => + modelBuilder.Entity("SammBot.Database.UserWarning", b => { b.Property("Id") .HasColumnType("TEXT"); diff --git a/Source/SammBot.Bot/Migrations/20230218141010_NewWelcomeFormat.cs b/Source/SammBot/Migrations/20230218141010_NewWelcomeFormat.cs similarity index 99% rename from Source/SammBot.Bot/Migrations/20230218141010_NewWelcomeFormat.cs rename to Source/SammBot/Migrations/20230218141010_NewWelcomeFormat.cs index c0a9890b..aa965047 100644 --- a/Source/SammBot.Bot/Migrations/20230218141010_NewWelcomeFormat.cs +++ b/Source/SammBot/Migrations/20230218141010_NewWelcomeFormat.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SammBot.Bot.Migrations +namespace SammBot.Migrations { /// public partial class NewWelcomeFormat : Migration diff --git a/Source/SammBot.Bot/Migrations/20230219194706_AddGeneratedIds.Designer.cs b/Source/SammBot/Migrations/20230219194706_AddGeneratedIds.Designer.cs similarity index 93% rename from Source/SammBot.Bot/Migrations/20230219194706_AddGeneratedIds.Designer.cs rename to Source/SammBot/Migrations/20230219194706_AddGeneratedIds.Designer.cs index d45a1abe..0e36fd2f 100644 --- a/Source/SammBot.Bot/Migrations/20230219194706_AddGeneratedIds.Designer.cs +++ b/Source/SammBot/Migrations/20230219194706_AddGeneratedIds.Designer.cs @@ -3,11 +3,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using SammBot.Bot.Services; +using SammBot.Services; #nullable disable -namespace SammBot.Bot.Migrations +namespace SammBot.Migrations { [DbContext(typeof(DatabaseService))] [Migration("20230219194706_AddGeneratedIds")] @@ -19,7 +19,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "7.0.2"); - modelBuilder.Entity("SammBot.Bot.Database.Models.GuildConfig", b => + modelBuilder.Entity("SammBot.Database.Models.GuildConfig", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -69,7 +69,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("GuildConfigs"); }); - modelBuilder.Entity("SammBot.Bot.Database.Models.Pronoun", b => + modelBuilder.Entity("SammBot.Database.Models.Pronoun", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -107,7 +107,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("Pronouns"); }); - modelBuilder.Entity("SammBot.Bot.Database.Models.UserTag", b => + modelBuilder.Entity("SammBot.Database.Models.UserTag", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -135,7 +135,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("UserTags"); }); - modelBuilder.Entity("SammBot.Bot.Database.Models.UserWarning", b => + modelBuilder.Entity("SammBot.Database.Models.UserWarning", b => { b.Property("Id") .ValueGeneratedOnAdd() diff --git a/Source/SammBot.Bot/Migrations/20230219194706_AddGeneratedIds.cs b/Source/SammBot/Migrations/20230219194706_AddGeneratedIds.cs similarity index 99% rename from Source/SammBot.Bot/Migrations/20230219194706_AddGeneratedIds.cs rename to Source/SammBot/Migrations/20230219194706_AddGeneratedIds.cs index a2b63642..d389e8f9 100644 --- a/Source/SammBot.Bot/Migrations/20230219194706_AddGeneratedIds.cs +++ b/Source/SammBot/Migrations/20230219194706_AddGeneratedIds.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SammBot.Bot.Migrations +namespace SammBot.Migrations { /// public partial class AddGeneratedIds : Migration diff --git a/Source/SammBot.Bot/Migrations/20230318162015_AlternateIndices.Designer.cs b/Source/SammBot/Migrations/20230318162015_AlternateIndices.Designer.cs similarity index 93% rename from Source/SammBot.Bot/Migrations/20230318162015_AlternateIndices.Designer.cs rename to Source/SammBot/Migrations/20230318162015_AlternateIndices.Designer.cs index b697af92..d953fce0 100644 --- a/Source/SammBot.Bot/Migrations/20230318162015_AlternateIndices.Designer.cs +++ b/Source/SammBot/Migrations/20230318162015_AlternateIndices.Designer.cs @@ -3,11 +3,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using SammBot.Bot.Services; +using SammBot.Services; #nullable disable -namespace SammBot.Bot.Migrations +namespace SammBot.Migrations { [DbContext(typeof(DatabaseService))] [Migration("20230318162015_AlternateIndices")] @@ -19,7 +19,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "7.0.4"); - modelBuilder.Entity("SammBot.Bot.Database.Models.GuildConfig", b => + modelBuilder.Entity("SammBot.Database.Models.GuildConfig", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -72,7 +72,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("GuildConfigs"); }); - modelBuilder.Entity("SammBot.Bot.Database.Models.Pronoun", b => + modelBuilder.Entity("SammBot.Database.Models.Pronoun", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -113,7 +113,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("Pronouns"); }); - modelBuilder.Entity("SammBot.Bot.Database.Models.UserTag", b => + modelBuilder.Entity("SammBot.Database.Models.UserTag", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -141,7 +141,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("UserTags"); }); - modelBuilder.Entity("SammBot.Bot.Database.Models.UserWarning", b => + modelBuilder.Entity("SammBot.Database.Models.UserWarning", b => { b.Property("Id") .ValueGeneratedOnAdd() diff --git a/Source/SammBot.Bot/Migrations/20230318162015_AlternateIndices.cs b/Source/SammBot/Migrations/20230318162015_AlternateIndices.cs similarity index 96% rename from Source/SammBot.Bot/Migrations/20230318162015_AlternateIndices.cs rename to Source/SammBot/Migrations/20230318162015_AlternateIndices.cs index dc09a886..8478b5c8 100644 --- a/Source/SammBot.Bot/Migrations/20230318162015_AlternateIndices.cs +++ b/Source/SammBot/Migrations/20230318162015_AlternateIndices.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SammBot.Bot.Migrations +namespace SammBot.Migrations { /// public partial class AlternateIndices : Migration diff --git a/Source/SammBot.Bot/Migrations/20230531234928_RemovePronouns.Designer.cs b/Source/SammBot/Migrations/20230531234928_RemovePronouns.Designer.cs similarity index 93% rename from Source/SammBot.Bot/Migrations/20230531234928_RemovePronouns.Designer.cs rename to Source/SammBot/Migrations/20230531234928_RemovePronouns.Designer.cs index 9cae3502..0ef19504 100644 --- a/Source/SammBot.Bot/Migrations/20230531234928_RemovePronouns.Designer.cs +++ b/Source/SammBot/Migrations/20230531234928_RemovePronouns.Designer.cs @@ -3,11 +3,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using SammBot.Bot.Services; +using SammBot.Services; #nullable disable -namespace SammBot.Bot.Migrations +namespace SammBot.Migrations { [DbContext(typeof(DatabaseService))] [Migration("20230531234928_RemovePronouns")] @@ -19,7 +19,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "7.0.5"); - modelBuilder.Entity("SammBot.Bot.Database.Models.GuildConfig", b => + modelBuilder.Entity("SammBot.Database.Models.GuildConfig", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -72,7 +72,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("GuildConfigs"); }); - modelBuilder.Entity("SammBot.Bot.Database.Models.UserTag", b => + modelBuilder.Entity("SammBot.Database.Models.UserTag", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -100,7 +100,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("UserTags"); }); - modelBuilder.Entity("SammBot.Bot.Database.Models.UserWarning", b => + modelBuilder.Entity("SammBot.Database.Models.UserWarning", b => { b.Property("Id") .ValueGeneratedOnAdd() diff --git a/Source/SammBot.Bot/Migrations/20230531234928_RemovePronouns.cs b/Source/SammBot/Migrations/20230531234928_RemovePronouns.cs similarity index 98% rename from Source/SammBot.Bot/Migrations/20230531234928_RemovePronouns.cs rename to Source/SammBot/Migrations/20230531234928_RemovePronouns.cs index 0779a0b9..e5ae4c50 100644 --- a/Source/SammBot.Bot/Migrations/20230531234928_RemovePronouns.cs +++ b/Source/SammBot/Migrations/20230531234928_RemovePronouns.cs @@ -2,7 +2,7 @@ #nullable disable -namespace SammBot.Bot.Migrations +namespace SammBot.Migrations { /// public partial class RemovePronouns : Migration diff --git a/Source/SammBot.Bot/Migrations/BotDatabaseModelSnapshot.cs b/Source/SammBot/Migrations/BotDatabaseModelSnapshot.cs similarity index 93% rename from Source/SammBot.Bot/Migrations/BotDatabaseModelSnapshot.cs rename to Source/SammBot/Migrations/BotDatabaseModelSnapshot.cs index 839777a0..d0ddb06e 100644 --- a/Source/SammBot.Bot/Migrations/BotDatabaseModelSnapshot.cs +++ b/Source/SammBot/Migrations/BotDatabaseModelSnapshot.cs @@ -2,11 +2,11 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using SammBot.Bot.Services; +using SammBot.Services; #nullable disable -namespace SammBot.Bot.Migrations +namespace SammBot.Migrations { [DbContext(typeof(DatabaseService))] partial class BotDatabaseModelSnapshot : ModelSnapshot @@ -16,7 +16,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "7.0.5"); - modelBuilder.Entity("SammBot.Bot.Database.Models.GuildConfig", b => + modelBuilder.Entity("SammBot.Database.Models.GuildConfig", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -69,7 +69,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("GuildConfigs"); }); - modelBuilder.Entity("SammBot.Bot.Database.Models.UserTag", b => + modelBuilder.Entity("SammBot.Database.Models.UserTag", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -97,7 +97,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("UserTags"); }); - modelBuilder.Entity("SammBot.Bot.Database.Models.UserWarning", b => + modelBuilder.Entity("SammBot.Database.Models.UserWarning", b => { b.Property("Id") .ValueGeneratedOnAdd() diff --git a/Source/SammBot.Bot/Modules/BotAdminModule.cs b/Source/SammBot/Modules/BotAdminModule.cs similarity index 99% rename from Source/SammBot.Bot/Modules/BotAdminModule.cs rename to Source/SammBot/Modules/BotAdminModule.cs index e4617923..b57f666e 100644 --- a/Source/SammBot.Bot/Modules/BotAdminModule.cs +++ b/Source/SammBot/Modules/BotAdminModule.cs @@ -28,7 +28,7 @@ using System; using System.Threading.Tasks; -namespace SammBot.Bot.Modules; +namespace SammBot.Modules; [PrettyName("Bot Administration")] [Group("badmin", "Bot management commands. Bot owner only.")] diff --git a/Source/SammBot.Bot/Modules/FunModule.cs b/Source/SammBot/Modules/FunModule.cs similarity index 99% rename from Source/SammBot.Bot/Modules/FunModule.cs rename to Source/SammBot/Modules/FunModule.cs index 0daf4dbb..fb374f0c 100644 --- a/Source/SammBot.Bot/Modules/FunModule.cs +++ b/Source/SammBot/Modules/FunModule.cs @@ -20,7 +20,6 @@ using Discord.Interactions; using Discord.WebSocket; using Microsoft.Extensions.DependencyInjection; -using SammBot.Bot.Services; using SammBot.Library; using SammBot.Library.Attributes; using SammBot.Library.Extensions; @@ -33,8 +32,9 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using SammBot.Services; -namespace SammBot.Bot.Modules; +namespace SammBot.Modules; [PrettyName("Fun")] [Group("fun", "Games and fun!")] diff --git a/Source/SammBot.Bot/Modules/GuildConfigModule.cs b/Source/SammBot/Modules/GuildConfigModule.cs similarity index 99% rename from Source/SammBot.Bot/Modules/GuildConfigModule.cs rename to Source/SammBot/Modules/GuildConfigModule.cs index 08d29119..6d44f726 100644 --- a/Source/SammBot.Bot/Modules/GuildConfigModule.cs +++ b/Source/SammBot/Modules/GuildConfigModule.cs @@ -31,9 +31,9 @@ using System.Linq; using System.Reflection; using System.Threading.Tasks; -using SammBot.Bot.Services; +using SammBot.Services; -namespace SammBot.Bot.Modules; +namespace SammBot.Modules; [PrettyName("Server Settings")] [Group("scfg", "Server settings such as logging, welcome messages, etc.")] diff --git a/Source/SammBot.Bot/Modules/HelpModule.cs b/Source/SammBot/Modules/HelpModule.cs similarity index 99% rename from Source/SammBot.Bot/Modules/HelpModule.cs rename to Source/SammBot/Modules/HelpModule.cs index 8d357509..51ec68b2 100644 --- a/Source/SammBot.Bot/Modules/HelpModule.cs +++ b/Source/SammBot/Modules/HelpModule.cs @@ -28,7 +28,7 @@ using System.Linq; using System.Threading.Tasks; -namespace SammBot.Bot.Modules; +namespace SammBot.Modules; [PrettyName("Help")] public class HelpModule : InteractionModuleBase diff --git a/Source/SammBot.Bot/Modules/InformationModule.cs b/Source/SammBot/Modules/InformationModule.cs similarity index 99% rename from Source/SammBot.Bot/Modules/InformationModule.cs rename to Source/SammBot/Modules/InformationModule.cs index 4230ba5f..905e5cad 100644 --- a/Source/SammBot.Bot/Modules/InformationModule.cs +++ b/Source/SammBot/Modules/InformationModule.cs @@ -32,9 +32,9 @@ using System.Linq; using System.Runtime.InteropServices; using System.Threading.Tasks; -using SammBot.Bot.Services; +using SammBot.Services; -namespace SammBot.Bot.Modules; +namespace SammBot.Modules; [PrettyName("Information")] [Group("info", "Bot information and statistics.")] diff --git a/Source/SammBot.Bot/Modules/ModerationModule.cs b/Source/SammBot/Modules/ModerationModule.cs similarity index 99% rename from Source/SammBot.Bot/Modules/ModerationModule.cs rename to Source/SammBot/Modules/ModerationModule.cs index c8a79d9a..a6aad0f2 100644 --- a/Source/SammBot.Bot/Modules/ModerationModule.cs +++ b/Source/SammBot/Modules/ModerationModule.cs @@ -30,9 +30,9 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using SammBot.Bot.Services; +using SammBot.Services; -namespace SammBot.Bot.Modules; +namespace SammBot.Modules; [PrettyName("Moderation")] [Group("mod", "Moderation commands like kick, ban, mute, etc.")] diff --git a/Source/SammBot.Bot/Modules/RandomModule.cs b/Source/SammBot/Modules/RandomModule.cs similarity index 99% rename from Source/SammBot.Bot/Modules/RandomModule.cs rename to Source/SammBot/Modules/RandomModule.cs index bc2b640e..9cee3198 100644 --- a/Source/SammBot.Bot/Modules/RandomModule.cs +++ b/Source/SammBot/Modules/RandomModule.cs @@ -19,7 +19,6 @@ using Discord; using Discord.Interactions; using Microsoft.Extensions.DependencyInjection; -using SammBot.Bot.Services; using SammBot.Library; using SammBot.Library.Attributes; using SammBot.Library.Extensions; @@ -32,8 +31,9 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using SammBot.Services; -namespace SammBot.Bot.Modules; +namespace SammBot.Modules; [PrettyName("Random")] [Group("random", "Random crazyness!")] diff --git a/Source/SammBot.Bot/Modules/UserTagsModule.cs b/Source/SammBot/Modules/UserTagsModule.cs similarity index 99% rename from Source/SammBot.Bot/Modules/UserTagsModule.cs rename to Source/SammBot/Modules/UserTagsModule.cs index 6e4a4113..c63ecf08 100644 --- a/Source/SammBot.Bot/Modules/UserTagsModule.cs +++ b/Source/SammBot/Modules/UserTagsModule.cs @@ -32,9 +32,9 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; -using SammBot.Bot.Services; +using SammBot.Services; -namespace SammBot.Bot.Modules; +namespace SammBot.Modules; [PrettyName("User Tags")] [Group("tags", "Tags that reply with a message when searched.")] diff --git a/Source/SammBot.Bot/Modules/UtilsModule.cs b/Source/SammBot/Modules/UtilsModule.cs similarity index 99% rename from Source/SammBot.Bot/Modules/UtilsModule.cs rename to Source/SammBot/Modules/UtilsModule.cs index a2c3826a..854c9c08 100644 --- a/Source/SammBot.Bot/Modules/UtilsModule.cs +++ b/Source/SammBot/Modules/UtilsModule.cs @@ -20,7 +20,6 @@ using Discord.Interactions; using Discord.WebSocket; using Microsoft.Extensions.DependencyInjection; -using SammBot.Bot.Services; using SammBot.Library; using SammBot.Library.Attributes; using SammBot.Library.Extensions; @@ -30,8 +29,9 @@ using System; using System.IO; using System.Threading.Tasks; +using SammBot.Services; -namespace SammBot.Bot.Modules; +namespace SammBot.Modules; [PrettyName("Utilities")] [Group("utils", "Miscellaneous utilities.")] diff --git a/Source/SammBot.Bot/Resources/Twemoji/1f494.png b/Source/SammBot/Resources/Twemoji/1f494.png similarity index 100% rename from Source/SammBot.Bot/Resources/Twemoji/1f494.png rename to Source/SammBot/Resources/Twemoji/1f494.png diff --git a/Source/SammBot.Bot/Resources/Twemoji/1f496.png b/Source/SammBot/Resources/Twemoji/1f496.png similarity index 100% rename from Source/SammBot.Bot/Resources/Twemoji/1f496.png rename to Source/SammBot/Resources/Twemoji/1f496.png diff --git a/Source/SammBot.Bot/Resources/Twemoji/1f497.png b/Source/SammBot/Resources/Twemoji/1f497.png similarity index 100% rename from Source/SammBot.Bot/Resources/Twemoji/1f497.png rename to Source/SammBot/Resources/Twemoji/1f497.png diff --git a/Source/SammBot.Bot/Resources/Twemoji/1f49b.png b/Source/SammBot/Resources/Twemoji/1f49b.png similarity index 100% rename from Source/SammBot.Bot/Resources/Twemoji/1f49b.png rename to Source/SammBot/Resources/Twemoji/1f49b.png diff --git a/Source/SammBot.Bot/Resources/Twemoji/1f49d.png b/Source/SammBot/Resources/Twemoji/1f49d.png similarity index 100% rename from Source/SammBot.Bot/Resources/Twemoji/1f49d.png rename to Source/SammBot/Resources/Twemoji/1f49d.png diff --git a/Source/SammBot.Bot/Resources/Twemoji/274c.png b/Source/SammBot/Resources/Twemoji/274c.png similarity index 100% rename from Source/SammBot.Bot/Resources/Twemoji/274c.png rename to Source/SammBot/Resources/Twemoji/274c.png diff --git a/Source/SammBot.Bot/Resources/Twemoji/2764.png b/Source/SammBot/Resources/Twemoji/2764.png similarity index 100% rename from Source/SammBot.Bot/Resources/Twemoji/2764.png rename to Source/SammBot/Resources/Twemoji/2764.png diff --git a/Source/SammBot.Bot/SammBot.Bot.csproj b/Source/SammBot/SammBot.csproj similarity index 100% rename from Source/SammBot.Bot/SammBot.Bot.csproj rename to Source/SammBot/SammBot.csproj diff --git a/Source/SammBot.Bot/SammBot.Bot.csproj.DotSettings b/Source/SammBot/SammBot.csproj.DotSettings similarity index 100% rename from Source/SammBot.Bot/SammBot.Bot.csproj.DotSettings rename to Source/SammBot/SammBot.csproj.DotSettings diff --git a/Source/SammBot.Bot/Services/CommandService.cs b/Source/SammBot/Services/CommandService.cs similarity index 99% rename from Source/SammBot.Bot/Services/CommandService.cs rename to Source/SammBot/Services/CommandService.cs index 81d2d3d5..8c2d6fb7 100644 --- a/Source/SammBot.Bot/Services/CommandService.cs +++ b/Source/SammBot/Services/CommandService.cs @@ -29,7 +29,7 @@ using System.Threading.Tasks; using SammBot.Library.Services; -namespace SammBot.Bot.Services; +namespace SammBot.Services; /// /// Provides handling for incoming interactions. diff --git a/Source/SammBot.Bot/Services/DatabaseService.cs b/Source/SammBot/Services/DatabaseService.cs similarity index 98% rename from Source/SammBot.Bot/Services/DatabaseService.cs rename to Source/SammBot/Services/DatabaseService.cs index e7610e12..77102458 100644 --- a/Source/SammBot.Bot/Services/DatabaseService.cs +++ b/Source/SammBot/Services/DatabaseService.cs @@ -23,7 +23,7 @@ using SammBot.Library.Models.Database; using SammBot.Library.Services; -namespace SammBot.Bot.Services; +namespace SammBot.Services; /// /// A service for accessing the bot's database tables. diff --git a/Source/SammBot.Bot/Services/EventLoggingService.cs b/Source/SammBot/Services/EventLoggingService.cs similarity index 99% rename from Source/SammBot.Bot/Services/EventLoggingService.cs rename to Source/SammBot/Services/EventLoggingService.cs index 1cc9bd65..74626605 100644 --- a/Source/SammBot.Bot/Services/EventLoggingService.cs +++ b/Source/SammBot/Services/EventLoggingService.cs @@ -28,7 +28,7 @@ using Microsoft.Extensions.DependencyInjection; using SammBot.Library.Services; -namespace SammBot.Bot.Services; +namespace SammBot.Services; /// /// Provides event handlers for many Discord and bot events. diff --git a/Source/SammBot.Bot/Services/HttpService.cs b/Source/SammBot/Services/HttpService.cs similarity index 99% rename from Source/SammBot.Bot/Services/HttpService.cs rename to Source/SammBot/Services/HttpService.cs index 9c14b68e..462cc924 100644 --- a/Source/SammBot.Bot/Services/HttpService.cs +++ b/Source/SammBot/Services/HttpService.cs @@ -30,7 +30,7 @@ using System.Web; using Microsoft.Extensions.DependencyInjection; -namespace SammBot.Bot.Services; +namespace SammBot.Services; /// /// A service containing utility methods for HTTP requests. diff --git a/Source/SammBot.Bot/Services/InformationService.cs b/Source/SammBot/Services/InformationService.cs similarity index 97% rename from Source/SammBot.Bot/Services/InformationService.cs rename to Source/SammBot/Services/InformationService.cs index e3f084a6..e3bbb321 100644 --- a/Source/SammBot.Bot/Services/InformationService.cs +++ b/Source/SammBot/Services/InformationService.cs @@ -19,7 +19,7 @@ using System; using System.Reflection; -namespace SammBot.Bot.Services; +namespace SammBot.Services; /// /// Contains information about the bot. diff --git a/Source/SammBot.Bot/Services/RandomService.cs b/Source/SammBot/Services/RandomService.cs similarity index 96% rename from Source/SammBot.Bot/Services/RandomService.cs rename to Source/SammBot/Services/RandomService.cs index 933a63ad..9a2cb558 100644 --- a/Source/SammBot.Bot/Services/RandomService.cs +++ b/Source/SammBot/Services/RandomService.cs @@ -18,11 +18,11 @@ using System; using Microsoft.Extensions.DependencyInjection; -using SammBot.Bot.Modules; +using SammBot.Modules; using SharpCat.Requester.Cat; using SharpCat.Requester.Dog; -namespace SammBot.Bot.Services; +namespace SammBot.Services; /// /// Stores permanent data for . diff --git a/Source/SammBot.Bot/Services/SettingsService.cs b/Source/SammBot/Services/SettingsService.cs similarity index 98% rename from Source/SammBot.Bot/Services/SettingsService.cs rename to Source/SammBot/Services/SettingsService.cs index 196c30b2..f523e2e9 100644 --- a/Source/SammBot.Bot/Services/SettingsService.cs +++ b/Source/SammBot/Services/SettingsService.cs @@ -23,7 +23,7 @@ using SammBot.Library; using SammBot.Library.Models.Data; -namespace SammBot.Bot.Services; +namespace SammBot.Services; /// /// Contains the bot's settings and functions to handle them. diff --git a/Source/SammBot.Bot/Services/StartupService.cs b/Source/SammBot/Services/StartupService.cs similarity index 99% rename from Source/SammBot.Bot/Services/StartupService.cs rename to Source/SammBot/Services/StartupService.cs index 3ab3e275..1a3ea01e 100644 --- a/Source/SammBot.Bot/Services/StartupService.cs +++ b/Source/SammBot/Services/StartupService.cs @@ -37,7 +37,7 @@ using SammBot.Library.Services; using Color = System.Drawing.Color; -namespace SammBot.Bot.Services; +namespace SammBot.Services; /// /// Handles bot kickstart and shard events. diff --git a/Source/SammBot.Bot/example_config.json b/Source/SammBot/example_config.json similarity index 100% rename from Source/SammBot.Bot/example_config.json rename to Source/SammBot/example_config.json