최근 변경에서 숨김 기본적으로 안 보이도록

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

lang/en-US.json

@@ -49,6 +49,7 @@
     "edit_filter_view_authority" : "Contents filter view authority",
     "post_view_acl" : "Post view ACL",
     "post_comment_acl" : "Post comment ACL",
+    "remove_hidden" : "Don't show hide content",
 
     "_comment_" : "Common",
     "data" : "Data",
@@ -604,7 +605,6 @@
     "discussion_record" : "Discussion record",
     
     "_comment_" : "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

@@ -587,7 +587,6 @@
     "list_view_change": "숫자 리스트의 보기 방식 변경",
     "view_joke": "농담 매크로 내용 보이기",
     "math_scroll": "Math 매크로에서 스크롤 사용",
-    "remove_blind_thread": "숨겨진 토론 보이지 않기",
     "trace": "추적",
     "view_history": "문서 열람 추적 사용",
     "start_with_search": "첫 글자부터 검색",
@@ -695,5 +694,6 @@
     "edit_filter_pass_authority" : "편집 필터 통과 권한",
     "edit_filter_view_authority" : "편집 필터 보기 권한",
     "post_view_acl" : "게시글 보기 ACL",
-    "post_comment_acl" : "게시글 댓글 ACL"
+    "post_comment_acl" : "게시글 댓글 ACL",
+    "remove_hidden": "숨겨진 내용 보이지 않기"
 }

route/go_api_list_history.py

@@ -5,5 +5,6 @@ async def api_list_history(num = 1, set_type = 'normal', doc_name = 'Test'):
     other_set["num"] = str(num)
     other_set["doc_name"] = doc_name
     other_set["set_type"] = set_type
+    other_set["ip"] = ip_check()
     
     return flask.Response(response = (await python_to_golang(sys._getframe().f_code.co_name, other_set)), status = 200, mimetype = 'application/json')

route/go_api_topic.py

