Merge pull request #43 from bobbahbrown/v1.3.11

Version 1.3.11 - Standardized Ban Exporters
bobbah · Aug 22, 2021 · 169f1e2 · 169f1e2
2 parents 57c6d53 + f5a201f
commit 169f1e2
Show file tree

Hide file tree

Showing 92 changed files with 3,171 additions and 448 deletions.
diff --git a/.idea/.idea.CentCom/.idea/indexLayout.xml b/.idea/.idea.CentCom/.idea/indexLayout.xml
diff --git a/.idea/.idea.CentCom/.idea/projectSettingsUpdater.xml b/.idea/.idea.CentCom/.idea/projectSettingsUpdater.xml
diff --git a/.idea/.idea.CentCom/.idea/vcs.xml b/.idea/.idea.CentCom/.idea/vcs.xml
diff --git a/.idea/.idea.CentCom/.idea/workspace.xml b/.idea/.idea.CentCom/.idea/workspace.xml
diff --git a/CentCom.API/CentCom.API.csproj b/CentCom.API/CentCom.API.csproj
@@ -1,34 +1,34 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-    <Version>1.3.10.1</Version>
-    <UserSecretsId>1f5f48fa-862f-4472-ba34-2c5a26035e88</UserSecretsId>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+        <Version>1.3.11</Version>
+        <UserSecretsId>1f5f48fa-862f-4472-ba34-2c5a26035e88</UserSecretsId>
+    </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile>CentCom.API.xml</DocumentationFile>
-  </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+        <DocumentationFile>CentCom.API.xml</DocumentationFile>
+    </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>CentCom.API.xml</DocumentationFile>
-  </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+        <DocumentationFile>CentCom.API.xml</DocumentationFile>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
-    <PackageReference Include="Enums.NET" Version="4.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.9" />
-    <PackageReference Include="Npgsql" Version="5.0.7" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.7" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.1.5" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.1.5" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="6.1.5" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="BuildBundlerMinifier" Version="3.2.449"/>
+        <PackageReference Include="Enums.NET" Version="4.0.0"/>
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.9"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.9"/>
+        <PackageReference Include="Npgsql" Version="5.0.7"/>
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.7"/>
+        <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.1.5"/>
+        <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.1.5"/>
+        <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="6.1.5"/>
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\CentCom.Common\CentCom.Common.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\CentCom.Common\CentCom.Common.csproj"/>
+    </ItemGroup>
 
 
 </Project>
