숨겨진 토론 보이지 않기

https://github.com/openNAMU/openNAMU/issues/1892

app.py

@@ -76,7 +76,8 @@ with get_db_connect() as conn:
 
                         db_pass = 1
                     except Exception as e:
-                        print(e)
+                        # print(e)
+                        pass
 
                 if db_pass == 0:
                     try:
@@ -84,7 +85,8 @@ with get_db_connect() as conn:
 
                         db_pass = 1
                     except Exception as e:
-                        print(e)
+                        # print(e)
+                        pass
 
                 if db_pass == 0:
                     try:
@@ -92,7 +94,8 @@ with get_db_connect() as conn:
 
                         db_pass = 1
                     except Exception as e:
-                        print(e)
+                        # print(e)
+                        pass
 
                 if db_pass == 0:
                     try:
@@ -100,7 +103,8 @@ with get_db_connect() as conn:
 
                         db_pass = 1
                     except Exception as e:
-                        print(e)
+                        # print(e)
+                        pass
 
                 if db_pass == 0:
                     try:
@@ -108,7 +112,8 @@ with get_db_connect() as conn:
 
                         db_pass = 1
                     except Exception as e:
-                        print(e)
+                        # print(e)
+                        pass
 
                 if db_pass == 0:
                     try:
@@ -116,7 +121,8 @@ with get_db_connect() as conn:
 
                         db_pass = 1
                     except Exception as e:
-                        print(e)
+                        # print(e)
+                        pass
 
                 if db_pass == 0:
                     raise

lang/en-US.json

@@ -467,6 +467,7 @@
                 "edit_record" : "Edit record",
                 "discussion_record" : "Discussion record",
         "_comment_2.4_" : "Topic",
+            "remove_blind_thread" : "Hide blind thread",
             "make_new_topic" : "Make new discussion",
             "topic_tool" : "Discussion management tools",
             "topic_state" : "Discussion status",

lang/ko-KR.json

@@ -572,5 +572,6 @@
     "volume": "용량",
     "list_view_change" : "숫자 리스트의 보기 방식 변경",
     "view_joke" : "농담 매크로 내용 보이기",
-    "math_scroll" : "Math 매크로에서 스크롤 사용"
+    "math_scroll" : "Math 매크로에서 스크롤 사용",
+    "remove_blind_thread" : "숨겨진 토론 보이지 않기"
 }

route/api_topic.py

@@ -6,24 +6,30 @@ def api_topic_thread_make(user_id, date, data, code, color = '', blind = '', add
             color_b = 'opennamu_comment_blind'
         else:
             color_b = 'opennamu_comment_blind_admin'
+
+        class_b = 'opennamu_comment_blind_js'
     else:
         color_b = 'opennamu_comment_blind_not'
+        class_b = ''
 
     return '''
-        <table class="opennamu_comment" style="''' + add_style + '''">
-            <tr>
-                <td class="opennamu_comment_color_''' + color + '''">
-                    <a href="#thread_shortcut" id="''' + code + '''">#''' + code + '''</a>
-                    ''' + user_id + '''
-                    <span style="float: right;">''' + date + '''</span>
-                </td>
-            </tr>
-            <tr>
-                <td class="''' + color_b + '''" id="opennamu_comment_data_main">
-                    ''' + data + '''
-                </td>
-            </tr>
-        </table>
+        <span class="''' + class_b + '''">
+            <table class="opennamu_comment" style="''' + add_style + '''">
+                <tr>
+                    <td class="opennamu_comment_color_''' + color + '''">
+                        <a href="#thread_shortcut" id="''' + code + '''">#''' + code + '''</a>
+                        ''' + user_id + '''
+                        <span style="float: right;">''' + date + '''</span>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="''' + color_b + '''" id="opennamu_comment_data_main">
+                        ''' + data + '''
+                    </td>
+                </tr>
+            </table>
+            <hr class="main_hr">
+        </span>
     '''
 
 def api_topic_thread_pre_render(curs, data, num, ip, topic_num = '', name = '', sub = '', do_type = 'thread'):
@@ -192,7 +198,6 @@ def api_topic(topic_num = 1, tool = 'normal', num = '', render = ''):
                                 blind = for_a["blind"],
                                 add_style = ''
                             )
-                            data_r += '<hr class="main_hr">'
 
                     return flask.jsonify({ "data" : data_r })
             else:

route/bbs_w_post.py

