[feat] Разделение банов по серверам.
# 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
This commit is contained in:
@@ -374,6 +374,15 @@ namespace Content.Server.Administration.Managers
|
||||
Flags = flags
|
||||
};
|
||||
|
||||
var currentServerName = _cfg.GetCVar(CCVars.AdminLogsServerName);
|
||||
// я ебался в зад, поймите
|
||||
if (!data.HasFlag(AdminFlags.Permissions) && !data.HasFlag(AdminFlags.Host) &&
|
||||
dbData.AdminServer != null && dbData.AdminServer != "unknown" && currentServerName != "unknown"
|
||||
&& currentServerName != dbData.AdminServer)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
if (dbData.Title != null)
|
||||
{
|
||||
data.Title = dbData.Title;
|
||||
|
||||
Reference in New Issue
Block a user