Merge pull request #2545 from openNAMU/dev

버그 수정 및 속도 강화

.gitignore

@@ -19,7 +19,6 @@ goorm.manifest
 *.db-shm
 *.db-wal
 *.db-journal
-file
 
 robots.txt
 custom.py

app.py

@@ -17,7 +17,7 @@ run_mode = ''
 if len(args) > 1:
     run_mode = args[1]
 
-    if not run_mode in ('dev'):
+    if not run_mode in ['dev']:
         run_mode = ''
 
 # Init-Version
@@ -973,7 +973,10 @@ atexit.register(terminate_golang)
 app.wsgi_app = ProxyFix(app.wsgi_app, x_for = 1, x_proto = 1)
 
 if __name__ == "__main__":
-    config = Config()
-    config.bind = [server_set['host'] + ":" + server_set['port']]
+    if run_mode in ['dev']:
+        app.run(host = server_set['host'], port = int(server_set['port']), use_reloader = False)
+    else:
+        config = Config()
+        config.bind = [server_set['host'] + ":" + server_set['port']]
 
-    asyncio.run(serve(app, config))
+        asyncio.run(serve(app, config))

route/api_user_info.py

@@ -26,7 +26,7 @@ async def api_user_info(user_name = ''):
         else:
             data_result['auth_date'] = '0'
 
-        level_data = level_check(conn, user_name)
+        level_data = await level_check(user_name)
         data_result['level'] = level_data[0]
         data_result['exp'] = level_data[1]
         data_result['max_exp'] = level_data[2]

route/bbs_delete.py

@@ -27,7 +27,7 @@ async def bbs_delete(bbs_num = ''):
             return redirect(conn, '/bbs/main')
         else:
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'bbs_delete'), wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + bbs_name + ')', 0])],
+                imp = [get_lang(conn, 'bbs_delete'), await wiki_set(), await wiki_custom(conn), wiki_css(['(' + bbs_name + ')', 0])],
                 data = render_simple_set(conn, '''
                     <form method="post">
                         <span>''' + get_lang(conn, 'delete_warning') + '''</span>

route/bbs_make.py

@@ -22,7 +22,7 @@ async def bbs_make():
             return redirect(conn, '/bbs/main')
         else:
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'bbs_make'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'bbs_make'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">
                         <input placeholder="''' + get_lang(conn, 'bbs_name') + '''" name="bbs_name">

route/bbs_w.py

@@ -189,7 +189,7 @@ async def bbs_w(bbs_num = '', tool = 'bbs', page = 1, name = ''):
         data += '</table>'
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [title_name, wiki_set(conn), await wiki_custom(conn), wiki_css([sub, 0])],
+            imp = [title_name, await wiki_set(), await wiki_custom(conn), wiki_css([sub, 0])],
             data = data,
             menu = menu
         ))

route/bbs_w_comment_tool.py

@@ -24,7 +24,7 @@ async def bbs_w_comment_tool(bbs_num = '', post_num = '', comment_num = ''):
             '''
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, 'bbs_comment_tool'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+            imp = [get_lang(conn, 'bbs_comment_tool'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = data,
             menu = [['bbs/w/' + url_pas(bbs_num_str) + '/' + url_pas(post_num_str) + '#' + url_pas(comment_num), get_lang(conn, 'return')]]
         ))

route/bbs_w_delete.py

@@ -54,7 +54,7 @@ async def bbs_w_delete(bbs_num = '', post_num = '', comment_num = ''):
                 sub += ' (' + comment_num + ')'
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [name, wiki_set(conn), await wiki_custom(conn), wiki_css([sub, 0])],
+                imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css([sub, 0])],
                 data = render_simple_set(conn, '''
                     <form method="post">
                         <span>''' + get_lang(conn, 'delete_warning') + '''</span>

route/bbs_w_edit.py

@@ -125,7 +125,7 @@ async def bbs_w_edit(bbs_num = '', post_num = '', comment_num = ''):
                 bbs_title = get_lang(conn, 'post_edit')
     
             return easy_minify(conn, flask.render_template(skin_check(conn), 
-                imp = [bbs_title, wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [bbs_title, await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data =  editor_top_text + '''
                     <form method="post">                        
                         <input style="''' + option_display + '''" placeholder="''' + get_lang(conn, 'title') + '''" name="title" value="''' + html.escape(title) + '''">

route/bbs_w_hide.py

@@ -21,7 +21,7 @@ async def bbs_w_hide(bbs_num = '', post_num = ''):
             pass
         else:
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'bbs_post_hide'), wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + bbs_name + ')' + ' (' + post_num_str + ')', 0])],
+                imp = [get_lang(conn, 'bbs_post_hide'), await wiki_set(), await wiki_custom(conn), wiki_css(['(' + bbs_name + ')' + ' (' + post_num_str + ')', 0])],
                 data = render_simple_set(conn, '''
                     <form method="post">
                         <button type="submit">''' + get_lang(conn, 'hide') + '''</button>

route/bbs_w_pinned.py

@@ -36,7 +36,7 @@ async def bbs_w_pinned(bbs_num = '', post_num = ''):
             pinned = get_lang(conn, 'pinned') if not curs.fetchall() else get_lang(conn, 'pinned_release')
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'bbs_post_pinned'), wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + bbs_name + ')' + ' (' + post_num_str + ')', 0])],
+                imp = [get_lang(conn, 'bbs_post_pinned'), await wiki_set(), await wiki_custom(conn), wiki_css(['(' + bbs_name + ')' + ' (' + post_num_str + ')', 0])],
                 data = render_simple_set(conn, '''
                     <form method="post">
                         <button type="submit">''' + pinned + '''</button>

route/bbs_w_post.py

@@ -210,7 +210,7 @@ async def bbs_w_post(bbs_num = '', post_num = ''):
                 '''
 
                 return easy_minify(conn, flask.render_template(skin_check(conn),
-                    imp = [bbs_name, wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'bbs') + ')', 0])],
+                    imp = [bbs_name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'bbs') + ')', 0])],
                     data = data,
                     menu = [['bbs/in/' + bbs_num_str, get_lang(conn, 'return')], ['bbs/edit/' + bbs_num_str + '/' + post_num_str, get_lang(conn, 'edit')], ['bbs/tool/' + bbs_num_str + '/' + post_num_str, get_lang(conn, 'tool')]]
                 ))

route/bbs_w_tool.py

@@ -36,7 +36,7 @@ async def bbs_w_tool(bbs_num = '', post_num = ''):
             '''
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, 'bbs_post_tool'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+            imp = [get_lang(conn, 'bbs_post_tool'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = data,
             menu = [['bbs/w/' + url_pas(bbs_num_str) + '/' + url_pas(post_num_str), get_lang(conn, 'return')]]
         ))

route/edit.py

@@ -361,7 +361,7 @@ async def edit(name = 'Test', section = 0, do_type = ''):
             sub_title = '(' + get_lang(conn, 'edit_request') + ')' if edit_req_mode == 1 else '(' + get_lang(conn, 'edit') + ')'
 
             return easy_minify(conn, flask.render_template(skin_check(conn), 
-                imp = [name, wiki_set(conn), await wiki_custom(conn), wiki_css([sub_title + sub_menu, 0])],
+                imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css([sub_title + sub_menu, 0])],
                 data = editor_top_text + '''
                     <form method="post">
                         <textarea style="display: none;" name="doc_section_data_where">''' + data_section_where + '''</textarea>

route/edit_delete.py

@@ -54,7 +54,7 @@ async def edit_delete(name):
             return redirect(conn, '/w/' + url_pas(name))
         else:            
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [name, wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'delete') + ')', 0])],
+                imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'delete') + ')', 0])],
                 data = '''
                     <form method="post">
                         <input placeholder="''' + get_lang(conn, 'why') + '''" name="send">

route/edit_delete_file.py

@@ -31,7 +31,7 @@ async def edit_delete_file(name = 'test.jpg'):
             return redirect(conn, '/w/' + url_pas(name))
         else:
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [name, wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'file_delete') + ')', 0])],
+                imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'file_delete') + ')', 0])],
                 data = '''
                     <form method="post">
                         <img src="/image/''' + url_pas(file_all_name) + '''">

route/edit_delete_multiple.py

@@ -24,7 +24,7 @@ async def edit_delete_multiple():
             return redirect(conn, '/recent_change')
         else:
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'many_delete'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'many_delete'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">
                         <textarea class="opennamu_textarea_500" placeholder="''' + get_lang(conn, 'many_delete_help') + '''" name="content"></textarea>

route/edit_move.py

@@ -214,7 +214,7 @@ async def edit_move(name):
             owner_auth = 1 if owner_auth == 0 else 0
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [name, wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'move') + ')', 0])],
+                imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'move') + ')', 0])],
                 data = '''
                     <form method="post">
                         <span>''' + get_lang(conn, 'document_name') + '''</span>

route/edit_request.py

@@ -91,7 +91,7 @@ async def edit_request(name = 'Test', do_type = ''):
             result = view_diff_do(old_data, edit_request_data, 'r' + doc_ver, get_lang(conn, 'edit_request'))
 
             return easy_minify(conn, flask.render_template(skin_check(conn), 
-                imp = [name, wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'edit_request_check') + ')', 0])],
+                imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'edit_request_check') + ')', 0])],
                 data = '''
                     <div id="opennamu_get_user_info">''' + html.escape(edit_request_user) + '''</div>
                     <hr class="main_hr">

route/edit_revert.py

@@ -75,7 +75,7 @@ async def edit_revert(name, num):
                 preview = ''
             
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [name, wiki_set(conn), await wiki_custom(conn), wiki_css(['(r' + str(num) + ') (' + get_lang(conn, 'revert') + ')', 0])],
+                imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(r' + str(num) + ') (' + get_lang(conn, 'revert') + ')', 0])],
                 data = '''
                     <form method="post">
                         <input placeholder="''' + get_lang(conn, 'why') + '''" name="send" type="text">

route/edit_upload.py

@@ -136,7 +136,7 @@ async def edit_upload():
             upload_default = html.escape(db_data[0][0]) if db_data and db_data[0][0] != '' else ''
             
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'upload'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'upload'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <a href="/filter/file_filter">(''' + get_lang(conn, 'file_filter_list') + ''')</a> <a href="/filter/extension_filter">(''' + get_lang(conn, 'extension_filter_list') + ''')</a>
                     ''' + upload_help + '''

route/filter_all.py

@@ -88,7 +88,7 @@ async def filter_all(tool):
             div += '<a href="/filter/' + tool + '/add">(' + get_lang(conn, 'add') + ')</a>'
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [title, wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+            imp = [title, await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = div,
             menu = [['manager/1', get_lang(conn, 'return')]]
         ))

route/filter_all_add.py

@@ -269,7 +269,7 @@ async def filter_all_add(tool, name = None):
                 '''
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [title, wiki_set(conn), await wiki_custom(conn), wiki_css([get_sub, 0])],
+                imp = [title, await wiki_set(), await wiki_custom(conn), wiki_css([get_sub, 0])],
                 data =  '''
                         <form method="post">
                             ''' + form_data + '''

route/give_admin_groups.py

@@ -101,7 +101,7 @@ async def give_admin_groups(name = 'test'):
                     choice = for_a[2]
 
                 data += '' + \
-                    '<li class="opennamu_list_1" style="margin-left: ' + str(int(for_a[0]) * 20) + 'px;">' + \
+                    '<li class="opennamu_list_1" style="margin-left: ' + str((int(for_a[0]) - 1) * 20) + 'px;">' + \
                         choice + \
                     '</li>'
                 ''
@@ -109,7 +109,7 @@ async def give_admin_groups(name = 'test'):
             data += '</ul>'
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [name, wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'admin_group') + ')', 0])],
+                imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'admin_group') + ')', 0])],
                 data = '''
                     <form method="post">
                         ''' + data + '''

route/give_delete_admin_group.py

@@ -22,7 +22,7 @@ async def give_delete_admin_group(name = 'test'):
                 return await re_error(conn, 47)
         else:
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, "delete_admin_group"), wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + name + ')', 0])],
+                imp = [get_lang(conn, "delete_admin_group"), await wiki_set(), await wiki_custom(conn), wiki_css(['(' + name + ')', 0])],
                 data = '' + \
                     '<form method="post">' + \
                         '<button type="submit">' + get_lang(conn, 'delete') + '</button>' + \

route/give_user_ban.py

@@ -132,7 +132,7 @@ async def give_user_ban(name = None, ban_type = ''):
                 owner_option = '<option value="private" ' + ('selected' if ban_type == 'private' else '') + '>' + get_lang(conn, 'private') + '</option>'
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [main_name, wiki_set(conn), await wiki_custom(conn), wiki_css([now, 0])],
+                imp = [main_name, await wiki_set(), await wiki_custom(conn), wiki_css([now, 0])],
                 data = info_data + '''
                     <form method="post" ''' + action + '''>
                         <h2>''' + get_lang(conn, 'method') + '''</h2>

route/give_user_fix.py

@@ -48,7 +48,7 @@ async def give_user_fix(user_name = ''):
             return redirect(conn, '/user/' + url_pas(user_name))
         else:
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'user_fix'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'user_fix'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">
                         <div id="opennamu_get_user_info">''' + html.escape(user_name) + '''</div>

route/go_main_func_easter_egg.py

@@ -28,7 +28,7 @@ async def main_func_easter_egg():
             data = ''
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = ['Easter Egg', wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+            imp = ['Easter Egg', await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = data,
             menu = 0
         ))

route/list_acl.py

@@ -30,10 +30,10 @@ async def list_acl(arg_num = 1):
             ''
 
         div += '</ul>'
-        div += next_fix(conn, '/list/document/acl/', arg_num, list_data)
+        div += get_next_page_bottom(conn, '/list/document/acl/{}', arg_num, list_data)
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, 'acl_document_list'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+            imp = [get_lang(conn, 'acl_document_list'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = div,
             menu = [['other', get_lang(conn, 'return')]]
         ))

route/list_admin.py

@@ -20,7 +20,7 @@ async def list_admin():
         div += '</ul>'
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, 'admin_list'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+            imp = [get_lang(conn, 'admin_list'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = div,
             menu = [['other', get_lang(conn, 'return')]]
         ))

route/list_admin_auth_use.py

@@ -30,7 +30,7 @@ async def list_admin_auth_use(arg_num = 1, arg_search = 'normal'):
                     
                     if ip_view != '':
                         do_data = do_data.split(' ')
-                        do_data = do_data[0] if do_data[0] in ('ban') else data[1]
+                        do_data = do_data[0] if do_data[0] in ['ban'] else data[1]
 
                 list_data += '<li>' + await ip_pas(data[0]) + ' | ' + html.escape(do_data) + ' | ' + data[2] + '</li>'
 
@@ -40,7 +40,7 @@ async def list_admin_auth_use(arg_num = 1, arg_search = 'normal'):
             arg_search = html.escape(arg_search) if arg_search != 'normal' else ''
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'authority_use_list'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'authority_use_list'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">
                         <input class="opennamu_width_200" name="search" placeholder="''' + get_lang(conn, 'start_with_search') + '''" value="''' + arg_search + '''">

route/list_admin_group.py

@@ -28,7 +28,7 @@ async def list_admin_group():
         ''
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, 'admin_group_list'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+            imp = [get_lang(conn, 'admin_group_list'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = list_data,
             menu = [['manager', get_lang(conn, 'return')]]
         ))

route/list_history.py

@@ -26,7 +26,7 @@ async def list_history(tool = 'history', num = 1, set_type = 'normal', doc_name
 
                 title = doc_name
                 sub = '(' + get_lang(conn, 'history') + ') (' + get_lang(conn, set_type) + ')'
-                menu = [['other', get_lang(conn, 'return')], ['history_add/' + url_pas(doc_name), get_lang(conn, 'history_add')], ['history_reset/' + url_pas(doc_name), get_lang(conn, 'history_reset')]]
+                menu = [['w/' + url_pas(doc_name), get_lang(conn, 'return')], ['history_add/' + url_pas(doc_name), get_lang(conn, 'history_add')], ['history_reset/' + url_pas(doc_name), get_lang(conn, 'history_reset')]]
             else:
                 data = await api_list_recent_change(num, set_type, 50, '')
 
@@ -160,7 +160,7 @@ async def list_history(tool = 'history', num = 1, set_type = 'normal', doc_name
                 data_html += get_next_page_bottom(conn, f'/recent_change/{{}}/{set_type}', num, data)
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [title, wiki_set(conn), await wiki_custom(conn), wiki_css([sub, 0])],
+                imp = [title, await wiki_set(), await wiki_custom(conn), wiki_css([sub, 0])],
                 data = data_html,
                 menu = menu
             ))

route/list_image_file.py

@@ -54,12 +54,12 @@ async def list_image_file(arg_num = 1, do_type = 0):
             list_data += '</ul>'
 
         if do_type == 0:
-            list_data += next_fix(conn, '/list/file/', arg_num, data_list)
+            list_data += get_next_page_bottom(conn, '/list/file/{}', arg_num, data_list)
         else:
-            list_data += next_fix(conn, '/list/image/', arg_num, data_list)
+            list_data += get_next_page_bottom(conn, '/list/image/{}', arg_num, data_list)
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, 'image_file_list'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+            imp = [get_lang(conn, 'image_file_list'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = list_data,
             menu = [['other', get_lang(conn, 'return')]]
         ))

route/list_long_page.py

@@ -23,10 +23,10 @@ async def list_long_page(tool = 'long_page', arg_num = 1):
 
             div += '</li>'
 
-        div += '</ul>' + next_fix(conn, '/list/document/' + ('long' if title == 'long_page' else 'short') + '/', arg_num, n_list)
+        div += '</ul>' + get_next_page_bottom(conn, '/list/document/' + ('long' if title == 'long_page' else 'short') + '/{}', arg_num, n_list)
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, title), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+            imp = [get_lang(conn, title), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = div,
             menu = [['other', get_lang(conn, 'return')]]
         ))

route/list_no_link.py

@@ -21,10 +21,10 @@ async def list_no_link(num = 1):
 
             div += '</li>'
         
-        div += '</ul>' + next_fix(conn, '/list/document/no_link/', num, n_list)
+        div += '</ul>' + get_next_page_bottom(conn, '/list/document/no_link/{}', num, n_list)
         
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, 'no_link_document_list'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+            imp = [get_lang(conn, 'no_link_document_list'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = div,
             menu = [['other', get_lang(conn, 'return')]]
         ))

route/list_old_page.py

@@ -26,7 +26,7 @@ async def list_old_page(num = 1, set_type = 'old'):
         data_html += get_next_page_bottom(conn, f'/list/document/{set_type}/{{}}', int(num), data)
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [title, wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+            imp = [title, await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = data_html,
             menu = [['other', get_lang(conn, 'return')]]
         ))

route/list_please.py

@@ -17,10 +17,10 @@ async def list_please(arg_num = 1):
                 '</li>' + \
             ''
 
-        div += '</ul>' + next_fix(conn, '/list/document/need/', arg_num, data_list)
+        div += '</ul>' + get_next_page_bottom(conn, '/list/document/need/{}', arg_num, data_list)
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, 'need_document'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+            imp = [get_lang(conn, 'need_document'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = div,
             menu = [['other', get_lang(conn, 'return')]]
         ))

route/list_title_index.py

@@ -55,11 +55,11 @@ async def list_title_index(num = 1):
                         <li>''' + get_lang(conn, 'all') + ' : ' + all_title[0][0] + '''</li>
                 '''
 
-        data += '</ul>' + next_fix(conn, '/list/document/all/', num, title_list)
+        data += '</ul>' + get_next_page_bottom(conn, '/list/document/all/{}', num, title_list)
         sub = ' (' + str(num) + ')'
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, 'all_document_list'), wiki_set(conn), await wiki_custom(conn), wiki_css([sub, 0])],
+            imp = [get_lang(conn, 'all_document_list'), await wiki_set(), await wiki_custom(conn), wiki_css([sub, 0])],
             data = data,
             menu = [['other', get_lang(conn, 'return')]]
         ))

route/list_user.py

@@ -16,10 +16,10 @@ async def list_user(arg_num = 1):
             list_data += ' | ' + data[1] if data[1] != '' else ''
             list_data += '</li>'
 
-        list_data += '</ul>' + next_fix(conn, '/list/user/', arg_num, user_list)
+        list_data += '</ul>' + get_next_page_bottom(conn, '/list/user/{}', arg_num, user_list)
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, 'member_list'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+            imp = [get_lang(conn, 'member_list'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = list_data,
             menu = [['other', get_lang(conn, 'return')]]
         ))

route/list_user_check.py

@@ -146,8 +146,8 @@ async def list_user_check(name = 'test', plus_name = None, arg_num = 1, do_type
                     record
                 )
             else:
-                div += next_fix(conn, 
-                    '/list/user/check/' + url_pas(name) + '/normal/', 
+                div += get_next_page_bottom(conn, 
+                    '/list/user/check/' + url_pas(name) + '/normal/{}', 
                     num, 
                     record
                 )
@@ -156,7 +156,7 @@ async def list_user_check(name = 'test', plus_name = None, arg_num = 1, do_type
                 name += ', ' + plus_id
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [name, wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'check') + ')', 0])],
+                imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'check') + ')', 0])],
                 data = div,
                 menu = [['manager', get_lang(conn, 'return')]]
             ))
@@ -174,8 +174,8 @@ async def list_user_check(name = 'test', plus_name = None, arg_num = 1, do_type
 
             if div != '':
                 div = '<ul>' + div + '</ul>'
-                div += next_fix(conn, 
-                    '/list/user/check/' + url_pas(name) + '/' + check_type + '/', 
+                div += get_next_page_bottom(conn, 
+                    '/list/user/check/' + url_pas(name) + '/' + check_type + '/{}', 
                     num, 
                     record
                 )
@@ -185,7 +185,7 @@ async def list_user_check(name = 'test', plus_name = None, arg_num = 1, do_type
             '' + div
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [name, wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'simple_check') + ')', 0])],
+                imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'simple_check') + ')', 0])],
                 data = div,
                 menu = [['check/' + url_pas(name), get_lang(conn, 'return')]]
             ))

route/list_user_check_delete.py

@@ -18,7 +18,7 @@ async def list_user_check_delete(name = None, ip = None, time = None, do_type =
                 return redirect(conn, '/list/user/check/' + url_pas(user_id if return_type == '0' else user_ip))
             else:
                 return easy_minify(conn, flask.render_template(skin_check(conn),
-                    imp = [get_lang(conn, 'check'), wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'delete') + ')', 0])],
+                    imp = [get_lang(conn, 'check'), await wiki_set(), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'delete') + ')', 0])],
                     data = '''
                         ''' + get_lang(conn, 'name') + ''' : ''' + user_id + '''
                         <hr class="main_hr">

route/login_find.py

@@ -3,7 +3,7 @@ from .tool.func import *
 async def login_find():
     with get_db_connect() as conn:
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, 'password_search'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+            imp = [get_lang(conn, 'password_search'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = '''
                 <ul>
                     <li><a href="/login/find/email">''' + get_lang(conn, 'email') + '''</a></li>

route/login_find_email.py

@@ -41,7 +41,7 @@ async def login_find_email(tool):
         
             curs.execute(db_change('select data from other where name = "email_title"'))
             sql_d = curs.fetchall()
-            t_text = html.escape(sql_d[0][0]) if sql_d and sql_d[0][0] != '' else (wiki_set(conn)[0] + ' key')
+            t_text = html.escape(sql_d[0][0]) if sql_d and sql_d[0][0] != '' else ((await wiki_set())[0] + ' key')
         
             curs.execute(db_change('select data from other where name = "email_text"'))
             sql_d = curs.fetchall()
@@ -52,7 +52,7 @@ async def login_find_email(tool):
                 if not curs.fetchall():
                     return await re_error(conn, 12)
                     
-                if send_email(conn, user_email, t_text, i_text) == 0:
+                if await send_email(conn, user_email, t_text, i_text) == 0:
                     return await re_error(conn, 18)
         
                 return redirect(conn, '/pass_find/email')
@@ -64,7 +64,7 @@ async def login_find_email(tool):
         
                     return await re_error(conn, 35)
                 
-                if send_email(conn, user_email, t_text, i_text) == 0:
+                if await send_email(conn, user_email, t_text, i_text) == 0:
                     for i in re_set_list:
                         flask.session.pop(i, None)
         
@@ -80,7 +80,7 @@ async def login_find_email(tool):
                 b_text = (sql_d[0][0] + '<hr class="main_hr">') if sql_d and sql_d[0][0] != '' else ''
         
                 return easy_minify(conn, flask.render_template(skin_check(conn),
-                    imp = [get_lang(conn, 'password_search'), wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'email') + ')', 0])],
+                    imp = [get_lang(conn, 'password_search'), await wiki_set(), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'email') + ')', 0])],
                     data = b_text + '''
                         <form method="post">
                             <input placeholder="''' + get_lang(conn, 'id') + '''" name="id" type="text">
@@ -101,7 +101,7 @@ async def login_find_email(tool):
                 b_text = (sql_d[0][0] + '<hr class="main_hr">') if sql_d and sql_d[0][0] != '' else ''
         
                 return easy_minify(conn, flask.render_template(skin_check(conn),
-                    imp = [get_lang(conn, 'email'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                    imp = [get_lang(conn, 'email'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                     data = '''
                         <a href="/filter/email_filter">(''' + get_lang(conn, 'email_filter_list') + ''')</a>
                         <hr class="main_hr">

route/login_find_email_check.py

@@ -31,7 +31,7 @@ async def login_find_email_check(tool):
                 b_text = (sql_d[0][0] + '<hr class="main_hr">') if sql_d and sql_d[0][0] != '' else ''
         
                 return easy_minify(conn, flask.render_template(skin_check(conn),
-                    imp = [get_lang(conn, 'reset_user_ok'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                    imp = [get_lang(conn, 'reset_user_ok'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                     data = '' + \
                         b_text + \
                         get_lang(conn, 'id') + ' : ' + user_id + \
@@ -122,7 +122,7 @@ async def login_find_email_check(tool):
             b_text = (sql_d[0][0] + '<hr class="main_hr">') if sql_d and sql_d[0][0] != '' else ''
         
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'check_key'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'check_key'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">
                         ''' + b_text + '''

route/login_find_key.py

@@ -30,7 +30,7 @@ async def login_find_key():
             b_text = (sql_d[0][0] + '<hr class="main_hr">') if sql_d and sql_d[0][0] != '' else ''
             
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                    imp = [get_lang(conn, 'reset_user_ok'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                    imp = [get_lang(conn, 'reset_user_ok'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                     data = '' + \
                         b_text + \
                         get_lang(conn, 'id') + ' : ' + user_id + \
@@ -41,7 +41,7 @@ async def login_find_key():
                 ))
         else:
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'password_search'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'password_search'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">
                         <input placeholder="''' + get_lang(conn, 'key') + '''" name="key" type="password">

route/login_login.py

@@ -50,7 +50,7 @@ async def login_login():
                 return redirect(conn, '/user')
         else:
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'login'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'login'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data =  '''
                         <form method="post">
                             <input placeholder="''' + get_lang(conn, 'id') + '''" name="id" type="text">

route/login_login_2fa.py

@@ -50,7 +50,7 @@ async def login_login_2fa():
             return redirect(conn, '/user')
         else:
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'login'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'login'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data =  '''
                         <form method="post">
                             <input placeholder="''' + get_lang(conn, '2fa_password') + '''" name="pw" type="password">

route/login_login_2fa_email.py

@@ -45,7 +45,7 @@ async def login_login_2fa_email():
             return redirect(conn, '/user')
         else:
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'login'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'login'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data =  '''
                         <form method="post">
                             <input placeholder="''' + get_lang(conn, '2fa_password') + '''" name="pw" type="password">

route/login_register.py

@@ -88,7 +88,7 @@ async def login_register():
                 password_min_length = ''
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'register'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'register'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">
                         ''' + contract + '''

route/login_register_email.py

@@ -26,7 +26,7 @@ async def login_register_email():
             if sql_d and sql_d[0][0] != '':
                 t_text = html.escape(sql_d[0][0])
             else:
-                t_text = wiki_set(conn)[0] + ' key'
+                t_text = (await wiki_set())[0] + ' key'
 
             curs.execute(db_change('select data from other where name = "email_text"'))
             sql_d = curs.fetchall()
@@ -40,7 +40,7 @@ async def login_register_email():
             if curs.fetchall():
                 return await re_error(conn, 35)
 
-            if send_email(conn, user_email, t_text, i_text) == 0:
+            if await send_email(conn, user_email, t_text, i_text) == 0:
                 return await re_error(conn, 18)
 
             flask.session['reg_email'] = user_email
@@ -52,7 +52,7 @@ async def login_register_email():
             b_text = (sql_d[0][0] + '<hr class="main_hr">') if sql_d and sql_d[0][0] != '' else ''
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'email'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'email'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <a href="/filter/email_filter">(''' + get_lang(conn, 'email_filter_list') + ''')</a>
                     <hr class="main_hr">

route/login_register_email_check.py

@@ -35,7 +35,7 @@ async def login_register_email_check():
             b_text = (sql_d[0][0] + '<hr class="main_hr">') if sql_d and sql_d[0][0] != '' else ''
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'check_key'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'check_key'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">
                         ''' + b_text + '''

route/login_register_submit.py

@@ -53,7 +53,7 @@ async def login_register_submit():
             return await re_error(conn, 43)
         else:
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'approval_question'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'approval_question'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">
                         ''' + get_lang(conn, 'approval_question') + ' : ' + data_que + '''

route/main_func_error_404.py

@@ -24,7 +24,7 @@ async def main_func_error_404(e = ''):
 
                 if db_data != '':
                     return easy_minify(conn, flask.render_template(skin_check(conn),
-                        imp = ['404', wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                        imp = ['404', await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                         data = db_data,
                         menu = 0
                     )), 404

route/main_search_deep.py

@@ -63,7 +63,7 @@ async def main_search_deep(name = 'Test', search_type = 'title', num = 1):
                 div += get_next_page_bottom(conn, '/search_data_page/{}/' + url_pas(name), num, all_list)
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [name, wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'search') + ')', 0])],
+                imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'search') + ')', 0])],
                 data = div,
                 menu = 0
             ))

route/main_search_goto.py

@@ -1,5 +1,7 @@
 from .tool.func import *
 
+from .go_api_func_search import api_func_search
+
 async def main_search_goto(name = 'Test'):
     with get_db_connect() as conn:
         curs = conn.cursor()
@@ -9,9 +11,13 @@ async def main_search_goto(name = 'Test'):
         else:
             data = name
 
+        search_data = await api_func_search(data, 'title', 1)
+
         curs.execute(db_change("select title from data where title = ? collate nocase"), [data])
         db_data = curs.fetchall()
         if db_data:
             return redirect(conn, '/w/' + url_pas(db_data[0][0]))
+        elif len(search_data) == 1:
+            return redirect(conn, '/w/' + url_pas(search_data[0]))
         else:
             return redirect(conn, '/search/' + url_pas(data))

route/main_setting.py

@@ -19,7 +19,7 @@ async def main_setting():
         li_data = ''.join(['<li><a href="/setting/' + str(li[0]) + '">' + li[1] + '</a></li>' for li in li_list])
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, 'setting'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+            imp = [get_lang(conn, 'setting'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = '<h2>' + get_lang(conn, 'list') + '</h2><ul>' + li_data + '</ul>',
             menu = [['manager', get_lang(conn, 'return')]]
         ))

route/main_setting_email_test.py

@@ -15,13 +15,13 @@ async def main_setting_email_test():
                 data = get_lang(conn, "error")
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, "email_test"), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, "email_test"), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = data,
                 menu = [["setting/external", get_lang(conn, 'return')]]
             ))
         else:
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, "email_test"), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, "email_test"), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">
                         <input name="title" placeholder="''' + get_lang(conn, "title") + '''">

