최근 차단 기능 통합

app.py

@@ -646,22 +646,22 @@ app.route('/auth/give/fix/<user_name>', methods = ['POST', 'GET'])(give_user_fix
 app.route('/app_submit', methods = ['POST', 'GET'])(recent_app_submit)
 
 # /auth/history
-app.route('/recent_block')(list_recent_block)
-app.route('/recent_block/all')(list_recent_block)
-app.route('/recent_block/all/<int:num>')(list_recent_block)
-app.route('/recent_block/all/<int:num>/<everything:why>')(list_recent_block)
-app.route('/recent_block/user/<user_name>', defaults = { 'tool' : 'user' })(list_recent_block)
-app.route('/recent_block/user/<user_name>/<int:num>', defaults = { 'tool' : 'user' })(list_recent_block)
-app.route('/recent_block/admin/<user_name>', defaults = { 'tool' : 'admin' })(list_recent_block)
-app.route('/recent_block/admin/<user_name>/<int:num>', defaults = { 'tool' : 'admin' })(list_recent_block)
-app.route('/recent_block/regex', defaults = { 'tool' : 'regex' })(list_recent_block)
-app.route('/recent_block/regex/<int:num>', defaults = { 'tool' : 'regex' })(list_recent_block)
-app.route('/recent_block/cidr', defaults = { 'tool' : 'cidr' })(list_recent_block)
-app.route('/recent_block/cidr/<int:num>', defaults = { 'tool' : 'cidr' })(list_recent_block)
-app.route('/recent_block/private', defaults = { 'tool' : 'private' })(list_recent_block)
-app.route('/recent_block/private/<int:num>', defaults = { 'tool' : 'private' })(list_recent_block)
-app.route('/recent_block/ongoing', defaults = { 'tool' : 'ongoing' })(list_recent_block)
-app.route('/recent_block/ongoing/<int:num>', defaults = { 'tool' : 'ongoing' })(list_recent_block)
+app.route('/recent_block')(golang_view())
+app.route('/recent_block/all')(golang_view())
+app.route('/recent_block/all/<int:num>')(golang_view())
+app.route('/recent_block/all/<int:num>/<everything:why>')(golang_view())
+app.route('/recent_block/user/<user_name>')(golang_view())
+app.route('/recent_block/user/<user_name>/<int:num>')(golang_view())
+app.route('/recent_block/admin/<user_name>')(golang_view())
+app.route('/recent_block/admin/<user_name>/<int:num>')(golang_view())
+app.route('/recent_block/regex')(golang_view())
+app.route('/recent_block/regex/<int:num>')(golang_view())
+app.route('/recent_block/cidr')(golang_view())
+app.route('/recent_block/cidr/<int:num>')(golang_view())
+app.route('/recent_block/private')(golang_view())
+app.route('/recent_block/private/<int:num>')(golang_view())
+app.route('/recent_block/ongoing')(golang_view())
+app.route('/recent_block/ongoing/<int:num>')(golang_view())
 
 app.route('/recent_change')(golang_view())
 app.route('/recent_changes')(golang_view())

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_block import list_recent_block
 from route.n_list_user_check_submit import list_user_check_submit
 
 from route.n_topic_list import topic_list

route/n_list_recent_block.py

@@ -1,27 +0,0 @@
-from .tool.func import *
-
-async def list_recent_block(user_name = 'Test', tool = 'all', num = 1, why = ''):
-    sub = 0
-    if tool == 'ongoing':
-        sub = '(' + await get_lang('in_progress') + ')'
-    elif tool == 'regex':
-        sub = '(' + await get_lang('regex') + ')'
-    elif tool == 'user':
-        sub = '(' + await get_lang('blocked') + ')'
-    elif tool == 'cidr':
-        sub = '(' + await get_lang('cidr') + ')'
-    elif tool == 'private':
-        sub = '(' + await get_lang('private') + ')'
-    elif tool == 'admin':
-        sub = '(' + await get_lang('admin') + ')'
-
-    return await render_template(
-        await get_lang('recent_ban'),
-        '' + \
-            '<div id="opennamu_list_recent_block"></div>' + \
-            '<script defer src="/views/main_css/js/route/list_recent_block.js' + cache_v() + '"></script>' + \
-            '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_list_recent_block(); });</script>' + \
-        '',
-        sub,
-        [['other', await get_lang('return')]]
-    )

views/main_css/js/route/list_recent_block.js

@@ -1,155 +0,0 @@
-"use strict";
-
-function opennamu_list_recent_block() {
-    const url = window.location.pathname;
-    const url_split = url.split('/');
-
-    let tool = 'all';
-    let page = '1';
-    let user_name = '';
-    let why = '';
-    let add_path = '';
-    if(url_split.length > 2) {
-        tool = url_split[2];
-
-        if(tool === 'user' || tool === 'admin') {
-            add_path = '_user';
-
-            if(url_split.length > 3) {
-                user_name = '/' + url_split[3];
-
-                if(url_split.length > 4) {
-                    page = url_split[4];
-                }
-            }
-        } else {
-            if(url_split.length > 3) {
-                page = url_split[3];
-
-                if(url_split.length > 4) {
-                    why = '/' + url_split.slice(4).join('/');
-                }
-            }
-        }
-    }
-
-    let lang_data = new FormData();
-    lang_data.append('data', ["data", 'private', 'cidr', 'regex', "release", "limitless"].join(' '));
-
-    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_block' + add_path + '/' + tool + '/' + page + user_name + why).then(function(res) {
-            return res.json();
-        }).then(function(data) {
-            let auth = data["auth"];
-            data = data["data"];
-
-            let data_html = '';
-
-            let option_list = [['all', 'all'], ['regex', 'regex'], ['cidr', 'cidr'], ['private', 'private'], ['ongoing', 'in_progress']];
-            for(let for_a = 0; for_a < option_list.length; for_a++) {
-                data_html += '<a href="/recent_block/' + option_list[for_a][0] + '">(' + lang[option_list[for_a][1]] + ')</a> ';
-            }
-
-            option_list = [['/manager/11', 'blocked'], ['/manager/12', 'admin'], ['/manager/19', 'why']];
-            for(let for_a = 0; for_a < option_list.length; for_a++) {
-                data_html += '<a href="' + option_list[for_a][0] + '">(' + lang[option_list[for_a][1]] + ')</a> ';
-            }
-
-            data_html += '<hr class="main_hr">';
-
-            /*
-                data_list = append(data_list, []string{
-                    why,
-                    ip_pre_block,
-                    ip_render_block,
-                    ip_pre_blocker,
-                    ip_render_blocker,
-                    end,
-                    today,
-                    band,
-                    ongoing,
-                })
-            */
-            for(let for_a = 0; for_a < data.length; for_a++) {
-                let left = '';
-
-                let ban_auth = (auth["owner"] === true || auth["ban"] === true);
-                let ip = data[for_a][1];
-                if(data[for_a][7] === '') {
-                    if(ban_auth) {
-                        ip = '<a href="/auth/ban/' + opennamu_do_url_encode(data[for_a][1]) + '">' + ip + '</a>';
-                    }
-                    
-                    if(data[for_a][8] === '1') {
-                        ip = '<s>' + ip + '</s>';
-                    }
-                } else if(data[for_a][7] === 'private') {
-                    if(ban_auth) {
-                        ip = '<a href="/auth/ban/' + opennamu_do_url_encode(data[for_a][1]) + '">' + ip + '</a>';
-                    }
-
-                    if(data[for_a][8] === '1') {
-                        ip = '<s>' + ip + '</s>';
-                    }
-
-                    ip += ' (' + lang['private'] + ')';
-                } else if(data[for_a][7] === 'cidr') {
-                    if(ban_auth) {
-                        ip = '<a href="/auth/ban_cidr/' + opennamu_do_url_encode(data[for_a][1]) + '">' + ip + '</a>';
-                    }
-
-                    if(data[for_a][8] === '1') {
-                        ip = '<s>' + ip + '</s>';
-                    }
-
-                    ip += ' (' + lang['cidr'] + ')';
-                } else {
-                    if(ban_auth) {
-                        ip = '<a href="/auth/ban_regex/' + opennamu_do_url_encode(data[for_a][1]) + '">' + ip + '</a>';
-                    }
-
-                    if(data[for_a][8] === '1') {
-                        ip = '<s>' + ip + '</s>';
-                    }
-
-                    ip += ' (' + lang['regex'] + ')';
-                }
-                
-                left += ip + ' ← ' + data[for_a][4];
-
-                let end = "";
-                if(data[for_a][5] === "release") {
-                    end = lang["release"];
-                } else if(data[for_a][5] === "") {
-                    end = lang["limitless"];
-                } else {
-                    end = data[for_a][5];
-                }
-
-                let right = end + '<br>' + data[for_a][6];
-
-                let bottom = '';
-                if(data[for_a][0] !== "") {
-                    if(data[for_a][0] === "edit filter") {
-                        bottom = '<a href="/edit_filter/' + opennamu_do_url_encode(data[for_a][1]) + '">edit filter</a>'
-                    } else {
-                        bottom = opennamu_send_render(opennamu_xss_filter(data[for_a][0]));
-                    }
-                }
-
-                data_html += opennamu_make_list(left, right, bottom);
-            }
-
-            data_html += opennamu_page_control('/recent_block/' + tool + user_name + '/{}' + why, Number(page), data.length);
-
-            document.getElementById('opennamu_list_recent_block').innerHTML = data_html;
-        });
-    });
-}