@@ -49,7 +49,6 @@ def bbs_w_post_comment(user_id, sub_code, comment_num, bbs_num_str, post_num_str
             comment_default = 'selected'
 
         comment_select += '<option value="' + sub_code_check + '" ' + comment_default + '>' + sub_code_check + '</option>'
-        comment_data += '<hr class="main_hr">'
 
         temp_data = bbs_w_post_comment(user_id, sub_code + '-' + temp_dict['code'], comment_num, bbs_num_str, post_num_str)
 
@@ -150,7 +149,6 @@ def bbs_w_post(bbs_num = '', post_num = '', do_type = ''):
                     '0',
                     color = 'green'
                 )
-                data += '<hr class="main_hr">'
 
                 user_id = temp_dict['user_id']
                 count = 0
@@ -178,7 +176,6 @@ def bbs_w_post(bbs_num = '', post_num = '', do_type = ''):
                         str(count),
                         color = color
                     )
-                    data += '<hr class="main_hr">'
 
                 bbs_comment_form = ''
                 if bbs_comment_acl == 0:
@@ -325,7 +322,7 @@ def bbs_w_post(bbs_num = '', post_num = '', do_type = ''):
                 comment_add_count -= comment_count
 
                 if comment_data != '':
-                    data += '<hr class="main_hr"><hr>'
+                    data += '<hr>'
 
                 comment_select += '</select>'
                 if comment_data != '':

route/tool/func.py

@@ -1147,6 +1147,7 @@ def wiki_css(data):
     # Route JS
     data_css += '<script src="/views/main_css/js/route/editor.js?ver=' + data_css_ver + '"></script>'
     data_css += '<script src="/views/main_css/js/route/render.js?ver=' + data_css_ver + '"></script>'
+    data_css += '<script src="/views/main_css/js/route/topic.js?ver=' + data_css_ver + '"></script>'
     
     # Main CSS
     data_css += '<link rel="stylesheet" href="/views/main_css/css/main.css?ver=' + data_css_ver + '">'

route/topic.py

@@ -156,6 +156,13 @@ def topic(topic_num = 0, do_type = '', doc_name = 'Test'):
             return easy_minify(flask.render_template(skin_check(),
                 imp = [name, wiki_set(), wiki_custom(), wiki_css(['(' + load_lang('discussion') + ')', 0])],
                 data = '''
+                    <style id="opennamu_remove_blind">
+                        .opennamu_comment_blind_js {
+                            display: none;
+                        }
+                    </style>
+                    <input type="checkbox" onclick="opennamu_do_remove_blind_thread();" checked> ''' + load_lang('remove_blind_thread') + '''
+
                     ''' + shortcut + '''
                     <h2 id="topic_top_title">''' + html.escape(sub) + '''</h2>
                     
@@ -185,8 +192,6 @@ def topic(topic_num = 0, do_type = '', doc_name = 'Test'):
                     <hr class="main_hr">
                     
                     <div id="opennamu_preview_area">''' + thread_data_preview + '''</div>
-                    
-                    <!-- JS : opennamu_do_thread_make -->
                 ''',
                 menu = [['topic/' + url_pas(name), load_lang('list')]]
             ))

views/main_css/js/func/check_new_thread.ts

@@ -1,3 +0,0 @@
-function opennamu_check_new_thread(do_type : string = '') {
-    
-}

views/main_css/js/route/topic.js

@@ -0,0 +1,14 @@
+function opennamu_check_new_thread(do_type) {
+    if (do_type === void 0) { do_type = ''; }
+}
+function opennamu_do_remove_blind_thread() {
+    var style = document.querySelector('#opennamu_remove_blind');
+    if (style !== null) {
+        if (style.innerHTML !== "") {
+            style.innerHTML = '';
+        }
+        else {
+            style.innerHTML = "\n                .opennamu_comment_blind_js {\n                    display: none;\n                }\n            ";
+        }
+    }
+}

views/main_css/js/route/topic.ts

@@ -0,0 +1,18 @@
+function opennamu_check_new_thread(do_type : string = '') {
+    
+}
+
+function opennamu_do_remove_blind_thread() {
+    const style = document.querySelector('#opennamu_remove_blind') as HTMLInputElement | null;
+    if(style !== null) {
+        if(style.innerHTML !== "") {
+            style.innerHTML = '';
+        } else {
+            style.innerHTML = `
+                .opennamu_comment_blind_js {
+                    display: none;
+                }
+            `;
+        }
+    }
+}