route/main_setting_external.py

@@ -66,7 +66,7 @@ async def main_setting_external():
                     re_ver += '<option value="' + i + '">' + re_ver_list[i] + '</option>'
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'ext_api_req_set'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'ext_api_req_set'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = render_simple_set(conn, '''
                     <form method="post">
                         <h2>''' + get_lang(conn, 'captcha') + '''</h2>

route/main_setting_head.py

@@ -98,7 +98,7 @@ async def main_setting_head(num, skin_name = '', set_preview = 0):
                 sub_plus = ''
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, data = 'main' + title, safe = 1), wiki_set(conn), await wiki_custom(conn), wiki_css(['(HTML)' + sub_plus, 0])],
+                imp = [get_lang(conn, data = 'main' + title, safe = 1), await wiki_set(), await wiki_custom(conn), wiki_css(['(HTML)' + sub_plus, 0])],
                 data = '''
                     <form method="post">
                         ''' + start + '''

route/main_setting_main.py

@@ -200,7 +200,7 @@ async def main_setting_main():
             '''
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'main_setting'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'main_setting'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = render_simple_set(conn, '''
                     <form method="post">
                         ''' + basic_set + '''

route/main_setting_main_logo.py

@@ -45,7 +45,7 @@ async def main_setting_main_logo():
                 ''
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'wiki_logo'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'wiki_logo'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">
                         ''' + end_data + '''

route/main_setting_phrase.py

@@ -61,7 +61,7 @@ async def main_setting_phrase():
                     d_list += ['']
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'text_setting'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'text_setting'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = render_simple_set(conn, '''
                     <form method="post">
                         <h2>''' + get_lang(conn, 'register_text') + ''' (HTML)</h2>

route/main_setting_robot.py

@@ -37,7 +37,7 @@ async def main_setting_robot():
             return redirect(conn, '/setting/robot')
         else:
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = ['robots.txt', wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = ['robots.txt', await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <a href="/robots.txt">(''' + get_lang(conn, 'view') + ''')</a>
                     <hr class="main_hr">

route/main_setting_sitemap.py

@@ -95,7 +95,7 @@ async def main_setting_sitemap(do_type = 0):
                 return ''
         else:
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'sitemap_manual_create'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'sitemap_manual_create'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">
                         <button id="opennamu_save_button" type="submit">''' + get_lang(conn, 'create') + '''</button>

route/main_setting_sitemap_set.py

@@ -57,7 +57,7 @@ async def main_setting_sitemap_set():
                     for_a += 1
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'sitemap_management'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'sitemap_management'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     ''' + sitemap_list + '''
                     <hr class="main_hr">

route/main_setting_skin_set.py

@@ -40,7 +40,7 @@ async def main_setting_skin_set():
             set_data_main = { for_b : '' for for_b in set_list }
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'main_skin_set_default'), wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'beta') + ')', 0])],
+                imp = [get_lang(conn, 'main_skin_set_default'), await wiki_set(), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'beta') + ')', 0])],
                 data = render_simple_set(conn, '''
                     <form method="post">
                         <h2>''' + get_lang(conn, "render") + '''</h2>

route/main_setting_top_menu.py

@@ -23,7 +23,7 @@ async def main_setting_top_menu():
             db_data = db_data[0][0] if db_data else ''
             
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'top_menu_setting'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'top_menu_setting'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <span>
                         EX)

route/main_sys_restart.py

@@ -48,7 +48,7 @@ async def main_sys_restart(golang_process):
             return flask.Response(get_lang(conn, "warning_restart"), status = 200)
         else:
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'wiki_restart'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'wiki_restart'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">
                         <button type="submit">''' + get_lang(conn, 'restart') + '''</button>

route/main_sys_shutdown.py

@@ -13,7 +13,7 @@ async def main_sys_shutdown():
             sys.exit()
         else:
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'wiki_shutdown'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'wiki_shutdown'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">
                         <button type="submit">''' + get_lang(conn, 'shutdown') + '''</button>

route/main_sys_update.py

@@ -68,7 +68,7 @@ async def main_sys_update(golang_process):
             return await re_error(conn, 34)
         else:
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'update'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'update'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = get_lang(conn, 'update_warning') + '''
                     <hr class="main_hr">
                     <ul>

route/main_tool_admin.py

@@ -3,7 +3,7 @@ from .tool.func import *
 async def main_tool_admin():
     with get_db_connect() as conn:
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, 'admin_tool'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+            imp = [get_lang(conn, 'admin_tool'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = render_simple_set(conn, '''
                 <h2>''' + get_lang(conn, 'admin') + '''</h2>
                 <ul>

route/main_tool_other.py

@@ -3,7 +3,7 @@ from .tool.func import *
 async def main_tool_other():
     with get_db_connect() as conn:
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, 'other_tool'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+            imp = [get_lang(conn, 'other_tool'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = render_simple_set(conn, '''
                 <h2>''' + get_lang(conn, 'user_tool') + '''</h2>
                 <ul>

route/main_tool_redirect.py

@@ -58,7 +58,7 @@ async def main_tool_redirect(num = 1, add_2 = ''):
                     ''
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [title_list[num][2], wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [title_list[num][2], await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">
                         ''' + top_plus + '''

route/n_bbs_in.py

@@ -14,7 +14,7 @@ async def bbs_in(bbs_num = 1, page = 1):
         bbs_name = db_data[0][0]
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [bbs_name, wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'bbs') + ') (' + str(page) + ')', 0])],
+            imp = [bbs_name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'bbs') + ') (' + str(page) + ')', 0])],
             data = '' + \
                 '<div id="opennamu_bbs_in"></div>' + \
                 '<script defer src="/views/main_css/js/route/bbs_in.js' + cache_v() + '"></script>' + \

route/n_bbs_main.py

@@ -3,7 +3,7 @@ from .tool.func import *
 async def bbs_main():
     with get_db_connect() as conn:
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, 'bbs_main'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+            imp = [get_lang(conn, 'bbs_main'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = '' + \
                 '<div id="opennamu_bbs_main"></div>' + \
                 '<script defer src="/views/main_css/js/route/bbs_main.js' + cache_v() + '"></script>' + \

route/n_bbs_w_set.py

@@ -14,7 +14,7 @@ async def bbs_w_set(bbs_num = ''):
         bbs_num_str = str(bbs_num)
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, 'bbs_set'), wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + bbs_name + ')', 0])],
+            imp = [get_lang(conn, 'bbs_set'), await wiki_set(), await wiki_custom(conn), wiki_css(['(' + bbs_name + ')', 0])],
             data = '' + \
                 '<div id="opennamu_bbs_w_set"></div>' + \
                 '<script defer src="/views/main_css/js/route/bbs_w_set.js' + cache_v() + '"></script>' + \

route/n_edit_move_all.py

@@ -3,7 +3,7 @@ from .tool.func import *
 async def edit_move_all():
     with get_db_connect() as conn:
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, 'multiple_move'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+            imp = [get_lang(conn, 'multiple_move'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = '' + \
                 '<div id="opennamu_edit_move_all"></div>' + \
                 '<script defer src="/views/main_css/js/route/edit_move_all.js' + cache_v() + '"></script>' + \

route/n_give_auth.py

@@ -9,7 +9,7 @@ async def give_auth(user_name = ''):
             sub = '(' + get_lang(conn, 'authorize') + ')'
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [user_name, wiki_set(conn), await wiki_custom(conn), wiki_css([sub, 0])],
+            imp = [user_name, await wiki_set(), await wiki_custom(conn), wiki_css([sub, 0])],
             data = '' + \
                 '<div id="opennamu_give_auth"></div>' + \
                 '<script defer src="/views/main_css/js/route/give_auth.js' + cache_v() + '"></script>' + \

route/n_list_recent_block.py

@@ -17,7 +17,7 @@ async def list_recent_block(user_name = 'Test', tool = 'all', num = 1, why = '')
             sub = '(' + get_lang(conn, 'admin') + ')'
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, 'recent_ban'), wiki_set(conn), await wiki_custom(conn), wiki_css([sub, 0])],
+            imp = [get_lang(conn, 'recent_ban'), await wiki_set(), await wiki_custom(conn), wiki_css([sub, 0])],
             data = '' + \
                 '<div id="opennamu_list_recent_block"></div>' + \
                 '<script defer src="/views/main_css/js/route/list_recent_block.js' + cache_v() + '"></script>' + \

route/n_list_recent_discuss.py

@@ -9,7 +9,7 @@ async def list_recent_discuss(num = 1, tool = 'normal'):
             m_sub = '(' + get_lang(conn, 'open_discussion') + ')'
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, 'recent_discussion'), wiki_set(conn), await wiki_custom(conn), wiki_css([m_sub, 0])],
+            imp = [get_lang(conn, 'recent_discussion'), await wiki_set(), await wiki_custom(conn), wiki_css([m_sub, 0])],
             data = '' + \
                 '<div id="opennamu_list_recent_discuss"></div>' + \
                 '<script defer src="/views/main_css/js/route/list_recent_discuss.js' + cache_v() + '"></script>' + \

route/n_list_user_check_submit.py

@@ -3,7 +3,7 @@ from .tool.func import *
 async def list_user_check_submit(name = 'Test'):
     with get_db_connect() as conn:
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [name, wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'check') + ')', 0])],
+            imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'check') + ')', 0])],
             data = '' + \
                 '<div id="opennamu_list_user_check_submit"></div>' + \
                 '<script defer src="/views/main_css/js/route/list_user_check_submit.js' + cache_v() + '"></script>' + \

route/n_setting_404_page.py

@@ -3,7 +3,7 @@ from .tool.func import *
 async def setting_404_page():
     with get_db_connect() as conn:
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, '404_page_setting'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+            imp = [get_lang(conn, '404_page_setting'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = '' + \
                 '<div id="opennamu_setting_404_page"></div>' + \
                 '<script defer src="/views/main_css/js/route/setting_404_page.js' + cache_v() + '"></script>' + \

route/n_topic_list.py

@@ -3,7 +3,7 @@ from .tool.func import *
 async def topic_list(page = 1, name = 'Test'):
     with get_db_connect() as conn:
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [name, wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'discussion_list') + ')', 0])],
+            imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'discussion_list') + ')', 0])],
             data = '' + \
                 '<div id="opennamu_topic_list"></div>' + \
                 '<script defer src="/views/main_css/js/route/topic_list.js' + cache_v() + '"></script>' + \

route/n_w_watch_list.py

@@ -3,7 +3,7 @@ from .tool.func import *
 async def w_watch_list(name, num = 1, do_type = 'watch_list'):
     with get_db_connect() as conn:
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [name, wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, do_type if do_type == 'star_doc' else 'watchlist') + ')', 0])],
+            imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, do_type if do_type == 'star_doc' else 'watchlist') + ')', 0])],
             data = '' + \
                 '<div id="opennamu_w_watch_list"></div>' + \
                 '<script defer src="/views/main_css/js/route/w_watch_list.js' + cache_v() + '"></script>' + \

route/recent_app_submit.py

@@ -87,7 +87,7 @@ async def recent_app_submit():
                 div += get_lang(conn, 'no_applications_now')
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'application_list'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'application_list'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = div,
                 menu = [['other', get_lang(conn, 'return')]]
             ))

route/recent_change.py

@@ -242,7 +242,7 @@ async def recent_change(name = '', tool = '', num = 1, set_type = 'normal'):
                 sub = 0
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [title, wiki_set(conn), await wiki_custom(conn), wiki_css([sub, 0])],
+                imp = [title, await wiki_set(), await wiki_custom(conn), wiki_css([sub, 0])],
                 data = div,
                 menu = menu
             ))

route/recent_edit_request.py

@@ -50,7 +50,7 @@ async def recent_edit_request():
         ''
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, 'recent_edit_request'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+            imp = [get_lang(conn, 'recent_edit_request'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = div,
             menu = [['recent_change', get_lang(conn, 'return')]]
         ))

route/recent_history_add.py

@@ -30,7 +30,7 @@ async def recent_history_add(name = 'Test', do_type = ''):
             return redirect(conn, '/history/' + url_pas(name))
         else:            
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'history_add'), wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + name + ')', 0])],
+                imp = [get_lang(conn, 'history_add'), await wiki_set(), await wiki_custom(conn), wiki_css(['(' + name + ')', 0])],
                 data = '''
                     <form method="post">
                         <input placeholder="''' + get_lang(conn, 'why') + '''" name="send">

route/recent_history_delete.py

@@ -17,7 +17,7 @@ async def recent_history_delete(name = 'Test', rev = 1):
             return redirect(conn, '/history/' + url_pas(name))
         else:
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [name, wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'history_delete') + ') (r' + num + ')', 0])],
+                imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'history_delete') + ') (r' + num + ')', 0])],
                 data = '''
                     <form method="post">
                         <span>''' + get_lang(conn, 'delete_warning') + '''</span>

route/recent_history_reset.py

@@ -15,7 +15,7 @@ async def recent_history_reset(name = 'Test'):
             return redirect(conn, '/history/' + url_pas(name))
         else:
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [name, wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'history_reset') + ')', 0])],
+                imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'history_reset') + ')', 0])],
                 data = '''
                     <form method="post">
                         <span>''' + get_lang(conn, 'delete_warning') + '''</span>

