From 354dc022bfa0c1f44d8d543df89d39b945cbd8b0 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Tue, 19 Dec 2023 19:43:00 +0100
Subject: [PATCH] Highlight blacklist (#15623)
---
tgui/packages/tgui-panel/chat/renderer.js | 60 +++++++++++++++++++
.../tgui-panel/settings/SettingsPanel.jsx | 35 +++++++++++
tgui/packages/tgui-panel/settings/model.js | 2 +
tgui/public/tgui-panel.bundle.js | 58 +++++++++---------
4 files changed, 126 insertions(+), 29 deletions(-)
diff --git a/tgui/packages/tgui-panel/chat/renderer.js b/tgui/packages/tgui-panel/chat/renderer.js
index 645c7a09286..73fc40c1c35 100644
--- a/tgui/packages/tgui-panel/chat/renderer.js
+++ b/tgui/packages/tgui-panel/chat/renderer.js
@@ -189,7 +189,9 @@ class ChatRenderer {
highlightSettings.map((id) => {
const setting = highlightSettingById[id];
const text = setting.highlightText;
+ const blacklist = setting.blacklistText;
const highlightColor = setting.highlightColor;
+ const highlightBlacklist = setting.highlightBlacklist;
const highlightWholeMessage = setting.highlightWholeMessage;
const matchWord = setting.matchWord;
const matchCase = setting.matchCase;
@@ -214,6 +216,55 @@ class ChatRenderer {
if (lines.length === 0) {
return;
}
+ const blacklistLines = String(blacklist)
+ .split(',')
+ .map((str) => str.trim())
+ .filter(
+ (str) =>
+ // Must be longer than one character
+ str &&
+ str.length > 1 &&
+ // Must be alphanumeric (with some punctuation)
+ allowedRegex.test(str) &&
+ // Reset lastIndex so it does not mess up the next word
+ ((allowedRegex.lastIndex = 0) || true)
+ );
+ let blacklistWords;
+ let blacklistregex;
+ if (highlightBlacklist && blacklistLines.length > 0) {
+ let blacklistRegexExpressions = [];
+ for (let line of blacklistLines) {
+ // Regex expression syntax is /[exp]/
+ if (line.charAt(0) === '/' && line.charAt(line.length - 1) === '/') {
+ const expr = line.substring(1, line.length - 1);
+ // Check if this is more than one character
+ if (/^(\[.*\]|\\.|.)$/.test(expr)) {
+ continue;
+ }
+ blacklistRegexExpressions.push(expr);
+ } else {
+ // Lazy init
+ if (!blacklistWords) {
+ blacklistWords = [];
+ }
+ // We're not going to let regex characters fuck up our RegEx operation.
+ line = line.replace(regexEscapeCharacters, '\\$&');
+
+ blacklistWords.push('^\\s*' + line);
+ blacklistWords.push('^\\[\\d+:\\d+\\]\\s*' + line);
+ }
+ }
+ const regexStrBL = blacklistWords.join('|');
+ const flagsBL = 'i';
+ // We wrap this in a try-catch to ensure that broken regex doesn't break
+ // the entire chat.
+ try {
+ blacklistregex = new RegExp('(' + regexStrBL + ')', flagsBL);
+ } catch {
+ // We just reset it if it's invalid.
+ blacklistregex = null;
+ }
+ }
let regexExpressions = [];
// Organize each highlight entry into regex expressions and words
for (let line of lines) {
@@ -263,6 +314,8 @@ class ChatRenderer {
highlightRegex,
highlightColor,
highlightWholeMessage,
+ highlightBlacklist,
+ blacklistregex,
});
});
}
@@ -415,6 +468,13 @@ class ChatRenderer {
// Highlight text
if (!message.avoidHighlighting && this.highlightParsers) {
this.highlightParsers.map((parser) => {
+ if (
+ parser.highlightBlacklist &&
+ parser.blacklistregex &&
+ parser.blacklistregex.test(node.textContent)
+ ) {
+ return;
+ }
const highlighted = highlightNode(
node,
parser.highlightRegex,
diff --git a/tgui/packages/tgui-panel/settings/SettingsPanel.jsx b/tgui/packages/tgui-panel/settings/SettingsPanel.jsx
index 0ab17b07a85..25b1b963f64 100644
--- a/tgui/packages/tgui-panel/settings/SettingsPanel.jsx
+++ b/tgui/packages/tgui-panel/settings/SettingsPanel.jsx
@@ -290,7 +290,9 @@ const TextHighlightSetting = (props, context) => {
const {
highlightColor,
highlightText,
+ blacklistText,
highlightWholeMessage,
+ highlightBlacklist,
matchWord,
matchCase,
} = highlightSettingById[id];
@@ -311,6 +313,22 @@ const TextHighlightSetting = (props, context) => {
}
/>
+
+
+ dispatch(
+ updateHighlightSetting({
+ id: id,
+ highlightBlacklist: !highlightBlacklist,
+ })
+ )
+ }
+ />
+
{
)
}
/>
+ {highlightBlacklist ? (
+