Add webportal and set up custom commands #minor

.gitignore

@@ -5,6 +5,7 @@ obj/
 /ChaosBot/obj/
 .idea/
 /ChaosBot/appsettings.json
+/ChaosBot/appsettings.*.json
 /ChaosBot/ChaosBotSQL.db
 *.sln.DotSettings.user
 /.vs

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "ChaosBot/wwwroot"]
+	path = ChaosBot/wwwroot
+	url = ssh://git@git.chaoticlogic.us:2302/discord-bots/chaosbot-frontend.git

ChaosBot/ChaosBot.csproj

@@ -30,6 +30,15 @@
 
     <ItemGroup>
       <Folder Include="WebServer\App" />
+      <Folder Include="wwwroot" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Content Update="appsettings.json">
+        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      </Content>
     </ItemGroup>
 
 </Project>

ChaosBot/Discord/Services/CommandHandler.cs

@@ -77,6 +77,9 @@ namespace ChaosBot.Discord.Services
                 if(Convert.ToBoolean(ConfigurationRepository.GetValue<string>("Experience:Commands", context.Guild.Id, "false")))
                     ExperienceHandler.AddXp(context);
 
+                bool customCommandExecuted = await CustomCommandHandler.CheckCommand(context, argPos);
+                
+                if (!customCommandExecuted)
                     await _commands.ExecuteAsync(context, argPos, _services); 
             }
             catch (Exception ex)

