From 05684e7196648d11238b0ec91022e3c7fc48e319 Mon Sep 17 00:00:00 2001 From: Letter N <24603524+LetterN@users.noreply.github.com> Date: Wed, 8 Jul 2020 16:36:58 +0800 Subject: [PATCH] no config filter thing yet, but the code for it is "ready" --- code/controllers/configuration/configuration.dm | 4 +++- code/modules/goonchat/browserOutput.dm | 4 ++-- code/modules/mob/living/say.dm | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index 3e7886bcf9..1c6e96f9e4 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -14,6 +14,7 @@ var/list/modes // allowed modes var/list/gamemode_cache var/list/votable_modes // votable modes + // var/list/ic_filter_regex var/list/storyteller_cache var/list/mode_names var/list/mode_reports @@ -414,7 +415,7 @@ continue runnable_modes[M] = probabilities[M.config_tag] return runnable_modes - +/* /datum/controller/configuration/proc/LoadChatFilter() var/list/in_character_filter = list() @@ -431,3 +432,4 @@ ic_filter_regex = in_character_filter.len ? regex("\\b([jointext(in_character_filter, "|")])\\b", "i") : null syncChatRegexes() +*/ diff --git a/code/modules/goonchat/browserOutput.dm b/code/modules/goonchat/browserOutput.dm index cd50408941..ce27dccb74 100644 --- a/code/modules/goonchat/browserOutput.dm +++ b/code/modules/goonchat/browserOutput.dm @@ -155,14 +155,14 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("tmp/iconCache.sav")) //Cache of ico /// Used to dynamically add regexes to the browser output. Currently only used by the IC filter. /datum/chatOutput/proc/syncRegex() var/list/regexes = list() - + /* if (config.ic_filter_regex) regexes["show_filtered_ic_chat"] = list( config.ic_filter_regex.name, "ig", "$1" ) - + */ if (regexes.len) ehjax_send(data = list("syncRegex" = regexes)) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 6db4356de7..66c2cd96c7 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -89,10 +89,11 @@ GLOBAL_LIST_INIT(department_radio_keys, list( var/static/list/one_character_prefix = list(MODE_HEADSET = TRUE, MODE_ROBOT = TRUE, MODE_WHISPER = TRUE) var/ic_blocked = FALSE + /* if(client && !forced && config.ic_filter_regex && findtext(message, config.ic_filter_regex)) //The filter doesn't act on the sanitized message, but the raw message. ic_blocked = TRUE - + */ if(sanitize) message = trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN)) if(!message || message == "")