Domů Procházet Nápověda
Přihlásit se
wiki
/
openNAMU__openNAMU
zrcadlo https://github.com/openNAMU/openNAMU.git
2
0
Rozštěpit 0
Soubory Úkoly 0 Wiki
Procházet zdrojové kódy

Merge pull request #2314 from openNAMU/dont_use

눈뽕 수정 및 일부 버그 수정
잉여개발기 před 1 rokem
rodič
4bec4c6f5c 15503b5abd
revize
2eb7a811a7
8 změnil soubory, kde provedl 70 přidání a 76 odebrání
Rozdělené zobrazení Ukázat statistiku rozdílových dat
  1. 8 7
      app.py
  2. 1 1
      requirements.txt
  3. 1 1
      route/tool/func.py
  4. 0 22
      views/main_css/js/func/insert_user_info.js
  5. 3 2
      views/ringo/index.html
  6. 1 1
      views/ringo/info.json
  7. 0 42
      views/ringo/js/skin_set.js
  8. 56 0
      views/ringo/js/skin_set_do.js

+ 8 - 7
app.py
Zobrazit soubor 

@@ -2,13 +2,11 @@
 
 import os
 
 import re
 
 import logging
 
+import waitress
 
 
 from route.tool.func import *
 
 from route import *
 
 
-from hypercorn.asyncio import serve
 
-from hypercorn.config import Config
 
-
 
 args = sys.argv
 
 run_mode = ''
 
 if len(args) > 1:
 
@@ -846,7 +844,10 @@ app.route('/update', methods = ['POST', 'GET'])(main_sys_update)
 
 app.errorhandler(404)(main_func_error_404)
 
 
 if __name__ == "__main__":
 
-    config = Config()
 
-    config.bind = [f"{server_set['host']}:{server_set['port']}"]
 
-    
-    asyncio.run(serve(app, config))
 
+    waitress.serve(
 
+        app,
 
+        host = server_set['host'],
 
+        port = int(server_set['port']),
 
+        clear_untrusted_proxy_headers = True,
 
+        threads = os.cpu_count()
 
+    )

+ 1 - 1
requirements.txt
Zobrazit soubor 

@@ -2,7 +2,7 @@ pip
 
 
 flask
 
 flask[async]
 
-hypercorn
 
+waitress
 
 
 requests
 
 typing_extensions

+ 1 - 1
route/tool/func.py
Zobrazit soubor 

@@ -1214,7 +1214,7 @@ def skin_check(conn, set_n = 0):
 
         return skin
 
     
 def cache_v():
 
-    return '.cache_v269'
 
+    return '.cache_v270'
 
 
 def wiki_css(data):
 
     with class_temp_db() as m_conn:

+ 0 - 22
views/main_css/js/func/insert_user_info.js
Zobrazit soubor 

