잉여개발기 (SPDV) 2 лет назад
Родитель
Сommit
4f817b99c1
3 измененных файлов с 41 добавлено и 8 удалено
  1. 37 5
      route/tool/func.py
  2. 3 2
      route/user_setting.py
  3. 1 1
      version.json

+ 37 - 5
route/tool/func.py

@@ -764,16 +764,48 @@ def get_user_title_list(ip = ''):
         # default
         # default
         user_title = {
         user_title = {
             '' : load_lang('default'),
             '' : load_lang('default'),
-            '🌳' : '🌳 namu',
+            '🌳' : '🌳 newbie',
         }
         }
-        
-        # admin
-        if admin_check('all', None, ip) == 1:
-            user_title['✅'] = '✅ admin'
 
 
         curs.execute(db_change('select name from user_set where id = ? and name = ?'), [ip, 'get_🥚'])
         curs.execute(db_change('select name from user_set where id = ? and name = ?'), [ip, 'get_🥚'])
         if curs.fetchall():
         if curs.fetchall():
             user_title['🥚'] = '🥚 easter_egg'
             user_title['🥚'] = '🥚 easter_egg'
+
+        curs.execute(db_change('select data from user_set where name = ? and id = ?'), ['challenge_first_contribute', ip])
+        if curs.fetchall():
+            user_title['🔰'] = '🔰 first_contribute'
+
+        curs.execute(db_change('select data from user_set where name = ? and id = ?'), ['challenge_tenth_contribute', ip])
+        if curs.fetchall():
+            user_title['📝'] = '📝 tenth_contribute'
+
+        curs.execute(db_change('select data from user_set where name = ? and id = ?'), ['challenge_hundredth_contribute', ip])
+        if curs.fetchall():
+            user_title['🖊️'] = '🖊️ hundredth_contribute'
+
+        curs.execute(db_change('select data from user_set where name = ? and id = ?'), ['challenge_thousandth_contribute', ip])
+        if curs.fetchall():
+            user_title['🏅'] = '🏅 thousandth_contribute'
+
+        curs.execute(db_change('select data from user_set where name = ? and id = ?'), ['challenge_first_discussion', ip])
+        if curs.fetchall():
+            user_title['💬'] = '💬 first_discussion'
+
+        curs.execute(db_change('select data from user_set where name = ? and id = ?'), ['challenge_tenth_discussion', ip])
+        if curs.fetchall():
+            user_title['💡'] = '💡 tenth_discussion'
+
+        curs.execute(db_change('select data from user_set where name = ? and id = ?'), ['challenge_hundredth_discussion', ip])
+        if curs.fetchall():
+            user_title['📢'] = '📢 hundredth_discussion'
+
+        curs.execute(db_change('select data from user_set where name = ? and id = ?'), ['challenge_thousandth_discussion', ip])
+        if curs.fetchall():
+            user_title['📜'] = '📜 thousandth_discussion'
+
+        curs.execute(db_change('select data from user_set where name = ? and id = ?'), ['challenge_admin', ip])
+        if curs.fetchall():
+            user_title['✅'] = '✅ admin'
         
         
         return user_title
         return user_title
     
     

+ 3 - 2
route/user_setting.py

@@ -16,6 +16,8 @@ def user_setting():
                     ['user_title', flask.request.form.get('user_title', '')],
                     ['user_title', flask.request.form.get('user_title', '')],
                     ['sub_user_name' , flask.request.form.get('sub_user_name', '')]
                     ['sub_user_name' , flask.request.form.get('sub_user_name', '')]
                 ]
                 ]
+                if not auto_list[2][1] in get_user_title_list(ip):
+                    auto_list[2][1] = ''
 
 
                 twofa_on = flask.request.form.get('2fa', '')
                 twofa_on = flask.request.form.get('2fa', '')
                 if twofa_on != '':
                 if twofa_on != '':
@@ -67,11 +69,10 @@ def user_setting():
                     else:
                     else:
                         div3 += '<option value="' + lang_data + '">' + see_data + '</option>'
                         div3 += '<option value="' + lang_data + '">' + see_data + '</option>'
 
 
-                # 여기 잘못 짬
                 curs.execute(db_change('select data from user_set where name = "user_title" and id = ?'), [ip])
                 curs.execute(db_change('select data from user_set where name = "user_title" and id = ?'), [ip])
                 data = curs.fetchall()
                 data = curs.fetchall()
                 data = [['']] if not data else data
                 data = [['']] if not data else data
-                user_title_list = get_user_title_list()
+                user_title_list = get_user_title_list(ip)
                 div4 = ''
                 div4 = ''
                 for user_title in user_title_list:                
                 for user_title in user_title_list:                
                     if data and data[0][0] == user_title:
                     if data and data[0][0] == user_title:

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
 {
     "beta" : {
     "beta" : {
-        "r_ver" : "v3.4.6-RC5-dev86",
+        "r_ver" : "v3.4.6-RC5-dev87",
         "c_ver" : "3500374",
         "c_ver" : "3500374",
         "s_ver" : "3500112"
         "s_ver" : "3500112"
     }
     }