버전 표기 방법 변경

route/api_version.py

@@ -3,7 +3,22 @@ from .tool.func import *
 def api_version_2(conn, r_ver, c_ver):
     curs = conn.cursor()
 
-    n_ver = load_version()
+    n_ver = ''
+    data = None
+
+    try:
+        if flask.request.host != 'namu.ml':
+            data = urllib.request.urlopen('https://namu.ml/api/version')
+    except:
+        pass
+
+    if data and data.getcode() == 200:
+        try:
+            json_data = json.loads(data.read().decode())
+            if 'version' in json_data:
+                n_ver = json_data['version']
+        except:
+            pass
         
     json_data = { "version" : r_ver, "db_version" : c_ver, "lastest_version" : n_ver  }
 

route/other.py

@@ -2,50 +2,46 @@ from .tool.func import *
 
 def other_2(conn, r_ver):
     curs = conn.cursor()
-
-    n_ver = load_version()
-
-    if n_ver != '':
-        n_ver = '<li>' + load_lang('lastest') + ' : ' + n_ver + '</li>'
     
     return easy_minify(flask.render_template(skin_check(), 
         imp = [load_lang('other_tool'), wiki_set(), custom(), other2([0, 0])],
-        data =  '''
-                <h2>''' + load_lang('record') + '''</h2>
-                <ul>
-                    <li><a href="/manager/6">''' + load_lang('edit_record') + '''</a></li>
-                    <li><a href="/manager/7">''' + load_lang('discussion_record') + '''</a></li>
-                </ul>
-                <br>
-                <h2>''' + load_lang('list') + '''</h2>
-                <ul>
-                    <li><a href="/admin_list">''' + load_lang('admin_list') + '''</a></li>
-                    <li><a href="/give_log">''' + load_lang('admin_group_list') + '''</a></li>
-                    <li><a href="/not_close_topic">''' + load_lang('open_discussion_list') + '''</a></li>
-                    <li><a href="/title_index">''' + load_lang('all_document_list') + '''</a></li>
-                    <li><a href="/acl_list">''' + load_lang('acl_document_list') + '''</a></li>
-                    <li><a href="/please">''' + load_lang('need_document') + '''</a></li>
-                    <li><a href="/block_log">''' + load_lang('recent_ban') + '''</a></li>
-                    <li><a href="/user_log">''' + load_lang('member_list') + '''</a></li>
-                    <li><a href="/admin_log">''' + load_lang('authority_use_list') + '''</a></li>
-                </ul>
-                <br>
-                <h2>''' + load_lang('other') + '''</h2>
-                <ul>
-                    <li><a href="/upload">''' + load_lang('upload') + '''</a></li>
-                    <li><a href="/manager/10">''' + load_lang('search') + '''</a></li>
-                </ul>
-                <br>
-                <h2>''' + load_lang('admin') + '''</h2>
-                <ul>
-                    <li><a href="/manager/1">''' + load_lang('admin_tool') + '''</a></li>
-                </ul>
-                <br>
-                <h2>''' + load_lang('version') + '''</h2>
-                <ul>
-                    <li>''' + load_lang('version') + ' : ' + r_ver + '''</li>
-                    ''' + n_ver + '''
-                </ul>
-                ''',
+        data = '''
+            <h2>''' + load_lang('record') + '''</h2>
+            <ul>
+                <li><a href="/manager/6">''' + load_lang('edit_record') + '''</a></li>
+                <li><a href="/manager/7">''' + load_lang('discussion_record') + '''</a></li>
+            </ul>
+            <br>
+            <h2>''' + load_lang('list') + '''</h2>
+            <ul>
+                <li><a href="/admin_list">''' + load_lang('admin_list') + '''</a></li>
+                <li><a href="/give_log">''' + load_lang('admin_group_list') + '''</a></li>
+                <li><a href="/not_close_topic">''' + load_lang('open_discussion_list') + '''</a></li>
+                <li><a href="/title_index">''' + load_lang('all_document_list') + '''</a></li>
+                <li><a href="/acl_list">''' + load_lang('acl_document_list') + '''</a></li>
+                <li><a href="/please">''' + load_lang('need_document') + '''</a></li>
+                <li><a href="/block_log">''' + load_lang('recent_ban') + '''</a></li>
+                <li><a href="/user_log">''' + load_lang('member_list') + '''</a></li>
+                <li><a href="/admin_log">''' + load_lang('authority_use_list') + '''</a></li>
+            </ul>
+            <br>
+            <h2>''' + load_lang('other') + '''</h2>
+            <ul>
+                <li><a href="/upload">''' + load_lang('upload') + '''</a></li>
+                <li><a href="/manager/10">''' + load_lang('search') + '''</a></li>
+            </ul>
+            <br>
+            <h2>''' + load_lang('admin') + '''</h2>
+            <ul>
+                <li><a href="/manager/1">''' + load_lang('admin_tool') + '''</a></li>
+            </ul>
+            <br>
+            <h2>''' + load_lang('version') + '''</h2>
+            <ul>
+                <li>''' + load_lang('version') + ' : ' + r_ver + '''</li>
+                <li id="ver_send" style="display: none;">''' + load_lang('lastest') + ''' : </li>
+            </ul>
+            <script>load_ver();</script>
+        ''',
         menu = 0
     ))

