fix bug and add some

route/main_func_easter_egg.py

@@ -2,8 +2,30 @@ from .tool.func import *
 
 def main_func_easter_egg():
     with get_db_connect() as conn:
+        curs = conn.cursor()
+        
+        random_n = random.randrange(0, 8)
+        select_list = [
+            'https://www.youtube.com/embed/PWD0ZbR7AOY', # TH06   - Shanghai Teahouse ~ Chinese Tea
+            'https://www.youtube.com/embed/HoU29ljOmTE', # TH10.5 - Flawless Clothing of Celestials
+            'https://www.youtube.com/embed/PR2vUm-Ald8', # TH06   - U.N. Owen Was Her
+            'https://www.youtube.com/embed/opZoEmsu_Lo', # TH09   - Flowering Night
+            'https://www.youtube.com/embed/txZFFTusSvw', # TH08   - Reach for the Moon ~ Immortal Smoke
+            'https://www.youtube.com/embed/Ixq9xL2tvRU', # TH07   - Phantom Ensemble
+            'https://www.youtube.com/embed/-3IAx_r4Au0', # TH17   - Entrusting This World to Idols ~ Idolatrize World
+            'https://www.youtube.com/embed/wObZkycA6sc', # TH11   - Last Remote
+            # Remix by NyxTheShield
+        ]
+
+        ip = ip_check()
+        if ip_or_user(ip) == 0:
+            curs.execute(db_change('select name from user_set where id = ? and name = ?'), [ip, 'get_🥚'])
+            if not curs.fetchall():
+                curs.execute(db_change('insert into user_set (name, id, data) values ("get_🥚", ?, "Y")'), [ip])
+                conn.commit()
+
         return easy_minify(flask.render_template(skin_check(),
             imp = ['Easter Egg', wiki_set(), wiki_custom(), wiki_css([0, 0])],
-            data = '<iframe width="640" height="360" src="https://www.youtube.com/embed/iQPbgD_CTd4" frameborder="0" allowfullscreen></iframe>',
+            data = '<iframe width="640" height="360" src="' + select_list[random_n] + '" frameborder="0" allowfullscreen></iframe>',
             menu = [['manager', load_lang('return')]]
         ))

route/tool/func.py

@@ -719,7 +719,11 @@ def get_default_robots_txt():
 
     return data
 
-def get_user_title_list():
+def get_user_title_list(ip = ''):
+    curs = conn.cursor()
+
+    ip = ip_check() if ip == '' else ip
+
     # default
     user_title = {
         '' : load_lang('default'),
@@ -727,8 +731,12 @@ def get_user_title_list():
     }
     
     # admin
-    if admin_check('all') == 1:
+    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_🥚'])
+    if curs.fetchall():
+        user_title['🥚'] = '🥚 easter_egg'
     
     return user_title
 

route/tool/func_render_namumark.py

@@ -1094,6 +1094,7 @@ class class_do_render_namumark:
                 db_data = self.curs.fetchall()
                 if db_data:
                     self.data_backlink += [[self.doc_name, include_name, 'include']]
+                    include_data = db_data[0][0].replace('\r', '')
 
                     # include link func
                     if ip_or_user(self.ip) == 0:
@@ -1107,8 +1108,6 @@ class class_do_render_namumark:
                     if include_set_data == 'use':
                         include_link = '<div><a href="/w/' + url_pas(include_name) + '">(' + include_name_org + ')</a></div>'
 
-                    include_data = db_data[0][0].replace('\r', '')
-
                     # parameter replace
                     include_data = re.sub(r'(\\+)?@([ㄱ-힣a-zA-Z]+)=((?:\\@|[^@\n])+)@', do_render_include_default_sub, include_data)
                     include_data = re.sub(r'(\\+)?@([ㄱ-힣a-zA-Z]+)@', do_render_include_default_sub, include_data)

route/user_setting_skin_set_main.py

@@ -63,8 +63,7 @@ def user_setting_skin_set_main():
                     html_data.set_cookie(for_b, flask.request.form.get(for_b, set_list[for_b][0][0]))
                 elif ip_or_user(ip) == 0:
                     curs.execute(db_change('select data from user_set where name = ? and id = ?'), [for_b, ip])
-                    db_data = curs.fetchall()
-                    if db_data:
+                    if curs.fetchall():
                         curs.execute(db_change("update user_set set data = ? where name = ? and id = ?"), [
                             flask.request.form.get(for_b, set_list[for_b][0][0]),
                             for_b,

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.6-RC1 (stable1) (beta9-110)",
+        "r_ver" : "v3.4.6-RC1 (stable1) (beta9-111)",
         "c_ver" : "3500354",
         "s_ver" : "3500111"
     }