cs2/cs2-SimpleAdmin
1
0
Fork 0
mirror of https://github.com/daffyyyy/CS2-SimpleAdmin.git synced 2026-09-27 20:17:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

Clean up orphaned non-global admins on the expire timer

Browse source
This commit is contained in:
Ravid-A 2026-05-31 17:47:13 +03:00
parent e028441b56
commit fd94ac8d2b
5 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CS2-SimpleAdmin/Database/IDatabaseProvider.cs
View file

@ -30,6 +30,7 @@ public interface IDatabaseProvider
string GetAddGroupServerQuery();
string GetDeleteGroupQuery();
string GetDeleteOldAdminsQuery();
string GetDeleteOrphanedAdminsQuery();
// BanManager
string GetAddBanQuery();

3
CS2-SimpleAdmin/Database/MysqlDatabaseProvider.cs
View file

@ -188,6 +188,9 @@ public class MySqlDatabaseProvider(string connectionString) : IDatabaseProvider
public string GetDeleteOldAdminsQuery() =>
"DELETE FROM sa_admins WHERE ends IS NOT NULL AND ends <= @CurrentTime;";
public string GetDeleteOrphanedAdminsQuery() =>
"DELETE FROM sa_admins WHERE `global` = 0 AND id NOT IN (SELECT admin_id FROM sa_admins_servers);";
public string GetAddBanQuery()
{
return """

3
CS2-SimpleAdmin/Database/SqliteDatabaseProvider.cs
View file

@ -241,6 +241,9 @@ public class SqliteDatabaseProvider(string filePath) : IDatabaseProvider
public string GetDeleteOldAdminsQuery() =>
"DELETE FROM sa_admins WHERE ends IS NOT NULL AND ends <= @CurrentTime;";
public string GetDeleteOrphanedAdminsQuery() =>
"DELETE FROM sa_admins WHERE `global` = 0 AND id NOT IN (SELECT admin_id FROM sa_admins_servers);";
public string GetAddMuteQuery(bool includePlayerName) =>
includePlayerName
? """

20
CS2-SimpleAdmin/Managers/PermissionManager.cs
View file

@ -677,4 +677,24 @@ public class PermissionManager(IDatabaseProvider? databaseProvider)
CS2_SimpleAdmin._logger?.LogCritical("Unable to remove expired admins");
}
}
/// <summary>
/// Deletes orphaned admins that are not global and have no server assignments left.
/// </summary>
public async Task DeleteOrphanedAdmins()
{
if (databaseProvider == null) return;
try
{
await using var connection = await databaseProvider.CreateConnectionAsync();
var sql = databaseProvider.GetDeleteOrphanedAdminsQuery();
await connection.ExecuteAsync(sql);
}
catch (Exception)
{
CS2_SimpleAdmin._logger?.LogCritical("Unable to remove orphaned admins");
}
}
}

3
CS2-SimpleAdmin/Managers/PlayerManager.cs
View file

@ -306,7 +306,8 @@ internal class PlayerManager
pluginInstance.MuteManager.ExpireOldMutes(),
pluginInstance.WarnManager.ExpireOldWarns(),
pluginInstance.CacheManager?.RefreshCacheAsync() ?? Task.CompletedTask,
pluginInstance.PermissionManager.DeleteOldAdmins()
pluginInstance.PermissionManager.DeleteOldAdmins(),
pluginInstance.PermissionManager.DeleteOrphanedAdmins()
};
await Task.WhenAll(expireTasks);