route/tool/func.py

@@ -443,6 +443,7 @@ def other2(data):
         <script src="/views/main_css/js/folding.js"></script>
         <script src="/views/main_css/js/topic_load.js"></script>
         <script src="/views/main_css/js/do_preview.js"></script>
+        <script src="/views/main_css/js/load_ver.js"></script>
         <script src="https://cdn.jsdelivr.net/npm/katex@0.10.1/dist/katex.min.js"
                 integrity="sha384-2BKqo+exmr9su6dir+qCw08N2ZKRucY4PrGQPPWU1A7FtlCGjmEGFqXCv5nyM5Ij"
                 crossorigin="anonymous"></script>
@@ -899,7 +900,14 @@ def ban_insert(name, end, why, login, blocker):
 
     curs.execute("select block from ban where block = ?", [name])
     if curs.fetchall():
-        curs.execute("insert into rb (block, end, today, blocker, why, band) values (?, ?, ?, ?, ?, ?)", [name, load_lang('release', 1), now_time, blocker, '', band])
+        curs.execute("insert into rb (block, end, today, blocker, why, band) values (?, ?, ?, ?, ?, ?)", [
+            name, 
+            load_lang('release', 1),
+            now_time, 
+            blocker, 
+            '', 
+            band
+        ])
         curs.execute("delete from ban where block = ?", [name])
     else:
         if login != '':
@@ -987,26 +995,6 @@ def edit_filter_do(data):
     
     return 0
 
-def load_version():
-    n_ver = ''
-    data = None
-
-    try:
-        if flask.request.host != 'namu.ml':
-            data = urllib.request.urlopen('https://namu.ml/api/version')
-    except:
-        pass
-
-    if data and data.getcode() == 200:
-        try:
-            json_data = json.loads(data.read().decode())
-            if 'version' in json_data:
-                n_ver = json_data['version']
-        except:
-            pass
-
-    return n_ver
-
 def redirect(data = '/'):
     return flask.redirect(data)
 

route/topic.py

