From be55d3686a1744fe35b577a00360c9fc367263f9 Mon Sep 17 00:00:00 2001
From: hole-thu <hole_thu@riseup.net>
Date: Thu, 16 Dec 2021 12:55:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=86=85=E5=AE=B9=E5=AE=8C?=
 =?UTF-8?q?=E5=85=A8=E4=B8=8D=E6=98=BE=E7=A4=BA=20&=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9B=E9=BB=98=E8=AE=A4=E5=B1=8F=E8=94=BD=E8=AF=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Config.js | 52 ++++++---------------------------------------------
 src/Flows.js  |  6 +++---
 2 files changed, 9 insertions(+), 49 deletions(-)

diff --git a/src/Config.js b/src/Config.js
index aa3fde2..a216769 100644
--- a/src/Config.js
+++ b/src/Config.js
@@ -32,7 +32,7 @@ const DEFAULT_CONFIG = {
   color_scheme: 'default',
   no_c_post: false,
   by_c: false,
-  block_words: [],
+  block_words_v2: ['#天火', '#桃花石'],
   whitelist_cw: []
 };
 
@@ -52,6 +52,10 @@ export function load_config() {
     if (config[key] !== undefined) config[key] = loaded_config[key];
   });
 
+  if (loaded_config['block_words']) {
+    config['block_words_v2'] = loaded_config['block_words'].concat(config['block_words_v2'])
+  }
+
   console.log('config loaded', config);
   window.config = config;
 }
@@ -257,50 +261,6 @@ class ConfigTextArea extends PureComponent {
   }
 }
 
-/* class ConfigBlockWords extends PureComponent {
-  constructor(props) {
-    super(props);
-    this.state = {
-      block_words: window.config.block_words,
-    };
-  }
-
-  save_changes() {
-    this.props.callback({
-      block_words: this.state.block_words.filter((v) => v),
-    });
-  }
-
-  on_change(e) {
-    // Filter out those blank lines
-    let value = e.target.value.split('\n');
-    this.setState(
-      {
-        block_words: value,
-      },
-      this.save_changes.bind(this),
-    );
-  }
-
-  render() {
-    return (
-      <div>
-        <p>
-          {' '}
-          <b>设置屏蔽词 </b>
-        </p>
-        <p>
-          <textarea
-            className="block-words"
-            value={this.state.block_words.join('\n')}
-            onChange={this.on_change.bind(this)}
-          />
-        </p>
-      </div>
-    );
-  }
-} */
-
 class ConfigSwitch extends PureComponent {
   constructor(props) {
     super(props);
@@ -404,7 +364,7 @@ export class ConfigUI extends PureComponent {
             callback={this.save_changes_bound}
           /> */}
           <ConfigTextArea
-            id="block_words"
+            id="block_words_v2"
             callback={this.save_changes_bound}
             name="设置屏蔽词"
             description={'包含屏蔽词的树洞会被折叠，每行写一个屏蔽词'}
diff --git a/src/Flows.js b/src/Flows.js
index b1f981d..8acc20f 100644
--- a/src/Flows.js
+++ b/src/Flows.js
@@ -723,9 +723,9 @@ class FlowItemRow extends PureComponent {
       reply_status: 'done',
       reply_error: null,
       info: Object.assign({}, props.info, { variant: {} }),
-      hidden: window.config.block_words.some((word) =>
+      hidden: window.config.block_words_v2.some((word) =>
           props.info.text.includes(word),
-        ) || this.needFold,
+        ) && !props.info.can_del || this.needFold,
       attention:
         props.attention_override === null ? false : props.attention_override,
       cached: true, // default no display anything
@@ -908,7 +908,7 @@ class FlowItemRow extends PureComponent {
     );
 
     if (this.state.hidden) {
-      return (
+      return this.needFold && (
         <div
           className="flow-item-row flow-item-row-with-prompt"
           onClick={(event) => {