Merge pull request #44 from bobbahbrown/v1.3.12

Version 1.3.12 - Add user agent for scraper, add Shiptest 13
bobbah · Aug 22, 2021 · d8f050a · d8f050a
2 parents 1b2d04e + 67d40b5
commit d8f050a
Show file tree

Hide file tree

Showing 11 changed files with 81 additions and 18 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.11</Version>
+        <Version>1.3.12</Version>
         <UserSecretsId>1f5f48fa-862f-4472-ba34-2c5a26035e88</UserSecretsId>
     </PropertyGroup>
 
@@ -15,19 +15,20 @@
     </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"/>
+        <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.AspNetCore.Mvc.Razor.RuntimeCompilation" 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"/>
+        <ProjectReference Include="..\CentCom.Common\CentCom.Common.csproj" />
     </ItemGroup>
 
 

diff --git a/CentCom.API/Controllers/ScraperInfoController.cs b/CentCom.API/Controllers/ScraperInfoController.cs
@@ -0,0 +1,13 @@
+using Microsoft.AspNetCore.Mvc;
+
+namespace CentCom.API.Controllers
+{
+    [Route("scraper")]
+    public class ScraperInfoController : Controller
+    {
+        public IActionResult Index()
+        {
+            return View();
+        }
+    }
+}
diff --git a/CentCom.API/Startup.cs b/CentCom.API/Startup.cs
@@ -31,7 +31,7 @@ public void ConfigureServices(IServiceCollection services)
             {
                 x.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());
                 x.JsonSerializerOptions.IgnoreNullValues = true;
-            });
+            }).AddRazorRuntimeCompilation();
 
             // Add DB context
             var dbConfig = new DbConfig();

diff --git a/CentCom.API/Views/ScraperInfo/index.cshtml b/CentCom.API/Views/ScraperInfo/index.cshtml
@@ -0,0 +1,12 @@
+@{
+    ViewBag.Title = "CentCom";
+}
+<h2 class="mb-3">Data Aggregation Bots</h2>
+<p>
+    CentCom makes use of automated data aggregators which collect information from consenting websites. The information provided by our consenting partners is temporarily replicated within CentCom's databases, and is
+    updated often to reflect any modification or deletion of the source data. If your site is being parsed by CentCom without your consent, or you otherwise have any issues, contact the
+    developer bobbahbrown through Discord at bobbahbrown#0001.
+</p>
+<p>
+    Our aggregators can be identified by their user agent: <code>Mozilla/5.0 (compatible; CentComBot/&lt;version&gt; +https://centcom.melonmesa.com/scraper)</code>
+</p>
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.11</Version>
+        <Version>1.3.12</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.11</Version>
+        <Version>1.3.12</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.11</Version>
+        <Version>1.3.12</Version>
         <UserSecretsId>a625260b-31a1-4f4b-84f4-96ccc7a335e7</UserSecretsId>
     </PropertyGroup>
 

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.11</Version>
+        <Version>1.3.12</Version>
         <UserSecretsId>94572412-7eb8-4652-aff2-8afc154cf139</UserSecretsId>
     </PropertyGroup>
 

diff --git a/CentCom.Server/Services/RestBanService.cs b/CentCom.Server/Services/RestBanService.cs
@@ -1,3 +1,4 @@
+using System.Reflection;
 using System.Text;
 using CentCom.Server.Exceptions;
 using Microsoft.Extensions.Logging;
@@ -39,6 +40,11 @@ protected void FailedRequest(IRestResponse response)
         protected void InitializeClient()
         {
             Client = BaseUrl != null ? new RestClient(BaseUrl) : null;
+            if (Client == null)
+                return;
+
+            // Setup user agent
+            Client.UserAgent = $"Mozilla/5.0 (compatible; CentComBot/{Assembly.GetExecutingAssembly().GetName().Version}; +https://centcom.melonmesa.com/scraper)";
         }
     }
 }
diff --git a/CentCom.Server/appsettings.json b/CentCom.Server/appsettings.json
@@ -7,5 +7,11 @@
     "allowFulpExpiredSSL": true
   },
   "standardSources": [
+    {
+      "id": "shiptest",
+      "display": "Shiptest 13",
+      "roleplayLevel": "Medium",
+      "url": "https://bans.shiptest.ga/"
+    }
   ]
 }