From 977e075086f14f613ce5ff715558ebe1bda617a6 Mon Sep 17 00:00:00 2001 From: rhailrake <49613070+rhailrake@users.noreply.github.com> Date: Sun, 30 Apr 2023 14:27:27 +0600 Subject: [PATCH] =?UTF-8?q?[feat]=20=D0=A0=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B0=D0=BD=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=BF=D0=BE=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D0=B0=D0=BC?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # Content.Client/Administration/UI/BanList/BanListLine.xaml.cs # Content.Client/Administration/UI/BanList/Bans/BanListHeader.xaml # Content.Client/Administration/UI/BanList/Bans/BanListLine.xaml # Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml # Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml.cs # Content.IntegrationTests/Tests/Commands/PardonCommand.cs # Content.Server/Administration/Commands/BanCommand.cs # Content.Server/Administration/Commands/DepartmentBanCommand.cs # Content.Server/Administration/Commands/RoleBanCommand.cs # Content.Server/Administration/Managers/RoleBanManager.cs # Content.Server/Database/ServerDbManager.cs # Content.Server/Database/ServerDbPostgres.cs # Content.Server/Database/ServerDbSqlite.cs --- .../Administration/UI/BanList/BanListEui.cs | 1 + .../UI/BanList/Bans/BanListHeader.xaml | 5 + .../UI/BanList/Bans/BanListLine.xaml | 7 + .../Administration/UI/BanList/IBanListLine.cs | 1 + .../BanList/RoleBans/RoleBanListHeader.xaml | 5 + .../UI/BanList/RoleBans/RoleBanListLine.xaml | 7 + .../Administration/UI/BanPanel/BanPanel.xaml | 11 +- .../UI/BanPanel/BanPanel.xaml.cs | 149 +- .../Administration/UI/BanPanel/BanPanelEui.cs | 4 +- .../Administration/UI/PermissionsEui.cs | 16 +- .../UI/Tabs/AdminTab/BanWindow.xaml | 30 + .../UI/Tabs/AdminTab/BanWindow.xaml.cs | 84 + .../Tests/Commands/PardonCommand.cs | 2 +- ..._AddYaicaServerNameYaicaSalted.Designer.cs | 1346 ++++++++++++++++ ...326114015_AddYaicaServerNameYaicaSalted.cs | 35 + ...28_AddYaicaServerNameForAdmins.Designer.cs | 1355 +++++++++++++++++ ...30327111728_AddYaicaServerNameForAdmins.cs | 25 + ..._AddYaicaServerNameYaicaSalted.Designer.cs | 1280 ++++++++++++++++ ...326114020_AddYaicaServerNameYaicaSalted.cs | 36 + ...01_AddYaicaServerNameForAdmins.Designer.cs | 1289 ++++++++++++++++ ...30327111701_AddYaicaServerNameForAdmins.cs | 25 + Content.Server.Database/Model.cs | 3 + .../Administration/BanList/BanListEui.cs | 6 +- Content.Server/Administration/BanPanelEui.cs | 23 +- .../Administration/Commands/BanCommand.cs | 103 +- .../Administration/Commands/BanListCommand.cs | 8 +- .../Commands/DepartmentBanCommand.cs | 44 +- .../Administration/Commands/RoleBanCommand.cs | 49 +- .../Administration/Managers/AdminManager.cs | 9 + .../Administration/Managers/BanManager.cs | 31 +- .../Administration/Managers/IBanManager.cs | 4 +- .../Administration/UI/PermissionsEui.cs | 13 +- Content.Server/Database/ServerBanDef.cs | 10 +- Content.Server/Database/ServerDbBase.cs | 11 +- Content.Server/Database/ServerDbManager.cs | 27 +- Content.Server/Database/ServerDbPostgres.cs | 36 +- Content.Server/Database/ServerDbSqlite.cs | 40 +- Content.Server/Database/ServerRoleBanDef.cs | 6 +- .../Administration/BanList/SharedServerBan.cs | 3 +- .../BanList/SharedServerRoleBan.cs | 5 +- .../Administration/BanPanelEuiState.cs | 6 +- .../Administration/PermissionsEuiState.cs | 3 + 42 files changed, 5825 insertions(+), 328 deletions(-) create mode 100644 Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml create mode 100644 Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml.cs create mode 100644 Content.Server.Database/Migrations/Postgres/20230326114015_AddYaicaServerNameYaicaSalted.Designer.cs create mode 100644 Content.Server.Database/Migrations/Postgres/20230326114015_AddYaicaServerNameYaicaSalted.cs create mode 100644 Content.Server.Database/Migrations/Postgres/20230327111728_AddYaicaServerNameForAdmins.Designer.cs create mode 100644 Content.Server.Database/Migrations/Postgres/20230327111728_AddYaicaServerNameForAdmins.cs create mode 100644 Content.Server.Database/Migrations/Sqlite/20230326114020_AddYaicaServerNameYaicaSalted.Designer.cs create mode 100644 Content.Server.Database/Migrations/Sqlite/20230326114020_AddYaicaServerNameYaicaSalted.cs create mode 100644 Content.Server.Database/Migrations/Sqlite/20230327111701_AddYaicaServerNameForAdmins.Designer.cs create mode 100644 Content.Server.Database/Migrations/Sqlite/20230327111701_AddYaicaServerNameForAdmins.cs diff --git a/Content.Client/Administration/UI/BanList/BanListEui.cs b/Content.Client/Administration/UI/BanList/BanListEui.cs index 2fca1dee52..789f0c67ea 100644 --- a/Content.Client/Administration/UI/BanList/BanListEui.cs +++ b/Content.Client/Administration/UI/BanList/BanListEui.cs @@ -92,6 +92,7 @@ public sealed class BanListEui : BaseEui } line.BanningAdmin.Text = ban.BanningAdminName; + line.ServerName.Text = ban.ServerName == "unknown" ? "GLOBAL" : ban.ServerName; } private void OnLineIdsClicked(IBanListLine line) where T : SharedServerBan diff --git a/Content.Client/Administration/UI/BanList/Bans/BanListHeader.xaml b/Content.Client/Administration/UI/BanList/Bans/BanListHeader.xaml index 00a652175c..1b774f5ab9 100644 --- a/Content.Client/Administration/UI/BanList/Bans/BanListHeader.xaml +++ b/Content.Client/Administration/UI/BanList/Bans/BanListHeader.xaml @@ -25,6 +25,11 @@