누가 관심 문서로 추가했는지 확인하는 기능

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

app.py

@@ -516,6 +516,9 @@ app.route('/xref_page/<int:num>/<everything:name>')(view_xref)
 app.route('/xref_this/<everything:name>', defaults = { 'xref_type' : 2 })(view_xref)
 app.route('/xref_this_page/<int:num>/<everything:name>', defaults = { 'xref_type' : 2 })(view_xref)
 
+app.route('/doc_watch_list/<int:num>/<everything:name>', defaults = { 'db_set' : db_set_str, 'do_type' : 'watch_list' })(w_watch_list)
+app.route('/doc_star_doc/<int:num>/<everything:name>', defaults = { 'db_set' : db_set_str, 'do_type' : 'star_doc' })(w_watch_list)
+
 app.route('/raw/<everything:name>')(view_w_raw)
 app.route('/raw_acl/<everything:name>', defaults = { 'doc_acl' : 'on' })(view_w_raw)
 app.route('/raw_rev/<int:rev>/<everything:name>')(view_w_raw)
@@ -526,7 +529,6 @@ app.route('/down/<everything:name>')(view_down)
 
 app.route('/acl/<everything:name>', methods = ['POST', 'GET'])(view_set)
 
-# everything 다음에 추가 붙은 경우에 대해서 재검토 필요 (진행중)
 app.route('/w_from/<everything:name>', defaults = { 'do_type' : 'from' })(view_w)
 app.route('/w/<everything:name>')(view_w)
 
@@ -681,8 +683,8 @@ app.route('/api/raw_exist/<everything:name>', defaults = { 'exist_check' : 'on',
 app.route('/api/raw_rev/<int(signed = True):rev>/<everything:name>', defaults = { 'db_set' : db_set_str })(api_w_raw)
 app.route('/api/raw/<everything:name>', defaults = { 'db_set' : db_set_str })(api_w_raw)
 
-app.route('/api/star_doc/<int:num>/<everything:name>', defaults = { 'db_set' : db_set_str, 'do_type' : 'star_doc' })(api_w_watch_list)
-app.route('/api/watch_list/<int:num>/<everything:name>', defaults = { 'db_set' : db_set_str })(api_w_watch_list)
+app.route('/api/doc_star_doc/<int:num>/<everything:name>', defaults = { 'db_set' : db_set_str, 'do_type' : 'star_doc' })(api_w_watch_list)
+app.route('/api/doc_watch_list/<int:num>/<everything:name>', defaults = { 'db_set' : db_set_str })(api_w_watch_list)
 
 app.route('/api/xref/<int:num>/<everything:name>', defaults = { 'db_set' : db_set_str })(api_w_xref)
 app.route('/api/xref_this/<int:num>/<everything:name>', defaults = { 'xref_type' : '2', 'db_set' : db_set_str })(api_w_xref)

route/__init__.py

@@ -168,6 +168,8 @@ from route.vote_end import vote_end
 from route.vote_list import vote_list
 from route.vote_select import vote_select
 
+from route.n_w_watch_list import w_watch_list
+
 from route.go_api_func_sha224 import api_func_sha224
 from route.go_api_func_ip import api_func_ip
 

route/bbs_w_post.py

@@ -297,7 +297,7 @@ def bbs_w_post(bbs_num = '', post_num = ''):
                     <form method="post">
                         ''' + bbs_comment_form + '''
                     </form>
-                    <script src="/views/main_css/js/route/bbs_w_post.js"></script>
+                    <script src="/views/main_css/js/route/bbs_w_post.js''' + cache_v() + '''"></script>
                 '''
 
                 return easy_minify(flask.render_template(skin_check(),

route/n_w_watch_list.py

@@ -0,0 +1,22 @@
+from .tool.func import *
+
+from .go_api_w_watch_list import api_w_watch_list
+
+def w_watch_list(db_set, name, num = 1, do_type = 'watch_list'):
+    with get_db_connect() as conn:
+        data = '<a href="/doc_watch_list/1/' + url_pas(name) + '">(' + load_lang('watchlist') + ')</a> <a href="/doc_star_doc/1/' + url_pas(name) + '">(' + load_lang('star_doc') + ')</a>'
+        data += '<ul class="opennamu_ul">'
+        
+        list_data = json.loads(api_w_watch_list(db_set, name, do_type, num).data)
+        data += ''.join(['<li><span class="opennamu_render_ip">' + for_a + '</span></li>' for for_a in list_data])
+
+        data += '</ul>'
+        data += '<script>opennamu_do_ip_render();</script>'
+
+        data += get_next_page_bottom('/doc_' + do_type + '/{}/' + url_pas(name), num, list_data)
+
+        return easy_minify(flask.render_template(skin_check(),
+            imp = [name, wiki_set(), wiki_custom(), wiki_css(['(' + load_lang(do_type if do_type == 'star_doc' else 'watchlist') + ')', 0])],
+            data = data,
+            menu = [['w/' + url_pas(name), load_lang('return')]]
+        ))

route/tool/func.py

@@ -963,7 +963,7 @@ def easy_minify(data, tool = None):
             return data
             
         return '''
-            <script src="/views/main_css/js/route/wiki_access_password.js"></script>
+            <script src="/views/main_css/js/route/wiki_access_password.js''' + cache_v() + '''"></script>
             <h2>''' + load_lang('error_password_require_for_wiki_access') + '''</h2>
             <input type="password" id="wiki_access">
             <input type="submit" onclick="opennamu_do_wiki_access();">
@@ -1049,6 +1049,9 @@ def skin_check(set_n = 0):
         else:
             return skin
     
+def cache_v():
+    return '.cache_v216'
+
 def wiki_css(data):
     global global_wiki_set
 
@@ -1058,8 +1061,7 @@ def wiki_css(data):
     data_css = ''
     data_css_dark = ''
 
-    data_css_ver = '216'
-    data_css_ver = '.cache_v' + data_css_ver
+    data_css_ver = cache_v()
 
     if 'main_css' in global_wiki_set:
         data_css = global_wiki_set['main_css']

route/view_w.py

@@ -322,6 +322,8 @@ def view_w(name = 'Test', do_type = ''):
         else:
             watch_list = 0
 
+        menu += [['doc_watch_list/1/' + url_pas(name), load_lang('watchlist')]]
+
         return easy_minify(flask.render_template(skin_check(),
             imp = [name_view, wiki_set(), wiki_custom(), wiki_css([sub, r_date, watch_list])],
             data = div,

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.5.0-dev46",
+        "r_ver" : "v3.5.0-dev47",
         "c_ver" : "3500376",
         "s_ver" : "3500113"
     }