2
0
Эх сурвалжийг харах

Merge pull request #2190 from openNAMU/dont_use

버그 수정
잉여개발기 2 жил өмнө
parent
commit
4dbc4c5c68

+ 1 - 1
app.py

@@ -592,7 +592,7 @@ app.route('/user/<name>')(user_info)
 
 app.route('/challenge', methods = ['GET', 'POST'])(user_challenge)
 
-app.route('/edit_filter/<name>', methods = ['GET', 'POST'])(user_edit_filter)
+app.route('/edit_filter_check/<name>', methods = ['GET', 'POST'])(user_edit_filter)
 
 app.route('/count')(user_count)
 app.route('/count/<name>')(user_count)

+ 1 - 1
lang/en-US.json

@@ -676,5 +676,5 @@
             "challenge_info_thousandth_discussion" : "Post the 1000th discussion thread<br><br>Reward : 📜 title and 10000 exp",
 
             "challenge_title_admin" : "If you want to test a man's character, give him power.",
-            "challenge_info_admin" : "Be the administrator.<br><br>Reward :  title and 10000 exp"
+            "challenge_info_admin" : "Be the administrator.<br><br>Reward : ☑️ title and 10000 exp"
 }

+ 1 - 1
lang/ko-KR.json

@@ -432,7 +432,7 @@
     "challenge_title_thousandth_discussion": "나는 생각한다. 고로 존재한다.",
     "challenge_info_thousandth_discussion": "1000번째 토론 스레드를 올리세요.<br><br>보상 : 📜 칭호와 10000 경험치",
     "challenge_title_admin" : "왕후장상의 씨가 어찌 따로 있단 말이냐!",
-    "challenge_info_admin" : "관리자가 되세요.<br><br>보상 :  칭호와 10000 경험치",
+    "challenge_info_admin" : "관리자가 되세요.<br><br>보상 : ☑️ 칭호와 10000 경험치",
     "challenge": "도전과제",
     "user_title": "칭호",
     "alpha": "알파",

+ 5 - 2
route/tool/func.py

@@ -635,6 +635,9 @@ def update(conn, ver_num, set_data):
 
             curs.execute(db_change("update data_set set doc_rev = ? where doc_name = ? and (doc_rev = '' or doc_rev = 'not_exist')"), [data_set_exist, for_a[0]])
 
+    if ver_num < 20240513:
+        curs.execute(db_change("update user_set set data = '☑️' where name = 'user_title' and data = '✅'"))
+
     print('Update completed')
 
 def set_init_always(conn, ver_num):
@@ -840,7 +843,7 @@ def get_user_title_list(conn, ip = ''):
 
     curs.execute(db_change('select data from user_set where name = ? and id = ?'), ['challenge_admin', ip])
     if curs.fetchall():
-        user_title['✅'] = '✅ admin'
+        user_title['☑️'] = '☑️ admin'
     
     return user_title
     
@@ -1069,7 +1072,7 @@ def skin_check(conn, set_n = 0):
         return skin
     
 def cache_v():
-    return '.cache_v248'
+    return '.cache_v249'
 
 def wiki_css(data):
     global global_wiki_set

+ 1 - 1
route/user_challenge.py

@@ -239,7 +239,7 @@ def user_challenge():
             db_data = curs.fetchall()
             disable = 1 if db_data else 0
             data_html = do_make_challenge_design(
-                '',
+                '☑️',
                 get_lang(conn, 'challenge_title_admin'), 
                 get_lang(conn, 'challenge_info_admin', 1),
                 disable

+ 1 - 1
route/user_edit_filter.py

@@ -10,7 +10,7 @@ def user_edit_filter(name = ''):
         if flask.request.method == 'POST':
             curs.execute(db_change('delete from user_set where name = "edit_filter" and id = ?'), [name])
 
-            return redirect(conn, '/edit_filter/' + url_pas(name))
+            return redirect(conn, '/edit_filter_check/' + url_pas(name))
         else:
             curs.execute(db_change('select data from user_set where name = "edit_filter" and id = ?'), [name])
             db_data = curs.fetchall()

+ 2 - 2
version.json

@@ -1,7 +1,7 @@
 {
     "beta" : {
-        "r_ver" : "v3.5.0-dev109",
-        "c_ver" : "20240426",
+        "r_ver" : "v3.5.0-v111",
+        "c_ver" : "20240513",
         "s_ver" : "20240426"
     }
 }

+ 1 - 1
views/main_css/js/func/insert_user_info.js

@@ -59,7 +59,7 @@ function do_insert_user_info() {
                 get_data_ban += '<br>';
                 
                 if(data['data']['ban']['reason'] === 'edit filter') {
-                    get_data_ban += lang_data['why'] + ' : <a href="/edit_filter/' + opennamu_do_url_encode(name) + '">' + data['data']['ban']['reason'] + '</a>';
+                    get_data_ban += lang_data['why'] + ' : <a href="/edit_filter_check/' + opennamu_do_url_encode(name) + '">' + data['data']['ban']['reason'] + '</a>';
                 } else {
                     get_data_ban += lang_data['why'] + ' : ' + data['data']['ban']['reason'];
                 }

+ 1 - 1
views/main_css/js/route/list_recent_block.js

@@ -111,7 +111,7 @@ function opennamu_list_recent_block() {
             let bottom = '';
             if(data[for_a][0] !== "") {
                 if(data[for_a][0] === "edit filter") {
-                    bottom = '<a href="/edit_filter/' + opennamu_do_url_encode(data[for_a][1]) + '">edit filter</a>'
+                    bottom = '<a href="/edit_filter_check/' + opennamu_do_url_encode(data[for_a][1]) + '">edit filter</a>'
                 } else {
                     bottom = opennamu_send_render(opennamu_xss_filter(data[for_a][0]));
                 }