From dd42356c4ed0fa9c2b6c9277a7bf66fe0eca0743 Mon Sep 17 00:00:00 2001 From: Karolis Date: Thu, 28 Jan 2021 12:20:37 +0200 Subject: [PATCH 01/20] Fixes ban / kick messages not showing (#11083) --- code/controllers/subsystems/statistics.dm | 2 +- code/modules/admin/topic.dm | 12 ++++++------ code/modules/admin/verbs/warning.dm | 2 +- code/modules/mob/abstract/unauthed/login.dm | 8 ++++---- html/changelogs/bankickfix.yml | 4 ++++ 5 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 html/changelogs/bankickfix.yml diff --git a/code/controllers/subsystems/statistics.dm b/code/controllers/subsystems/statistics.dm index 222d2235cfc..7a372a17955 100644 --- a/code/controllers/subsystems/statistics.dm +++ b/code/controllers/subsystems/statistics.dm @@ -53,7 +53,7 @@ if(!isobserver(C.mob) && !C.holder) if(C.is_afk(inactivity_threshold)) log_access("AFK: [key_name(C)]") - to_chat(C, SPAN_WARNING("You have been inactive for more than [config.kick_inactive] minute\s and have been disconnected.")) + to_chat_immediate(C, SPAN_WARNING("You have been inactive for more than [config.kick_inactive] minute\s and have been disconnected.")) qdel(C) kicked_clients++ diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 683ff801313..9fdfc2e0ae4 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -327,9 +327,9 @@ return var/reason = sanitize(input("Please enter reason")) if(!reason) - to_chat(M, "You have been kicked from the server") + to_chat_immediate(M, "You have been kicked from the server") else - to_chat(M, "You have been kicked from the server: [reason]") + to_chat_immediate(M, "You have been kicked from the server: [reason]") log_admin("[key_name(usr)] booted [key_name(M)].",admin_key=key_name(usr),ckey=key_name(M)) message_admins("[key_name_admin(usr)] booted [key_name_admin(M)].", 1) //M.client = null @@ -367,15 +367,15 @@ notes_add(M.ckey,"[usr.client.ckey] has banned [M.ckey]. - Reason: [reason] - This will be removed in [mins] minutes.",usr) else notes_add_sql(M.ckey, "[usr.client.ckey] has banned [M.ckey]. - Reason: [reason] - This will be removed in [mins] minutes.", usr, M.lastKnownIP, M.computer_id) - 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.") + to_chat_immediate(M, "You have been banned by [usr.client.ckey].\nReason: [reason].") + to_chat_immediate(M, "This is a temporary ban, it will be removed in [mins] minutes.") feedback_inc("ban_tmp",1) DB_ban_record(BANTYPE_TEMP, M, mins, reason) feedback_inc("ban_tmp_mins",mins) if(config.banappeals) - to_chat(M, "To try to resolve this matter head to [config.banappeals]") + to_chat_immediate(M, "To try to resolve this matter head to [config.banappeals]") else - to_chat(M, "No ban appeals URL has been set.") + to_chat_immediate(M, "No ban appeals URL has been set.") log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.",admin_key=key_name(usr),ckey=key_name(M)) message_admins("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") diff --git a/code/modules/admin/verbs/warning.dm b/code/modules/admin/verbs/warning.dm index dde65366889..965450eb349 100644 --- a/code/modules/admin/verbs/warning.dm +++ b/code/modules/admin/verbs/warning.dm @@ -79,7 +79,7 @@ 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.") - to_chat(C, "You have been autobanned due to a warning by [ckey].
This is a temporary ban, it will be removed in [AUTOBANTIME] minutes.") + to_chat_immediate(C, "You have been autobanned due to a warning by [ckey].
This is a temporary ban, it will be removed in [AUTOBANTIME] minutes.") qdel(C) else message_admins("[key_name_admin(src)] has warned [warned_ckey] resulting in a [AUTOBANTIME] minute ban.") diff --git a/code/modules/mob/abstract/unauthed/login.dm b/code/modules/mob/abstract/unauthed/login.dm index f9a22c2826d..020340dcb06 100644 --- a/code/modules/mob/abstract/unauthed/login.dm +++ b/code/modules/mob/abstract/unauthed/login.dm @@ -28,7 +28,7 @@ /mob/abstract/unauthed/proc/timeout() if (client) - to_chat(client, "Your login time has expired. Please relog and try again.") + to_chat_immediate(client, "Your login time has expired. Please relog and try again.") qdel(client) qdel(src) @@ -45,9 +45,9 @@ // Check for bans var/list/ban_data = world.IsBanned(ckey(newkey), c.address, c.computer_id, 1, TRUE) if(ban_data) - to_chat(c, "You are banned for this server.") - to_chat(c, "Reason: [ban_data["reason"]]") - to_chat(c, "Description: [ban_data["desc"]]") + to_chat_immediate(c, "You are banned for this server.") + to_chat_immediate(c, "Reason: [ban_data["reason"]]") + to_chat_immediate(c, "Description: [ban_data["desc"]]") del(c) return diff --git a/html/changelogs/bankickfix.yml b/html/changelogs/bankickfix.yml new file mode 100644 index 00000000000..32122468b04 --- /dev/null +++ b/html/changelogs/bankickfix.yml @@ -0,0 +1,4 @@ +author: Karolis2011 +delete-after: True +changes: + - bugfix: "Fixed ban / kick messages not showing up on goonchat." From 0a8670a2f11c612f09ac52a2be79071b0b989ecf Mon Sep 17 00:00:00 2001 From: AuroraBuildBot Date: Thu, 28 Jan 2021 10:21:40 +0000 Subject: [PATCH 02/20] "[ci skip] Automatic Build - 2021.01.28.10.21.40" --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/bankickfix.yml | 4 ---- 3 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/bankickfix.yml diff --git a/html/changelog.html b/html/changelog.html index 9fbc5038426..b4609fcb2b2 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -35,6 +35,12 @@ -->
+

28 January 2021

+

Karolis2011 updated:

+
    +
  • Fixed ban / kick messages not showing up on goonchat.
    • +
+

27 January 2021

Wowzewow (Wezzy) updated: