Explorar el Código

최근 토론 Golang 기반 변경

잉여개발기 hace 4 meses
padre
commit
cdcd98afd3

+ 2 - 2
app.py

@@ -667,8 +667,8 @@ app.route('/recent_change')(golang_view())
 app.route('/recent_changes')(golang_view())
 app.route('/recent_change/<int:num>/<set_type>')(golang_view())
 
-app.route('/recent_discuss', defaults = { 'tool' : 'normal' })(list_recent_discuss)
-app.route('/recent_discuss/<int:num>/<tool>')(list_recent_discuss)
+app.route('/recent_discuss')(golang_view())
+app.route('/recent_discuss/<int:num>/<tool>')(golang_view())
 
 # Func-history
 app.route('/recent_edit_request')(recent_edit_request)

+ 0 - 1
route/__init__.py

@@ -156,7 +156,6 @@ from route.vote_end import vote_end
 from route.vote_list import vote_list
 from route.vote_select import vote_select
 
-from route.n_list_recent_discuss import list_recent_discuss
 from route.n_list_recent_block import list_recent_block
 from route.n_list_user_check_submit import list_user_check_submit
 

+ 0 - 19
route/n_list_recent_discuss.py

@@ -1,19 +0,0 @@
-from .tool.func import *
-
-async def list_recent_discuss(num = 1, tool = 'normal'):
-    m_sub = 0
-    if tool == 'close':
-        m_sub = '(' + await get_lang('close_discussion') + ')'
-    elif tool == 'open':
-        m_sub = '(' + await get_lang('open_discussion') + ')'
-
-    return await render_template(
-        await get_lang('recent_discussion'),
-        '' + \
-            '<div id="opennamu_list_recent_discuss"></div>' + \
-            '<script defer src="/views/main_css/js/route/list_recent_discuss.js' + cache_v() + '"></script>' + \
-            '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_list_recent_discuss(); });</script>' + \
-        '',
-        m_sub,
-        [['other', await get_lang('return')]]
-    )

+ 3 - 1
route/tool/func.py

@@ -162,7 +162,9 @@ async def python_to_golang(func_name, other_set = {}, path = ''):
     if func_name == "same":
         async with aiohttp.ClientSession() as session:
             if flask.request.method == 'POST':
-                async with session.post('http://localhost:' + port_data + flask.request.path, data = json_dumps(other_set), headers = headers) as res:
+                form_data = flask.request.form.to_dict(flat = False)
+
+                async with session.post('http://localhost:' + port_data + flask.request.path, data = form_data, headers = headers) as res:
                     data = await res.text()
 
                     return data

+ 0 - 93
views/main_css/js/route/list_recent_discuss.js

@@ -1,93 +0,0 @@
-"use strict";
-
-function opennamu_list_recent_discuss() {
-    const url = window.location.pathname;
-    const url_split = url.split('/');
-    
-    let set_type = '';
-    let num = '';
-    if(url_split.length === 2) {
-        set_type = 'normal';
-        num = '1';
-    } else {
-        set_type = url_split[3];
-        num = url_split[2];
-    }
-
-    let lang_data = new FormData();
-    lang_data.append('data', 'normal close_discussion open_discussion admin_tool closed stop agreed_discussion');
-
-    fetch('/api/v2/lang', {
-        method : 'POST',
-        body : lang_data,
-    }).then(function(res) {
-        return res.json();
-    }).then(function(lang) {
-        lang = lang["data"];
-        
-        fetch('/api/v2/recent_discuss/' + set_type + '/' + num).then(function(res) {
-            return res.json();
-        }).then(function(data) {
-            let auth = data["auth"];
-            data = data["data"];
-
-            let data_html = '';
-
-            let option_list = [
-                ['normal', lang['normal']],
-                ['close', lang['close_discussion']],
-                ['open', lang['open_discussion']]
-            ];
-            for(let for_a = 0; for_a < option_list.length; for_a++) {
-                data_html += '<a href="/recent_discuss/1/' + option_list[for_a][0] + '">(' + option_list[for_a][1] + ')</a> ';
-            }
-
-            data_html += '<hr class="main_hr">';
-
-            if(auth["hidel"] === true) {
-                data_html += '<a id="opennamu_list_admin_tool_button" href="javascript:void(0);">(' + lang["admin_tool"] + ')</a>';
-
-                data_html += '<span id="opennamu_list_admin_tool" style="display: none;">';
-                data_html += 'test';
-                data_html += '</span>';
-
-                data_html += '<span class="opennamu_popup_footnote" style="display: none;" id="opennamu_list_admin_tool_button_load">';
-                data_html += '</span>';
-
-                data_html += '<hr class="main_hr">';
-            }
-
-            for(let for_a = 0; for_a < data.length; for_a++) {
-                let doc_name = opennamu_do_url_encode(data[for_a][0]);
-
-                let left = '<a href="/thread/' + data[for_a][3] + '">' + opennamu_xss_filter(data[for_a][1]) + '</a> ';
-                left += '<a href="/w/' + doc_name + '">(' + opennamu_xss_filter(data[for_a][0]) + ')</a> ';
-
-                if(auth["hidel"] === true) {
-                    left = '<label><input type="checkbox"> ' + left + '</label>';
-                }
-
-                let right = '';
-                if(data[for_a][4] === 'O') {
-                    right += lang['closed'] + ' | ';
-                } else if(data[for_a][4] === 'S') {
-                    right += lang['stop'] + ' | ';
-                }
-
-                if(data[for_a][8] !== '') {
-                    right += lang['agreed_discussion'] + ' | ';
-                }
-
-                right += '<a href="/thread/' + data[for_a][3] + '#' + data[for_a][7] + '">#' + data[for_a][7] + '</a> | ';
-                right += data[for_a][6] + ' | ';
-                right += data[for_a][2];
-
-                data_html += opennamu_make_list(left, right);
-            }
-
-            data_html += opennamu_page_control('/recent_discuss/{}/' + set_type, Number(num), data.length);
-
-            document.getElementById('opennamu_list_recent_discuss').innerHTML = data_html;
-        });
-    });
-}