Merge pull request #32 from bobbahbrown/v1.3.2

Version 1.3.2
bobbah · Mar 22, 2021 · 000a37b · 000a37b
2 parents b8dc500 + eb0d502
commit 000a37b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/CentCom.API/CentCom.API.csproj b/CentCom.API/CentCom.API.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>1.3.1</Version>
-    <AssemblyVersion>1.3.1.0</AssemblyVersion>
-    <FileVersion>1.3.1.0</FileVersion>
+    <Version>1.3.2</Version>
+    <AssemblyVersion>1.3.2.0</AssemblyVersion>
+    <FileVersion>1.3.2.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/CentCom.Common/CentCom.Common.csproj b/CentCom.Common/CentCom.Common.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>1.3.1</Version>
-    <AssemblyVersion>1.3.1.0</AssemblyVersion>
-    <FileVersion>1.3.1.0</FileVersion>
+    <Version>1.3.2</Version>
+    <AssemblyVersion>1.3.2.0</AssemblyVersion>
+    <FileVersion>1.3.2.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/CentCom.Server/BanSources/BanParser.cs b/CentCom.Server/BanSources/BanParser.cs
@@ -105,6 +105,14 @@ public virtual async Task ParseBans(IJobExecutionContext context)
             // Assign proper sources
             bans = await AssignBanSources(bans);
 
+            // Remove and report any invalid data from the parsed data
+            var dirtyBans = bans.Where(x => x.CKey == null);
+            if (dirtyBans.Any())
+            {
+                bans = bans.Except(dirtyBans);
+                _logger.LogWarning($"Removed {dirtyBans.Count()} erroneous bans from parsed data. This shouldn't happen!");
+            }
+
             // Check for ban updates
             var inserted = 0;
             var updated = 0;

diff --git a/CentCom.Server/CentCom.Server.csproj b/CentCom.Server/CentCom.Server.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
-    <AssemblyVersion>1.3.1.0</AssemblyVersion>
-    <FileVersion>1.3.1.0</FileVersion>
-    <Version>1.3.1</Version>
+    <AssemblyVersion>1.3.2.0</AssemblyVersion>
+    <FileVersion>1.3.2.0</FileVersion>
+    <Version>1.3.2</Version>
   </PropertyGroup>
 
   <ItemGroup>