ChaosBot/Discord/Services/CustomCommandHandler.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using ChaosBot.Models;
+using Discord.Commands;
+using NLog;
+
+namespace ChaosBot.Discord.Services
+{
+    public static class CustomCommandHandler
+    {
+        private static readonly ILogger Logger = Program.Logger;
+        
+        public static async Task<bool> CheckCommand(SocketCommandContext context, int argPos)
+        {
+            try
+            {
+                await using ChaosbotContext dbContext = new ChaosbotContext();
+                string command = context.Message.Content.Substring(argPos);
+
+                IQueryable<CustomCommand> customCommandQuery = dbContext.CustomCommands;
+                CustomCommand customCommand = customCommandQuery
+                    .Where(cc => cc.DiscordGuildId == context.Guild.Id)
+                    .FirstOrDefault(cc => command.StartsWith((string) cc.Command));
+
+                if (customCommand == null) return false;
+
+                if (customCommand.Type == CustomCommandType.Basic)
+                {
+                    await context.Channel.SendMessageAsync(customCommand.Content);
+                }
+                else
+                {
+                    throw new NotImplementedException($"No support for command type ${customCommand.Type}");
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                Logger.Error($"{MethodBase.GetCurrentMethod().ReflectedType.FullName}: Exception [{ex}] thrown, <[{ex.Message}]>.");
+            }
+            return false;
+        }
+    }
+}

ChaosBot/Migrations/20200824124830_CustomCommand.Designer.cs

@@ -0,0 +1,182 @@
+// <auto-generated />
+using System;
+using ChaosBot.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+namespace ChaosBot.Migrations
+{
+    [DbContext(typeof(ChaosbotContext))]
+    [Migration("20200824124830_CustomCommand")]
+    partial class CustomCommand
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "3.1.6")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            modelBuilder.Entity("ChaosBot.Models.CommandPermission", b =>
+                {
+                    b.Property<ulong>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint unsigned");
+
+                    b.Property<string>("Command")
+                        .IsRequired()
+                        .HasColumnType("varchar(128) CHARACTER SET utf8mb4")
+                        .HasMaxLength(128);
+
+                    b.Property<ulong>("DiscordGuildId")
+                        .HasColumnType("bigint unsigned");
+
+                    b.Property<ulong>("TargetId")
+                        .HasColumnType("bigint unsigned");
+
+                    b.Property<int>("TargetType")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CommandPermissions");
+                });
+
+            modelBuilder.Entity("ChaosBot.Models.Configuration", b =>
+                {
+                    b.Property<ulong>("DiscordGuildId")
+                        .HasColumnType("bigint unsigned");
+
+                    b.Property<string>("Key")
+                        .HasColumnType("varchar(128) CHARACTER SET utf8mb4")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("SerializedValue")
+                        .IsRequired()
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
+
+                    b.HasKey("DiscordGuildId", "Key");
+
+                    b.ToTable("Configuration");
+                });
+
+            modelBuilder.Entity("ChaosBot.Models.Experience", b =>
+                {
+                    b.Property<ulong>("DiscordGuildId")
+                        .HasColumnType("bigint unsigned");
+
+                    b.Property<ulong>("DiscordUserId")
+                        .HasColumnType("bigint unsigned");
+
+                    b.Property<ulong>("Amount")
+                        .HasColumnType("bigint unsigned");
+
+                    b.Property<DateTime>("LastUpdated")
+                        .HasColumnType("datetime");
+
+                    b.Property<ulong>("Level")
+                        .HasColumnType("bigint unsigned");
+
+                    b.HasKey("DiscordGuildId", "DiscordUserId");
+
+                    b.ToTable("ExperiencePoints");
+                });
+
+            modelBuilder.Entity("ChaosBot.Models.LodestoneCharacter", b =>
+                {
+                    b.Property<ulong>("DiscordGuildId")
+                        .HasColumnType("bigint unsigned");
+
+                    b.Property<ulong>("LodestoneId")
+                        .HasColumnType("bigint unsigned");
+
+                    b.Property<string>("Avatar")
+                        .IsRequired()
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
+
+                    b.Property<ulong>("DiscordUserId")
+                        .HasColumnType("bigint unsigned");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
+
+                    b.HasKey("DiscordGuildId", "LodestoneId");
+
+                    b.ToTable("LodestoneCharacter");
+                });
+
+            modelBuilder.Entity("ChaosBot.Models.LodestoneFreeCompany", b =>
+                {
+                    b.Property<ulong>("DiscordGuildId")
+                        .HasColumnType("bigint unsigned");
+
+                    b.Property<ulong>("LodestoneId")
+                        .HasColumnType("bigint unsigned");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext CHARACTER SET utf8mb4");
+
+                    b.HasKey("DiscordGuildId", "LodestoneId");
+
+                    b.ToTable("LodestoneFreeCompany");
+                });
+
+            modelBuilder.Entity("ChaosBot.Models.Point", b =>
+                {
+                    b.Property<ulong>("DiscordGuildId")
+                        .HasColumnType("bigint unsigned");
+
+                    b.Property<ulong>("DiscordUserId")
+                        .HasColumnType("bigint unsigned");
+
+                    b.Property<ulong>("Amount")
+                        .HasColumnType("bigint unsigned");
+
+                    b.HasKey("DiscordGuildId", "DiscordUserId");
+
+                    b.ToTable("Points");
+                });
+
+            modelBuilder.Entity("ChaosBot.Models.Raffle", b =>
+                {
+                    b.Property<ulong>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint unsigned");
+
+                    b.Property<ulong>("DiscordGuildId")
+                        .HasColumnType("bigint unsigned");
+
+                    b.Property<ulong>("DiscordUserId")
+                        .HasColumnType("bigint unsigned");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Raffles");
+                });
+
+            modelBuilder.Entity("ChaosBot.Models.RoleReaction", b =>
+                {
+                    b.Property<ulong>("DiscordGuildId")
+                        .HasColumnType("bigint unsigned");
+
+                    b.Property<ulong>("DiscordMessageId")
+                        .HasColumnType("bigint unsigned");
+
+                    b.Property<ulong>("DiscordRoleId")
+                        .HasColumnType("bigint unsigned");
+
+                    b.Property<string>("DiscordEmoteNameEncoded")
+                        .HasColumnType("varchar(95) CHARACTER SET utf8mb4");
+
+                    b.HasKey("DiscordGuildId", "DiscordMessageId", "DiscordRoleId", "DiscordEmoteNameEncoded");
+
+                    b.ToTable("RoleReactions");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

ChaosBot/Migrations/20200824124830_CustomCommand.cs

@@ -0,0 +1,32 @@
+using ChaosBot.Models;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace ChaosBot.Migrations
+{
+    public partial class CustomCommand : Migration
+    {
+        private readonly string Table = "CustomCommands";
+        
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: Table,
+                columns: table => new
+                {
+                    DiscordGuildId = table.Column<ulong>(nullable: false),
+                    Command = table.Column<string>(nullable: false, maxLength: 128),
+                    Type = table.Column<CustomCommandType>(nullable: false),
+                    Content = table.Column<string>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CustomCommands", x => new { x.DiscordGuildId, x.Command });
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(name: Table);
+        }
+    }
+}

ChaosBot/Migrations/ChaosbotContextModelSnapshot.cs

@@ -155,6 +155,25 @@ namespace ChaosBot.Migrations
 
                     b.ToTable("Raffles");
                 });
+
+            modelBuilder.Entity("ChaosBot.Models.RoleReaction", b =>
+                {
+                    b.Property<ulong>("DiscordGuildId")
+                        .HasColumnType("bigint unsigned");
+
+                    b.Property<ulong>("DiscordMessageId")
+                        .HasColumnType("bigint unsigned");
+
+                    b.Property<ulong>("DiscordRoleId")
+                        .HasColumnType("bigint unsigned");
+
+                    b.Property<string>("DiscordEmoteNameEncoded")
+                        .HasColumnType("varchar(95) CHARACTER SET utf8mb4");
+
+                    b.HasKey("DiscordGuildId", "DiscordMessageId", "DiscordRoleId", "DiscordEmoteNameEncoded");
+
+                    b.ToTable("RoleReactions");
+                });
 #pragma warning restore 612, 618
         }
     }