route/recent_history_send.py

@@ -28,7 +28,7 @@ async def recent_history_send(name = 'Test', rev = 1):
                 send = send[0][0]
 
                 return easy_minify(conn, flask.render_template(skin_check(conn),
-                    imp = [name, wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'send_edit') + ') (r' + num + ')', 0])],
+                    imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'send_edit') + ') (r' + num + ')', 0])],
                     data = '''
                         <form method="post">
                             <span>''' + get_lang(conn, 'delete_warning') + '''</span>

route/recent_history_tool.py

@@ -43,7 +43,7 @@ async def recent_history_tool(name = 'Test', rev = 1):
             data += '</ul>'
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [name, wiki_set(conn), await wiki_custom(conn), wiki_css(['(r' + num + ')', 0])],
+            imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(r' + num + ')', 0])],
             data = data,
             menu = [['history/' + url_pas(name), get_lang(conn, 'return')]]
         ))

route/recent_record_reset.py

@@ -15,7 +15,7 @@ async def recent_record_reset(name = 'Test'):
             return redirect(conn, '/record/' + url_pas(name))
         else:
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [name, wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'record_reset') + ')', 0])],
+                imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'record_reset') + ')', 0])],
                 data = '''
                     <form method="post">
                         <span>''' + get_lang(conn, 'delete_warning') + '''</span>