@@ -30,18 +30,6 @@ function do_insert_user_info() {
 
                 get_data_ban = lang_data['ban'];
 
                 get_data_ban += '<br>';
 
                 
-                get_data_ban += lang_data['type'] + ' : ';
 
-                if(data['data']['ban'][1].match(/^[0-9]+$/) || data['data']['ban'][1] == '') {
 
-                    get_data_ban += '<a href="/recent_block/user/' + opennamu_do_url_encode(name) + '">' + lang_data['normal'] + '</a>'; 
-                } else if(data['data']['ban'][1] === 'c') {
 
-                    get_data_ban += lang_data['normal']; 
-                } else if(data['data']['ban'][1].match(/^b/)) {
 
-                    get_data_ban += '<a href="/recent_block/cidr">' + lang_data['cidr'] + '</a>';
 
-                } else {
 
-                    get_data_ban += '<a href="/recent_block/regex">' + lang_data['regex'] + '</a>';
 
-                }
 
-                get_data_ban += '<br>';
 
-                
                 get_data_ban += lang_data['period'] + ' : ';
 
                 if(!data['data']['ban']['period']) {
 
                     if(get_data_auth_date !== '0') {
 
@@ -56,16 +44,6 @@ function do_insert_user_info() {
 
                 }
 
                 get_data_ban += '<br>';
 
                 
-                get_data_ban += lang_data['option'] + ' : ';
 
-                if(data['data']['ban']['login_able'] === '2') {
 
-                    get_data_ban += lang_data['edit_request_able']; 
-                } else if(data['data']['ban']['login_able'] === '1') {
 
-                    get_data_ban += lang_data['login_able']; 
-                } else {
 
-                    get_data_ban += 'X';
 
-                }
 
-                get_data_ban += '<br>';
 
-                
                 if(data['data']['ban']['reason'] === 'edit filter') {
 
                     get_data_ban += lang_data['why'] + ' : <a href="/edit_filter/' + opennamu_do_url_encode(name) + '">' + data['data']['ban']['reason'] + '</a>';
 
                 } else {

+ 3 - 2
views/ringo/index.html
Zobrazit soubor 

@@ -1,6 +1,8 @@
 
 <!DOCTYPE html>

 <html lang="{{'language_tag'|load_lang}}">

     <head>

+        <style id="ringo_add_style"></style>

+        <script src="/views/ringo/js/skin_set_do.js.cache_v1"></script>

         <meta charset="utf-8">

         {% if imp[3][0] != 0 %}

             <title>{{imp[0]}} {{imp[3][0]}} - {{imp[1][0]}}</title>

@@ -12,13 +14,12 @@
 
         <script defer src="https://code.iconify.design/1/1.0.3/iconify.min.js"></script>

         <script defer src="/views/ringo/js/main.js.cache_v2"></script>

         <script defer src="/views/ringo/js/sidebar.js.cache_v3"></script>

-        <script defer src="/views/ringo/js/skin_set.js.cache_v6"></script>

+        <script defer src="/views/ringo/js/skin_set.js.cache_v7"></script>

         <link rel="stylesheet" href="/views/ringo/css/main.css.cache_v11">

         {% if request.cookies.get('main_css_darkmode', '') == '1' %}

             {{imp[3][5]|safe}}

             <link rel="stylesheet" href="/views/ringo/css/dark.css.cache_v3">

         {% endif %}

-        <style id="ringo_add_style"></style>

         <link rel="shortcut icon" href="/views/main_css/file/favicon.ico.cache_v1">

         {{imp[1][5]|safe}}

         {{imp[2][3]|safe}}

+ 1 - 1
views/ringo/info.json
Zobrazit soubor 

@@ -1,5 +1,5 @@
 
 {

     "name" : "Ringo",

-    "skin_ver" : "v1.1.4",

+    "skin_ver" : "v1.1.5",

     "require_ver" : "3500113"

 }

+ 0 - 42
views/ringo/js/skin_set.js
Zobrazit soubor 

@@ -41,47 +41,6 @@ function ringo_get_post() {
 
     history.go(0);
 
 }
 
 
-function ringo_do_skin_set() {
 
-    if(!window.localStorage.getItem('main_css_use_sys_darkmode') || window.localStorage.getItem('main_css_use_sys_darkmode') === '1') {
 
-        if(window.matchMedia('(prefers-color-scheme: dark)').matches) {
 
-            document.cookie = 'main_css_darkmode=1; path=/';
 
-        } else {
 
-            document.cookie = 'main_css_darkmode=0; path=/';
 
-        }
 
-    }
 
-
 
-    if(window.localStorage.getItem('main_css_off_sidebar') && window.localStorage.getItem('main_css_off_sidebar') === '1') {
 
-        document.getElementById('ringo_add_style').innerHTML += `
 
-            section {
 
-                width: auto;
 
-                display: block;
 
-                margin: auto;
 
-            }
 
-
 
-            .do_fixed {
 
-                display: none;
 
-            }
 
-        `;
 
-    }
 
-
 
-    if(window.localStorage.getItem('main_css_fixed_width') && window.localStorage.getItem('main_css_fixed_width') !== '') {
 
-        let fixed_width_data = window.localStorage.getItem('main_css_fixed_width');
 
-        document.getElementById('ringo_add_style').innerHTML += `
 
-            article.main {
 
-                max-width: ` + fixed_width_data + `px;
 
-            }
 
-        `;
 
-    }
 
-
 
-    if(window.localStorage.getItem('main_css_sidebar_right') && window.localStorage.getItem('main_css_sidebar_right') === '1') {
 
-        document.getElementById('ringo_add_style').innerHTML += `
 
-            .do_fixed {
 
-                float: right;
 
-            }
 
-        `;
 
-    }
 
-}
 
-
 
 function ringo_load_skin_set() {
 
     let cookies = document.cookie;
 
     
@@ -172,5 +131,4 @@ function ringo_load_skin_set() {
 
     }
 
 }
 
 
-window.addEventListener('DOMContentLoaded', ringo_do_skin_set);
 
 window.addEventListener('DOMContentLoaded', ringo_load_skin_set);

+ 56 - 0
views/ringo/js/skin_set_do.js
Zobrazit soubor 

@@ -0,0 +1,56 @@
 
+function ringo_do_regex_data(data) {
 
+    return new RegExp('(?:^|; )' + data + '=([^;]*)');
 
+}
 
+
 
+function ringo_do_skin_set() {
 
+    let cookies = document.cookie;
 
+
 
+    if(!window.localStorage.getItem('main_css_use_sys_darkmode') || window.localStorage.getItem('main_css_use_sys_darkmode') === '1') {
 
+        if(cookies.match(ringo_do_regex_data('main_css_darkmode')) && cookies.match(ringo_do_regex_data('main_css_darkmode'))[1] === '1') {
 
+            if(!window.matchMedia('(prefers-color-scheme: dark)').matches) {
 
+                document.cookie = 'main_css_darkmode=0; path=/';
 
+                history.go(0);
 
+            }
 
+        }
 
+        
+        if(!cookies.match(ringo_do_regex_data('main_css_darkmode')) || cookies.match(ringo_do_regex_data('main_css_darkmode'))[1] === '0') {
 
+            if(window.matchMedia('(prefers-color-scheme: dark)').matches) {
 
+                document.cookie = 'main_css_darkmode=1; path=/';
 
+                history.go(0);
 
+            }
 
+        }
 
+    }
 
+
 
+    if(window.localStorage.getItem('main_css_off_sidebar') && window.localStorage.getItem('main_css_off_sidebar') === '1') {
 
+        document.getElementById('ringo_add_style').innerHTML += `
 
+            section {
 
+                width: auto;
 
+                display: block;
 
+                margin: auto;
 
+            }
 
+
 
+            .do_fixed {
 
+                display: none;
 
+            }
 
+        `;
 
+    }
 
+
 
+    if(window.localStorage.getItem('main_css_fixed_width') && window.localStorage.getItem('main_css_fixed_width') !== '') {
 
+        let fixed_width_data = window.localStorage.getItem('main_css_fixed_width');
 
+        document.getElementById('ringo_add_style').innerHTML += `
 
+            article.main {
 
+                max-width: ` + fixed_width_data + `px;
 
+            }
 
+        `;
 
+    }
 
+
 
+    if(window.localStorage.getItem('main_css_sidebar_right') && window.localStorage.getItem('main_css_sidebar_right') === '1') {
 
+        document.getElementById('ringo_add_style').innerHTML += `
 
+            .do_fixed {
 
+                float: right;
 
+            }
 
+        `;
 
+    }
 
+}
 
+
 
+ringo_do_skin_set();