diff --git a/CentCom.API/Controllers/BanController.cs b/CentCom.API/Controllers/BanController.cs
@@ -1,9 +1,9 @@
-using CentCom.API.Models;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using CentCom.API.Models;
 using CentCom.API.Services;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace CentCom.API.Controllers
 {

diff --git a/CentCom.API/Controllers/ViewerController.cs b/CentCom.API/Controllers/ViewerController.cs
@@ -1,9 +1,9 @@
-using CentCom.API.Models;
+using System.Linq;
+using System.Threading.Tasks;
+using CentCom.API.Models;
 using CentCom.API.Services;
 using CentCom.Common;
 using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace CentCom.API.Controllers
 {

diff --git a/CentCom.API/Models/BanData.cs b/CentCom.API/Models/BanData.cs
@@ -1,8 +1,8 @@
-using CentCom.Common.Models;
-using EnumsNET;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using CentCom.Common.Models;
+using EnumsNET;
 
 namespace CentCom.API.Models
 {
@@ -15,58 +15,72 @@ public class BanData
         /// Internal CentCom DB ID
         /// </summary>
         public int ID { get; set; }
+
         /// <summary>
         /// Internal CentCom DB ID for the ban source
         /// </summary>
         public int SourceID { get; set; }
+
         /// <summary>
         /// The textual name of the ban source
         /// </summary>
         public string SourceName { get; set; }
+
         /// <summary>
         /// The roleplay level of the ban source
         /// </summary>
         public RoleplayLevel SourceRoleplayLevel { get; set; }
+
         /// <summary>
         /// The type of ban
         /// </summary>
         public BanType Type { get; set; }
+
         /// <summary>
         /// The CKey of the banned user
         /// </summary>
         public string CKey { get; set; }
+
         /// <summary>
         /// The DateTime at which the user was banned
         /// </summary>
         public DateTime BannedOn { get; set; }
+
         /// <summary>
         /// The user who created the ban
         /// </summary>
         public string BannedBy { get; set; }
+
         /// <summary>
         /// The reason for the ban
         /// </summary>
         public string Reason { get; set; }
+
         /// <summary>
         /// The expiration, if present, of the ban
         /// </summary>
         public DateTime? Expires { get; set; }
+
         /// <summary>
         /// The user, if present, who removed the ban
         /// </summary>
         public string UnbannedBy { get; set; }
+
         /// <summary>
         /// The ban ID, if present, as provided by the source
         /// </summary>
         public string BanID { get; set; }
+
         /// <summary>
         /// The jobs, if present, that the user is banned from
         /// </summary>
         public List<string> Jobs { get; set; }
+
         /// <summary>
         /// Any additional attributes added to this ban by CentCom
         /// </summary>
         public List<string> BanAttributes { get; set; }
+
         /// <summary>
         /// If the ban is currently active, as predicted by CentCom
         /// </summary>

diff --git a/CentCom.API/Models/BanSearchViewModel.cs b/CentCom.API/Models/BanSearchViewModel.cs
@@ -1,5 +1,5 @@
-using CentCom.Common.Models;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using CentCom.Common.Models;
 
 namespace CentCom.API.Models
 {

diff --git a/CentCom.API/Models/BanSourceData.cs b/CentCom.API/Models/BanSourceData.cs
@@ -11,10 +11,12 @@ public class BanSourceData
         /// Internal CentCom DB ID
         /// </summary>
         public int ID { get; set; }
+
         /// <summary>
         /// Display name
         /// </summary>
         public string Name { get; set; }
+
         /// <summary>
         /// The roleplay level of this ban source
         /// </summary>

diff --git a/CentCom.API/Program.cs b/CentCom.API/Program.cs
@@ -1,7 +1,7 @@
+using System.IO;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
-using System.IO;
 
 namespace CentCom.API
 {

diff --git a/CentCom.API/Properties/launchSettings.json b/CentCom.API/Properties/launchSettings.json
@@ -19,7 +19,7 @@
     "CentCom.API": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:5001;http://localhost:5000",
+      "applicationUrl": "https://localhost:6658",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

diff --git a/CentCom.API/Services/IBanService.cs b/CentCom.API/Services/IBanService.cs
@@ -1,7 +1,7 @@
-using CentCom.API.Models;
-using CentCom.Common.Models;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
+using CentCom.API.Models;
+using CentCom.Common.Models;
 
 namespace CentCom.API.Services
 {

diff --git a/CentCom.API/Services/IBanSourceService.cs b/CentCom.API/Services/IBanSourceService.cs
@@ -1,6 +1,6 @@
-using CentCom.API.Models;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
+using CentCom.API.Models;
 
 namespace CentCom.API.Services
 {

diff --git a/CentCom.API/Services/Implemented/BanService.cs b/CentCom.API/Services/Implemented/BanService.cs
@@ -1,12 +1,12 @@
-using CentCom.API.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using CentCom.API.Models;
 using CentCom.Common;
 using CentCom.Common.Data;
 using CentCom.Common.Models;
 using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace CentCom.API.Services.Implemented
 {

diff --git a/CentCom.API/Services/Implemented/BanSourceService.cs b/CentCom.API/Services/Implemented/BanSourceService.cs
@@ -1,9 +1,9 @@
-using CentCom.API.Models;
-using CentCom.Common.Data;
-using Microsoft.EntityFrameworkCore;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using CentCom.API.Models;
+using CentCom.Common.Data;
+using Microsoft.EntityFrameworkCore;
 
 namespace CentCom.API.Services.Implemented
 {

diff --git a/CentCom.API/Startup.cs b/CentCom.API/Startup.cs
@@ -1,3 +1,7 @@
+using System;
+using System.IO;
+using System.Reflection;
+using System.Text.Json.Serialization;
 using CentCom.API.Services;
 using CentCom.API.Services.Implemented;
 using CentCom.Common.Configuration;
@@ -8,10 +12,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.OpenApi.Models;
-using System;
-using System.IO;
-using System.Reflection;
-using System.Text.Json.Serialization;
 
 namespace CentCom
 {

diff --git a/CentCom.API/wwwroot/css/site.css b/CentCom.API/wwwroot/css/site.css
@@ -50,19 +50,19 @@
     color: #333;
 }
 
-    .sidebar .nav-link .feather {
-        margin-right: 4px;
-        color: #999;
-    }
+.sidebar .nav-link .feather {
+    margin-right: 4px;
+    color: #999;
+}
 
-    .sidebar .nav-link.active {
-        color: #007bff;
-    }
+.sidebar .nav-link.active {
+    color: #007bff;
+}
 
-        .sidebar .nav-link:hover .feather,
-        .sidebar .nav-link.active .feather {
-            color: inherit;
-        }
+.sidebar .nav-link:hover .feather,
+.sidebar .nav-link.active .feather {
+    color: inherit;
+}
 
 .sidebar-heading {
     font-size: .75rem;

diff --git a/CentCom.Bot/CentCom.Bot.csproj b/CentCom.Bot/CentCom.Bot.csproj
@@ -2,29 +2,29 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <Version>1.3.10.1</Version>
+        <Version>1.3.11</Version>
         <TargetFramework>net5.0</TargetFramework>
         <UserSecretsId>c8af1449-8cdf-4707-a66d-51e896551bfb</UserSecretsId>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="5.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
-        <PackageReference Include="Quartz" Version="3.3.3" />
-        <PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.3.3" />
-        <PackageReference Include="Quartz.Extensions.Hosting" Version="3.3.3" />
-        <PackageReference Include="Remora.Discord" Version="3.0.52" />
-        <PackageReference Include="Serilog" Version="2.10.0" />
-        <PackageReference Include="Serilog.Extensions.Hosting" Version="4.1.2" />
-        <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
-        <PackageReference Include="Serilog.Filters.Expressions" Version="2.1.0" />
-        <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
-        <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0"/>
+        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0"/>
+        <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="5.0.0"/>
+        <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0"/>
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2"/>
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0"/>
+        <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0"/>
+        <PackageReference Include="Quartz" Version="3.3.3"/>
+        <PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.3.3"/>
+        <PackageReference Include="Quartz.Extensions.Hosting" Version="3.3.3"/>
+        <PackageReference Include="Remora.Discord" Version="3.0.52"/>
+        <PackageReference Include="Serilog" Version="2.10.0"/>
+        <PackageReference Include="Serilog.Extensions.Hosting" Version="4.1.2"/>
+        <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1"/>
+        <PackageReference Include="Serilog.Filters.Expressions" Version="2.1.0"/>
+        <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0"/>
+        <PackageReference Include="Serilog.Sinks.File" Version="5.0.0"/>
     </ItemGroup>
 
     <ItemGroup>
@@ -34,7 +34,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\CentCom.Common\CentCom.Common.csproj" />
+        <ProjectReference Include="..\CentCom.Common\CentCom.Common.csproj"/>
     </ItemGroup>
 
 </Project>