From c4435b1aaf5ad96f147b6c0f142c8c80249f5a44 Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Sat, 3 Jul 2021 11:20:45 +0100 Subject: [PATCH] Refactors ban logging --- code/modules/admin/NewBan.dm | 1 - code/modules/admin/admin_verbs.dm | 1 - code/modules/admin/banjob.dm | 4 ---- code/modules/admin/db_ban/functions.dm | 1 + code/modules/admin/topic.dm | 8 -------- 5 files changed, 1 insertion(+), 14 deletions(-) diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm index 4169ca380ab..c0233a4c544 100644 --- a/code/modules/admin/NewBan.dm +++ b/code/modules/admin/NewBan.dm @@ -138,7 +138,6 @@ GLOBAL_PROTECT(banlist_savefile) // Obvious reasons log_admin("Ban Expired: [key]") message_admins("Ban Expired: [key]") else - ban_unban_log_save("[key_name_admin(usr)] unbanned [key]") log_admin("[key_name_admin(usr)] unbanned [key]") message_admins("[key_name_admin(usr)] unbanned: [key]") usr.client.holder.DB_ban_unban( ckey(key), BANTYPE_ANY_FULLBAN) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 63591062382..f0421838546 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -508,7 +508,6 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( return if(++D.warns >= MAX_WARNS) //uh ohhhh...you'reee iiiiin trouuuubble O:) - ban_unban_log_save("[ckey] warned [warned_ckey], resulting in a [AUTOBANTIME] minute autoban.") if(C) message_admins("[key_name_admin(src)] has warned [key_name_admin(C)] resulting in a [AUTOBANTIME] minute ban") log_admin("[key_name(src)] has warned [key_name(C)] resulting in a [AUTOBANTIME] minute ban") diff --git a/code/modules/admin/banjob.dm b/code/modules/admin/banjob.dm index 51b1299079b..fe7c4196488 100644 --- a/code/modules/admin/banjob.dm +++ b/code/modules/admin/banjob.dm @@ -118,10 +118,6 @@ GLOBAL_DATUM_INIT(jobban_regex, /regex, regex("(\[\\S]+) - (\[^#]+\[^# ])(?: ## /proc/jobban_unban_client(ckey, rank) jobban_remove("[ckey] - [rank]") -/proc/ban_unban_log_save(formatted_log) - text2file(formatted_log,"data/ban_unban_log.txt") - - /proc/jobban_remove(X) for(var/i = 1; i <= length(GLOB.jobban_keylist); i++) if( findtext(GLOB.jobban_keylist[i], "[X]") ) diff --git a/code/modules/admin/db_ban/functions.dm b/code/modules/admin/db_ban/functions.dm index 24c2c558e2e..9d0be1f83b5 100644 --- a/code/modules/admin/db_ban/functions.dm +++ b/code/modules/admin/db_ban/functions.dm @@ -414,6 +414,7 @@ qdel(query_update) message_admins("[key_name_admin(usr)] has lifted [pckey]'s ban.") + log_admin("[key_name(usr)] has lifted [pckey]'s ban.") flag_account_for_forum_sync(pckey) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 437721f383a..efdfd111bf4 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -487,7 +487,6 @@ if(!reason) return log_admin("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]") - ban_unban_log_save("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]") message_admins("[key_name_admin(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]", 1) GLOB.banlist_savefile.cd = "/base/[banfolder]" to_chat(GLOB.banlist_savefile["reason"], reason) @@ -519,7 +518,6 @@ return */ switch(alert("Reason: '[banreason]' Remove appearance ban?","Please Confirm","Yes","No")) if("Yes") - ban_unban_log_save("[key_name(usr)] removed [key_name(M)]'s appearance ban") log_admin("[key_name(usr)] removed [key_name(M)]'s appearance ban") DB_ban_unban(M.ckey, BANTYPE_APPEARANCE) appearance_unban(M) @@ -532,7 +530,6 @@ if(!reason) return M = admin_ban_mobsearch(M, ban_ckey_param, usr) - ban_unban_log_save("[key_name(usr)] appearance banned [key_name(M)]. reason: [reason]") log_admin("[key_name(usr)] appearance banned [key_name(M)]. \nReason: [reason]") DB_ban_record(BANTYPE_APPEARANCE, M, -1, reason) appearance_fullban(M, "[reason]; By [usr.ckey] on [time2text(world.realtime)]") @@ -893,7 +890,6 @@ var/msg M = admin_ban_mobsearch(M, ban_ckey_param, usr) for(var/job in notbannedlist) - ban_unban_log_save("[key_name(usr)] temp-jobbanned [key_name(M)] from [job] for [mins] minutes. reason: [reason]") log_admin("[key_name(usr)] temp-jobbanned [key_name(M)] from [job] for [mins] minutes") DB_ban_record(BANTYPE_JOB_TEMP, M, mins, reason, job) jobban_fullban(M, job, "[reason]; By [usr.ckey] on [time2text(world.realtime)]") //Legacy banning does not support temporary jobbans. @@ -914,7 +910,6 @@ var/msg M = admin_ban_mobsearch(M, ban_ckey_param, usr) for(var/job in notbannedlist) - ban_unban_log_save("[key_name(usr)] perma-jobbanned [key_name(M)] from [job]. reason: [reason]") log_admin("[key_name(usr)] perma-banned [key_name(M)] from [job]") DB_ban_record(BANTYPE_JOB_PERMA, M, -1, reason, job) jobban_fullban(M, job, "[reason]; By [usr.ckey] on [time2text(world.realtime)]") @@ -943,7 +938,6 @@ if(!reason) continue //skip if it isn't jobbanned anyway switch(alert("Job: '[job]' Reason: '[reason]' Un-jobban?","Please Confirm","Yes","No")) if("Yes") - ban_unban_log_save("[key_name(usr)] unjobbanned [key_name(M)] from [job]") log_admin("[key_name(usr)] unbanned [key_name(M)] from [job]") DB_ban_unban(M.ckey, BANTYPE_JOB_PERMA, job) jobban_unban(M, job) @@ -1068,7 +1062,6 @@ return M = admin_ban_mobsearch(M, ban_ckey_param, usr) AddBan(M.ckey, M.computer_id, reason, usr.ckey, 1, mins) - ban_unban_log_save("[usr.client.ckey] has banned [M.ckey]. - Reason: [reason] - This will be removed in [mins] minutes.") to_chat(M, "You have been banned by [usr.client.ckey].\nReason: [reason].") to_chat(M, "This is a temporary ban, it will be removed in [mins] minutes.") DB_ban_record(BANTYPE_TEMP, M, mins, reason) @@ -1095,7 +1088,6 @@ to_chat(M, "To try to resolve this matter head to [config.banappeals]") else to_chat(M, "No ban appeals URL has been set.") - ban_unban_log_save("[usr.client.ckey] has permabanned [M.ckey]. - Reason: [reason] - This ban does not expire automatically and must be appealed.") log_admin("[key_name(usr)] has banned [M.ckey].\nReason: [reason]\nThis ban does not expire automatically and must be appealed.") message_admins("[key_name_admin(usr)] has banned [M.ckey].\nReason: [reason]\nThis ban does not expire automatically and must be appealed.") DB_ban_record(BANTYPE_PERMA, M, -1, reason)