Merge pull request #47 from bobbahbrown/v1.3.15

Version 1.3.15 - Add AuStation, Resolve Issue with Null Ckey Bans & Standardized Ban Parsers
bobbah · Aug 24, 2021 · c391b0a · c391b0a
2 parents b60cced + c819cfe
commit c391b0a
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 114 deletions.
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
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>net5.0</TargetFramework>
-        <Version>1.3.14</Version>
+        <Version>1.3.15</Version>
         <UserSecretsId>1f5f48fa-862f-4472-ba34-2c5a26035e88</UserSecretsId>
     </PropertyGroup>
 

diff --git a/CentCom.API/CentCom.API.xml b/CentCom.API/CentCom.API.xml
diff --git a/CentCom.Bot/CentCom.Bot.csproj b/CentCom.Bot/CentCom.Bot.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <Version>1.3.14</Version>
+        <Version>1.3.15</Version>
         <TargetFramework>net5.0</TargetFramework>
         <UserSecretsId>c8af1449-8cdf-4707-a66d-51e896551bfb</UserSecretsId>
     </PropertyGroup>

diff --git a/CentCom.Common/CentCom.Common.csproj b/CentCom.Common/CentCom.Common.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>net5.0</TargetFramework>
-        <Version>1.3.14</Version>
+        <Version>1.3.15</Version>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/CentCom.Exporter/CentCom.Exporter.csproj b/CentCom.Exporter/CentCom.Exporter.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>net5.0</TargetFramework>
-        <Version>1.3.14</Version>
+        <Version>1.3.15</Version>
         <UserSecretsId>a625260b-31a1-4f4b-84f4-96ccc7a335e7</UserSecretsId>
     </PropertyGroup>
 

diff --git a/CentCom.Exporter/Data/Providers/TgBanProvider.cs b/CentCom.Exporter/Data/Providers/TgBanProvider.cs
@@ -74,7 +74,8 @@ b.unbanned_ckey AS UnbannedBy
 				FROM
 					ban b
 				WHERE
-					(@cursor IS NULL OR b.id < @cursor)
+					b.ckey IS NOT NULL
+					AND (@cursor IS NULL OR b.id < @cursor)
 					AND (@afterDate IS NULL OR b.bantime > @afterDate)
 					AND (@afterId IS NULL OR b.id > @afterId)
 					AND (@includeJobBans OR b.role = 'Server')

diff --git a/CentCom.Server/CentCom.Server.csproj b/CentCom.Server/CentCom.Server.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net5.0</TargetFramework>
-        <Version>1.3.14</Version>
+        <Version>1.3.15</Version>
         <UserSecretsId>94572412-7eb8-4652-aff2-8afc154cf139</UserSecretsId>
     </PropertyGroup>
 

diff --git a/CentCom.Server/Services/StandardProviderService.cs b/CentCom.Server/Services/StandardProviderService.cs
@@ -45,7 +45,7 @@ private async Task<IEnumerable<Ban>> GetBansAsync(int? cursor = null)
                 BannedBy = x.BannedBy?.CanonicalKey,
                 BannedOn = x.BannedOn.DateTime,
                 BanType = x.BanType,
-                CKey = x.CKey.CanonicalKey,
+                CKey = x.CKey?.CanonicalKey,
                 Expires = x.Expires?.DateTime,
                 UnbannedBy = x.UnbannedBy?.CanonicalKey,
                 Reason = x.Reason,

diff --git a/CentCom.Server/appsettings.json b/CentCom.Server/appsettings.json
@@ -12,6 +12,12 @@
       "display": "Shiptest 13",
       "roleplayLevel": "Medium",
       "url": "https://bans.shiptest.ga/"
+    },
+    {
+      "id": "austation",
+      "display": "AuStation",
+      "roleplayLevel": "Low",
+      "url": "https://api.austation.net/"
     }
   ]
 }