ChaosBot/Models/ChaosbotContext.cs

@@ -13,6 +13,7 @@ namespace ChaosBot.Models
         public DbSet<Configuration> Configuration { get; set; }
         public DbSet<Experience> ExperiencePoints { get; set; }
         public DbSet<RoleReaction> RoleReactions { get; set; }
+        public DbSet<CustomCommand> CustomCommands { get; set; }
         
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
@@ -49,6 +50,8 @@ namespace ChaosBot.Models
                 .HasKey(x => new {x.DiscordGuildId, x.Key});
             modelBuilder.Entity<RoleReaction>()
                 .HasKey(x => new {x.DiscordGuildId, x.DiscordMessageId, x.DiscordRoleId, x.DiscordEmoteNameEncoded});
+            modelBuilder.Entity<CustomCommand>()
+                .HasKey(x => new {x.DiscordGuildId, x.Command});
         }
     }
 }

ChaosBot/Models/CustomCommand.cs

@@ -0,0 +1,27 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text;
+
+namespace ChaosBot.Models
+{
+    #region Required
+    public class CustomCommand
+    {
+        [Required]
+        public ulong DiscordGuildId { get; set; }
+        [Required]
+        [MaxLength(128)]
+        public string Command { get; set; }
+        [Required]
+        public CustomCommandType Type { get; set; }
+        [Required]
+        public string Content { get; set; }
+    }
+    #endregion
+
+    public enum CustomCommandType
+    {
+        Basic
+    }
+}

ChaosBot/WebServer/Startup.cs

@@ -1,3 +1,4 @@
+using System.IO;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -36,12 +37,20 @@ namespace ChaosBot.WebServer
         {
             _logger.Info("Initializing Kestrel Startup and Configuration");
 
-            app.UseForwardedHeaders();
+            if (Program.AppSettingsHandler.GetValue<bool>("WebServer:Debug", false))
                 app.UseDeveloperExceptionPage();
+
+            app.UseForwardedHeaders();
             app.UseMiddleware<AuthenticationMiddleware>();
             app.UseRouting();
             app.UseAuthorization();
             app.UseEndpoints(endpoints => { endpoints.MapControllers(); });
+
+            DefaultFilesOptions options = new DefaultFilesOptions();
+            options.DefaultFileNames.Clear();
+            options.DefaultFileNames.Add("index.html");
+            app.UseDefaultFiles(options);
+            app.UseStaticFiles();
         }
     }
 }

ChaosBot/WebServer/WebServer.cs

@@ -1,3 +1,4 @@
+using System.IO;
 using System.Net;
 using NLog.Extensions.Logging;
 
@@ -19,6 +20,11 @@ namespace ChaosBot.WebServer
             Host.CreateDefaultBuilder(args)
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
+                    string contentRoot = Directory.GetCurrentDirectory();
+                    string webRoot = Path.Combine(contentRoot, "wwwroot/dist");
+
+                    webBuilder.UseContentRoot(contentRoot);
+                    webBuilder.UseWebRoot(webRoot);
                     webBuilder.ConfigureKestrel(serverOptions =>
                         {
                             serverOptions.Listen(IPAddress.Any, Program.AppSettingsHandler.GetValue<int>("WebServer:Port"), 

ChaosBot/wwwroot

@@ -0,0 +1 @@
+Subproject commit ad857be54bdaf13813a00458c242bcc808db89ec