route/recent_record_topic.py

@@ -37,10 +37,10 @@ async def recent_record_topic(name = 'Test'):
             ''
 
         div += '</table>'
-        div += next_fix(conn, '/record/topic/' + url_pas(name) + '?num=', num, data_list)
+        div += get_next_page_bottom(conn, '/record/topic/' + url_pas(name) + '?num={}', num, data_list)
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, 'discussion_record'), wiki_set(conn), await wiki_custom(conn), wiki_css([sub, 0])],
+            imp = [get_lang(conn, 'discussion_record'), await wiki_set(), await wiki_custom(conn), wiki_css([sub, 0])],
             data = div,
             menu = [['other', get_lang(conn, 'other')], ['user/' + url_pas(name), get_lang(conn, 'user_tool')]]
         ))

route/tool/func.py

@@ -910,28 +910,6 @@ def get_next_page_bottom(conn, link, num, page, end = 50):
 
     return list_data
 
-def next_fix(conn, link, num, page, end = 50):
-    list_data = ''
-
-    if num == 1:
-        if len(page) == end:
-            list_data += '' + \
-                '<hr class="main_hr">' + \
-                '<a href="' + link + str(num + 1) + '">(' + get_lang(conn, 'next') + ')</a>' + \
-            ''
-    elif len(page) != end:
-        list_data += '' + \
-            '<hr class="main_hr">' + \
-            '<a href="' + link + str(num - 1) + '">(' + get_lang(conn, 'previous') + ')</a>' + \
-        ''
-    else:
-        list_data += '' + \
-            '<hr class="main_hr">' + \
-            '<a href="' + link + str(num - 1) + '">(' + get_lang(conn, 'previous') + ')</a> <a href="' + link + str(num + 1) + '">(' + get_lang(conn, 'next') + ')</a>' + \
-        ''
-
-    return list_data
-
 def leng_check(A, B):
     # B -> new
     # A -> old
@@ -1307,83 +1285,12 @@ def wiki_css(data):
 def cut_100(data):
     return ''
 
-def wiki_set(conn):
-    curs = conn.cursor()
-
-    ip = ip_check()
-    skin_name = skin_check(conn, 1)
-    data_list = []
-
-    curs.execute(db_change('select data from other where name = ?'), ['name'])
-    db_data = curs.fetchall()
-    data_list += [db_data[0][0]] if db_data and db_data[0][0] != '' else ['Wiki']
-
-    curs.execute(db_change('select data from other where name = ?'), ['license'])
-    db_data = curs.fetchall()
-    data_list += [db_data[0][0]] if db_data and db_data[0][0] != '' else ['']
-
-    data_list += ['', '']
-
-    curs.execute(db_change('select data from other where name = "logo" and coverage = ?'), [skin_name])
-    db_data = curs.fetchall()
-    if db_data and db_data[0][0] != '':
-        data_list += [db_data[0][0]]
-    else:
-        curs.execute(db_change('select data from other where name = "logo" and coverage = ""'))
-        db_data = curs.fetchall()
-        data_list += [db_data[0][0]] if db_data and db_data[0][0] != '' else [data_list[0]]
-
-    head_data = ''
-
-    curs.execute(db_change("select data from other where name = 'head' and coverage = ''"))
-    db_data = curs.fetchall()
-    head_data += db_data[0][0] if db_data and db_data[0][0] != '' else ''
-
-    curs.execute(db_change("select data from other where name = 'head' and coverage = ?"), [skin_name])
-    db_data = curs.fetchall()
-    head_data += db_data[0][0] if db_data and db_data[0][0] != '' else ''
-
-    darkmode = flask.request.cookies.get('main_css_darkmode', '0')
-    if darkmode == '1':
-        curs.execute(db_change("select data from other where name = 'head' and coverage = ?"), [skin_name + '-cssdark'])
-        db_data = curs.fetchall()
-        head_data += db_data[0][0] if db_data and db_data[0][0] != '' else ''
-
-    data_list += [head_data]
-
-    curs.execute(db_change("select data from other where name = 'top_menu'"))
-    db_data = curs.fetchall()
-    db_data = db_data[0][0] if db_data else ''
-    db_data = db_data.replace('\r', '')
-    
-    curs.execute(db_change("select data from user_set where name = 'top_menu' and id = ?"), [ip])
-    db_data_2 = curs.fetchall()
-    db_data_2 = db_data_2[0][0] if db_data_2 else ''
-    db_data_2 = db_data_2.replace('\r', '')
-    if db_data_2 != '' and db_data != '':
-        db_data += '\n' + db_data_2
-    elif db_data_2 != '':
-        db_data += db_data_2
-    
-    if db_data != '':
-        db_data = db_data.split('\n')
-    
-        if len(db_data) % 2 != 0:
-            db_data += ['']
-
-        db_data = [[db_data[for_a], db_data[for_a + 1]] for for_a in range(0, len(db_data), 2)]
-
-    data_list += [db_data]
-
-    template_var = []
-    for for_a in range(1, 4):
-        curs.execute(db_change("select data from other where name = ?"), ['template_var_' + str(for_a)])
-        db_data = curs.fetchall()
-        template_var += [db_data[0][0]] if db_data else ['']
+async def wiki_set():
+    other_set = {}
 