@@ -98,22 +98,22 @@ def topic_2(conn, name, sub):
                 who_plus += ' <span style="margin-right: 5px;">@' + topic_data_top[0][0] + ' </span>'
                                 
             all_data += '''
-                        <table id="toron">
-                            <tbody>
-                                <tr>
-                                    <td id="toron_color_red">
-                                        <a href="#''' + topic_data[1] + '''">
-                                            #''' + topic_data[1] + '''
-                                        </a> ''' + ip_pas(topic_data[3]) + who_plus + ''' <span style="float: right;">''' + topic_data[2] + '''</span>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>''' + render_set(data = topic_data[0]) + '''</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                        <br>
-                        '''    
+                <table id="toron">
+                    <tbody>
+                        <tr>
+                            <td id="toron_color_red">
+                                <a href="#''' + topic_data[1] + '''">
+                                    #''' + topic_data[1] + '''
+                                </a> ''' + ip_pas(topic_data[3]) + who_plus + ''' <span style="float: right;">''' + topic_data[2] + '''</span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>''' + render_set(data = topic_data[0]) + '''</td>
+                        </tr>
+                    </tbody>
+                </table>
+                <br>
+            '''    
 
         for topic_data in topic:
             user_write = topic_data[0]
@@ -160,40 +160,40 @@ def topic_2(conn, name, sub):
                 user_write = '<br>'
                          
             all_data += '''
-                        <table id="toron">
-                            <tbody>
-                                <tr>
-                                    <td id="toron_color''' + color + '''">
-                                        <a href="javascript:void(0);" id="''' + str(number) + '">#' + str(number) + '</a> ' + ip + '''</span>
-                                    </td>
-                                </tr>
-                                <tr ''' + blind_data + '''>
-                                    <td>''' + user_write + '''</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                        <br>
-                        '''
+                <table id="toron">
+                    <tbody>
+                        <tr>
+                            <td id="toron_color''' + color + '''">
+                                <a href="javascript:void(0);" id="''' + str(number) + '">#' + str(number) + '</a> ' + ip + '''</span>
+                            </td>
+                        </tr>
+                        <tr ''' + blind_data + '''>
+                            <td>''' + user_write + '''</td>
+                        </tr>
+                    </tbody>
+                </table>
+                <br>
+            '''
             number += 1
 
         if ban != 1 or admin == 1:
             data += '''
-                    <div id="plus"></div>
-                    <script>topic_load("''' + name + '''", "''' + sub + '''");</script>
-                    <a id="reload" href="javascript:void(0);" onclick="location.href.endsWith(\'#reload\')? location.reload(true):location.href=\'#reload\'">(''' + load_lang('reload') + ''')</a>
-                    <form style="''' + display + '''" method="post">
-                    <br>
-                    <textarea style="height: 100px;" name="content"></textarea>
-                    <hr class=\"main_hr\">
-                    ''' + captcha_get()
+                <div id="plus"></div>
+                <script>topic_load("''' + name + '''", "''' + sub + '''");</script>
+                <a id="reload" href="javascript:void(0);" onclick="location.href.endsWith(\'#reload\')? location.reload(true):location.href=\'#reload\'">(''' + load_lang('reload') + ''')</a>
+                <form style="''' + display + '''" method="post">
+                <br>
+                <textarea style="height: 100px;" name="content"></textarea>
+                <hr class=\"main_hr\">
+            ''' + captcha_get()
             
             if display == '':
                 data += ip_warring()
 
             data += '''
-                        <button type="submit">''' + load_lang('send') + '''</button>
-                    </form>
-                    '''
+                    <button type="submit">''' + load_lang('send') + '''</button>
+                </form>
+            '''
 
         return easy_minify(flask.render_template(skin_check(), 
             imp = [name, wiki_set(), custom(), other2([' (' + load_lang('discussion') + ')', 0])],

views/main_css/js/load_ver.js

@@ -0,0 +1,16 @@
+function load_ver() {
+    var n_ver = document.getElementById('ver_send');
+
+    var url = "/api/version";
+    
+    var xhr = new XMLHttpRequest();
+    xhr.open("GET", url, true);
+    xhr.send(null);
+
+    xhr.onreadystatechange = function() {
+        if(this.readyState === 4 && this.status === 200) {
+            n_ver.innerHTML += JSON.parse(this.responseText)['lastest_version'];
+            n_ver.style.display = "list-item";
+        }
+    }
+}

views/neo_yousoro/version.json

@@ -0,0 +1,4 @@
+{
+    "skin_ver" : "v1.0.0",
+    "require_ver" : "1"
+}

views/neo_yousoro/version.txt

@@ -1 +0,0 @@
-v1.0.0