@@ -7,7 +7,7 @@ def api_topic_thread_make(user_id, date, data, code, color = '', blind = '', add
         else:
             color_b = 'opennamu_comment_blind_admin'
 
-        class_b = 'opennamu_comment_blind_js'
+        class_b = 'opennamu_comment_blind_js opennamu_list_hidden'
     else:
         color_b = 'opennamu_comment_blind_not'
         class_b = ''

route/topic.py

@@ -137,12 +137,8 @@ def topic(topic_num = 0, do_type = '', doc_name = 'Test'):
                 imp = [name, wiki_set(conn), wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'discussion') + ')', 0])],
                 data = '''
                     <script defer src="/views/main_css/js/route/topic.js''' + cache_v() + '''"></script>
-                    <style id="opennamu_remove_blind">
-                        .opennamu_comment_blind_js {
-                            display: none;
-                        }
-                    </style>
-                    <input type="checkbox" onclick="opennamu_do_remove_blind_thread();" checked> ''' + get_lang(conn, 'remove_blind_thread') + '''
+                    <style id="opennamu_list_hidden_style">.opennamu_list_hidden { display: none; }</style>
+                    <input type="checkbox" onclick="opennamu_list_hidden_remove();" checked> ''' + get_lang(conn, 'remove_hidden') + '''
                     <hr class="main_hr">
 
                     ''' + shortcut + '''

route_go/route/api_list_history.go

@@ -133,6 +133,7 @@ func Api_list_history(call_arg []string) string {
 		"file":           tool.Get_language(db, "file", false),
 		"category":       tool.Get_language(db, "category", false),
 		"setting":        tool.Get_language(db, "setting", false),
+		"remove_hidden":  tool.Get_language(db, "remove_hidden", false),
 	}
 	return_data["data"] = data_list
 	return_data["auth"] = auth_info

route_go/route/api_list_recent_change.go

@@ -153,6 +153,7 @@ func Api_list_recent_change(call_arg []string) string {
 			"file":           tool.Get_language(db, "file", false),
 			"category":       tool.Get_language(db, "category", false),
 			"setting":        tool.Get_language(db, "setting", false),
+			"remove_hidden":  tool.Get_language(db, "remove_hidden", false),
 		}
 		return_data["auth"] = auth_info
 		return_data["data"] = data_list

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.5.0-v178",
+        "r_ver" : "v3.5.0-v179",
         "c_ver" : "20240513",
         "s_ver" : "20240426"
     }

views/main_css/js/func/func.js

@@ -268,8 +268,20 @@ function opennamu_page_control(url, page, data_length, data_length_max = 50) {
     return (back() + ' ' + next()).replace(/^ /, '');
 }
 
-function opennamu_make_list(left = '', right = '', bottom = '') {
-    let data_html = '<div class="opennamu_recent_change">';
+function opennamu_list_hidden_remove() {
+    const style = document.querySelector('#opennamu_list_hidden_style');
+    if(style !== null) {
+        if(style.innerHTML !== "") {
+            style.innerHTML = '';
+        } else {
+            style.innerHTML = '.opennamu_list_hidden { display: none; }';
+        }
+    }
+}
+
+function opennamu_make_list(left = '', right = '', bottom = '', class_name = '') {
+    let data_html = '<span class="' + class_name + '">';
+    data_html += '<div class="opennamu_recent_change">';
     data_html += left;
     
     data_html += '<div style="float: right;">';
@@ -285,6 +297,7 @@ function opennamu_make_list(left = '', right = '', bottom = '') {
 
     data_html += '</div>';
     data_html += '<hr class="main_hr">';
+    data_html += '</span>';
 
     return data_html;
 }

views/main_css/js/route/list_history.js

@@ -50,9 +50,14 @@ function opennamu_list_history() {
         let lang = data["language"];
         let auth = data["auth"];
         data = data["data"];
+        console.log(auth);
 
         let data_html = '';
 
+        data_html += '<style id="opennamu_list_hidden_style">.opennamu_list_hidden { display: none; }</style>';
+        data_html += '<input type="checkbox" onclick="opennamu_list_hidden_remove();" checked> ' + lang['remove_hidden'];
+        data_html += '<hr class="main_hr">';
+
         let option_list = ['normal', 'edit', 'move', 'delete', 'revert', 'r1', 'setting'];
         for(let for_a = 0; for_a < option_list.length; for_a++) {
             data_html += '<a href="/history_page/1/' + option_list[for_a] + '/' + doc_name + '">(' + option_lang(option_list[for_a], lang) + ')</a> ';
@@ -62,7 +67,12 @@ function opennamu_list_history() {
         let select = '';
         for(let for_a = 0; for_a < data.length; for_a++) {
             if(data[for_a][6] !== "" && data[for_a][1] === "") {
-                data_html += opennamu_make_list('----');
+                if(date_heading !== '----') {
+                    data_html += '<h2 class="opennamu_list_hidden">----</h2>';
+                    date_heading = '----';
+                }
+
+                data_html += opennamu_make_list('----', '', '', 'opennamu_list_hidden');
 
                 continue;
             }

views/main_css/js/route/list_recent_change.js

@@ -33,6 +33,10 @@ function opennamu_list_recent_change() {
 
         let data_html = '';
 
+        data_html += '<style id="opennamu_list_hidden_style">.opennamu_list_hidden { display: none; }</style>';
+        data_html += '<input type="checkbox" onclick="opennamu_list_hidden_remove();" checked> ' + lang['remove_hidden'];
+        data_html += '<hr class="main_hr">';
+
         let option_list = ['normal', 'edit', 'move', 'delete', 'revert', 'r1', 'edit_request', 'user', 'file', 'category'];
         for(let for_a = 0; for_a < option_list.length; for_a++) {
             data_html += '<a href="/recent_change/1/' + option_list[for_a] + '">(' + option_lang(option_list[for_a], lang) + ')</a> ';
@@ -41,7 +45,12 @@ function opennamu_list_recent_change() {
         let date_heading = '';
         for(let for_a = 0; for_a < data.length; for_a++) {
             if(data[for_a][6] !== "" && data[for_a][1] === "") {
-                data_html += opennamu_make_list('----');
+                if(date_heading !== '----') {
+                    data_html += '<h2 class="opennamu_list_hidden">----</h2>';
+                    date_heading = '----';
+                }
+
+                data_html += opennamu_make_list('----', '', '', 'opennamu_list_hidden');
 
                 continue;
             }

views/main_css/js/route/topic.js

@@ -1,20 +1,5 @@
 "use strict";
 
-function opennamu_do_remove_blind_thread() {
-    const style = document.querySelector('#opennamu_remove_blind');
-    if(style !== null) {
-        if(style.innerHTML !== "") {
-            style.innerHTML = '';
-        } else {
-            style.innerHTML = `
-                .opennamu_comment_blind_js {
-                    display: none;
-                }
-            `;
-        }
-    }
-}
-
 function opennamu_thread_delete() {
     let lang_data = new FormData();
     lang_data.append('data', 'delete');
@@ -77,7 +62,7 @@ function opennamu_get_thread_ui(user_id, date, data, code, color = '', blind = '
     let color_b, class_b;
     if(blind === 'O') {
         color_b = data === '' ? 'opennamu_comment_blind' : 'opennamu_comment_blind_admin';
-        class_b = 'opennamu_comment_blind_js';
+        class_b = 'opennamu_comment_blind_js opennamu_list_hidden';
     } else {
         color_b = 'opennamu_comment_blind_not';
         class_b = '';

views/ringo/index.html

@@ -13,7 +13,7 @@
         <link href="https://cdn.jsdelivr.net/gh/sun-typeface/SUIT/fonts/static/woff2/SUIT.css" rel="stylesheet">
         <script defer src="https://code.iconify.design/1/1.0.3/iconify.min.js"></script>
         <script defer src="/views/ringo/js/main.js.cache_v2"></script>
-        <script defer src="/views/ringo/js/sidebar.js.cache_v3"></script>
+        <script defer src="/views/ringo/js/sidebar.js.cache_v4"></script>
         <script defer src="/views/ringo/js/skin_set.js.cache_v7"></script>
         <link rel="stylesheet" href="/views/ringo/css/main.css.cache_v11">
         {% if request.cookies.get('main_css_darkmode', '') == '1' %}

views/ringo/info.json

@@ -1,5 +1,5 @@
 {
     "name" : "Ringo",
-    "skin_ver" : "v1.1.6",
+    "skin_ver" : "v1.1.7",
     "require_ver" : "3500113"
 }

views/ringo/js/sidebar.js

@@ -23,9 +23,6 @@ function ringo_do_side_button_1() {
                 if(text[for_a][6] === '') {
                     data += '<a href="/w/' + ringo_do_url_encode(text[for_a][1]) + '">' + ringo_do_xss_encode(text[for_a][1]) + '</a><br>';
                     data += text[for_a][2] + ' | ' + ringo_do_xss_encode(text[for_a][3]) + '<br>';
-                } else {
-                    data += '---<br>';
-                    data += '--- | ---<br>';
                 }
             }