-    data_list += [template_var]
+    data = await python_to_golang('api_func_wiki_set', other_set)
 
-    return data_list
+    return data["data"]
 
 async def wiki_custom(conn):
     curs = conn.cursor()
@@ -1462,7 +1369,7 @@ async def wiki_custom(conn):
         ip,
         user_topic,
         split_path,
-        level_check(conn, ip)
+        await level_check(ip)
     ]
 
 def load_skin(conn, data = '', set_n = 0, default = 0):
@@ -1703,7 +1610,7 @@ def render_simple_set(conn, data):
     return data
 
 # Func-request
-def send_email(conn, who, title, data):
+async def send_email(conn, who, title, data):
     curs = conn.cursor()
 
     curs.execute(db_change('' + \
@@ -1742,7 +1649,7 @@ def send_email(conn, who, title, data):
         smtp = smtplib.SMTP_SSL(smtp_server, smtp_port)
         
     domain = load_domain(conn)
-    wiki_name = wiki_set(conn)[0]
+    wiki_name = (await wiki_set())[0]
     
     msg = email.mime.text.MIMEText(data)
 
@@ -1894,30 +1801,15 @@ def do_user_name_check(conn, user_name):
     
     return 0
 
-def level_check(conn, ip = ''):
-    curs = conn.cursor()
-
-    if ip == '':
-        ip = ip_check()
-
-    level = '0'
-    exp = '0'
-    max_exp = '0'
-
-    curs.execute(db_change("select data from user_set where id = ? and name = 'level'"), [ip])
-    db_data = curs.fetchall()
-    if db_data:
-        level = db_data[0][0]
+async def level_check(ip = ''):
+    ip = ip_check() if ip == '' else ip
 
-    curs.execute(db_change("select data from user_set where id = ? and name = 'experience'"), [ip])
-    db_data = curs.fetchall()
-    if db_data:
-        exp = db_data[0][0]
+    other_set = {}
+    other_set['ip'] = ip
 
-    if exp != '0':
-        max_exp = str(500 + (int(level) * 50))
+    data = await python_to_golang('api_func_level', other_set)
 
-    return [level, exp, max_exp]
+    return data["data"]
 
 async def acl_check(name = '', tool = '', topic_num = '', ip = '', memo = ''):
     ip = ip_check() if ip == '' else ip
@@ -2329,7 +2221,7 @@ async def re_error(conn, data):
             end = '<ul><li>' + get_lang(conn, 'authority_error') + '</li></ul>'
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, 'error'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+            imp = [get_lang(conn, 'error'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = '<h2>' + get_lang(conn, 'error') + '</h2>' + end,
             menu = 0
         )), 401
@@ -2469,7 +2361,7 @@ async def re_error(conn, data):
                 data += '<br>' + get_lang(conn, 'error_skin_set_old') + ' <a href="/skin_set">(' + get_lang(conn, 'go') + ')</a>'
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'skin_set'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [get_lang(conn, 'skin_set'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '' + \
                     '<div id="main_skin_set">' + \
                         '<h2>' + get_lang(conn, 'error') + '</h2>' + \
@@ -2482,7 +2374,7 @@ async def re_error(conn, data):
             ))
         else:
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [title, wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
+                imp = [title, await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '' + \
                     '<h2>' + sub_title + '</h2>' + \
                     '<ul>' + \

route/tool/func_render_namumark.py

@@ -1424,6 +1424,7 @@ class class_do_render_namumark:
                         if self.parent:
                             include_data_tmp = self.parent(
                                 self.conn,
+                                doc_name = self.doc_name,
                                 doc_data = db_data[0][0], 
                                 data_type = 'api_include',
                                 parameter = include_change_list
@@ -1860,7 +1861,7 @@ class class_do_render_namumark:
                 table_data_end = '<table class="' + table_parameter['class'] + '" style="' + table_parameter['table'] + '">' + table_caption + table_data_end + '</table>'
                 table_data_end = '<div class="table_safe" style="' + table_parameter['div'] + '">' + table_data_end + '</div>'
 
-                self.render_data = re.sub(table_regex, lambda x : ('\n<front_br>' + table_data_end + '\n'), self.render_data, 1)
+                self.render_data = re.sub(table_regex, lambda x : ('\n' + table_data_end + '\n'), self.render_data, 1)
 
             table_count_all -= 1
     
@@ -2340,7 +2341,7 @@ class class_do_render_namumark:
                     if list_len in list_style:
                         list_style_data = list_style[list_len]
 
-                    return '<li style="margin-left: ' + str(list_len * 20) + 'px;" class="' + list_style_data + '">' + list_data + '</li>'
+                    return '<li style="margin-left: ' + str((list_len - 1) * 20) + 'px;" class="' + list_style_data + '">' + list_data + '</li>'
                 else:
                     list_type = match.group(2)
 

route/topic.py

@@ -134,7 +134,7 @@ async def topic(topic_num = 0, do_type = '', doc_name = 'Test'):
             shortcut += '</div>'
 
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [name, wiki_set(conn), await wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'discussion') + ')', 0])],
+                imp = [name, await wiki_set(), await 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_list_hidden_style">.opennamu_list_hidden { display: none; }</style>

route/topic_comment_delete.py

@@ -16,7 +16,7 @@ async def topic_comment_delete(topic_num = 1, num = 1):
             return redirect(conn, '/thread/' + topic_num)
         else:
             return easy_minify(conn, flask.render_template(skin_check(conn),
-                imp = [get_lang(conn, 'topic_delete'), wiki_set(conn), await wiki_custom(conn), wiki_css(['(#' + num + ')', 0])],
+                imp = [get_lang(conn, 'topic_delete'), await wiki_set(), await wiki_custom(conn), wiki_css(['(#' + num + ')', 0])],
                 data = '''
                     <hr class="main_hr">
                     <form method="post">

route/topic_comment_tool.py

@@ -56,7 +56,7 @@ async def topic_comment_tool(topic_num = 1, num = 1):
             '''
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, 'discussion_tool'), wiki_set(conn), await wiki_custom(conn), wiki_css(['(#' + num + ')', 0])],
+            imp = [get_lang(conn, 'discussion_tool'), await wiki_set(), await wiki_custom(conn), wiki_css(['(#' + num + ')', 0])],
             data = ban,
             menu = [['thread/' + topic_num + '#' + num, get_lang(conn, 'return')]]
         ))