Merge branch 'master' into wm

# Conflicts:
#	SS14

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "SS14"]
 	path = SS14
-	url = https://github.com/space-wizards/space-station-14.git
+	url = https://github.com/frosty-dev/ss14-core

SS14.Admin/Helpers/BanHelper.cs

@@ -4,6 +4,7 @@
 using System.Net.Sockets;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
+using SS14.Admin.Admins;
 using NpgsqlTypes;
 
 namespace SS14.Admin.Helpers;
@@ -165,6 +166,22 @@ public sealed class BanJoin<TBan, TUnban> where TBan: IBanCommon<TUnban> where T
         }
 
         ban.BanningAdmin = _httpContext.HttpContext!.User.Claims.GetUserId();
+
+        try
+        {
+            var adminData = _dbContext.Admin.First(a => a.UserId == ban.BanningAdmin);
+            var flags = AdminHelper.GetFlags(adminData);
+            if ((flags & AdminFlags.Ban) != flags)
+            {
+                return "Error: Admin doesn't have Ban flag.";
+            }
+        }
+        catch (Exception e)
+        {
+            _logger.LogError(e, "Unable to get admin flags");
+            return "Error: Unknown error occured while getting admin data.";;
+        }
+
         ban.Reason = reason;
         ban.BanTime = DateTime.UtcNow;
         return null;

SS14.Admin/LoginHandler.cs

@@ -47,6 +47,12 @@ public async Task HandleTokenValidated(TokenValidatedContext ctx)
             }
 
             var flags = AdminHelper.GetStringFlags(adminData);
+
+			/*if(!flags.Contains("BAN")) {
+				ctx.Response.Redirect(_linkGenerator.GetUriByPage(ctx.HttpContext, "/LoginFailed")!);
+                ctx.HandleResponse();
+				return;
+			}*/
 
             foreach (var flag in flags)
             {

SS14.Admin/Pages/Bans/Index.cshtml.cs

@@ -144,7 +144,7 @@ await pagination.LoadLinqAsync(bans, e => e.Select(b =>
         public sealed record Ban(
             int Id,
             Player? Player,
-            string? UserId,
+            string? PlayerUserId,
             string? Address,
             string? Hwid,
             string Reason,

SS14.Admin/Pages/LoginFailed.cshtml

@@ -5,6 +5,6 @@
     ViewData["Title"] = "Error";
 }
 
-<h1 class="text-danger">Failed to log in</h1>
-<h2 class="text-danger">You are not a server administrator</h2>
+<h1 class="text-danger">Ошибка входа</h1>
+<h2 class="text-danger">Вы не являетесь администратором сервера.</h2>
 

SS14.Admin/Pages/RoleBans/Index.cshtml.cs

@@ -143,7 +143,7 @@ await pagination.LoadLinqAsync(bans, e => e.Select(b =>
     public sealed record RoleBan(
         int Id,
         Player? Player,
-        string? UserId,
+        string? PlayerUserId,
         string? Address,
         string? Hwid,
         string Reason,

SS14.Admin/Pages/Tables/BansTable.cshtml

@@ -69,10 +69,10 @@
                         <br/>
                     }
                 }
-                @if (ban.UserId != null)
+                @if (ban.PlayerUserId != null)
                 {
                     <small>
-                        <strong>GUID:</strong> <span class="font-monospace">@ban.UserId</span>
+                        <strong>GUID:</strong> <span class="font-monospace">@ban.PlayerUserId</span>
                     </small>
                 }
             </td>

SS14.Admin/Pages/Tables/RoleBansTable.cshtml

@@ -70,10 +70,10 @@
                         <br/>
                     }
                 }
-                @if (ban.UserId != null)
+                @if (ban.PlayerUserId != null)
                 {
                     <small>
-                        <strong>GUID:</strong> <span class="font-monospace">@ban.UserId</span>
+                        <strong>GUID:</strong> <span class="font-monospace">@ban.PlayerUserId</span>
                     </small>
                 }
             </td>

SS14.Admin/wwwroot/css/site.css

@@ -19,6 +19,10 @@ for details on configuring this project to bundle and minify static web assets.
     --color-filter-type: #F78764;
 }
 
+* {
+    border-radius: 0 !important;
+}
+
 a.navbar-brand {
   white-space: normal;
   text-align: center;
@@ -91,6 +95,7 @@ html {
 body {
   /* Margin bottom by footer height */
   margin-bottom: 60px;
+  font-family: Roboto, sans-serif;
 }
 .footer {
   position: absolute;