From d379e30cb27927a388308fc3501ba8f5a7cd74c2 Mon Sep 17 00:00:00 2001 From: adk23333 <2633103794@qq.com> Date: Wed, 10 Apr 2024 01:20:18 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=8F=92=E4=BB=B6=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tieba-admin-server/plugins/review/reviewer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tieba-admin-server/plugins/review/reviewer.py b/tieba-admin-server/plugins/review/reviewer.py index 5714158..8e2e319 100644 --- a/tieba-admin-server/plugins/review/reviewer.py +++ b/tieba-admin-server/plugins/review/reviewer.py @@ -204,7 +204,7 @@ async def on_start(self): async def on_running(self): user: User = await self.FUP.user self.client = await Client(user.BDUSS, user.STOKEN).__aenter__() - await asyncio.gather(*[self.run_with_client(self.client)], return_exceptions=True) + await asyncio.gather(*[self.run_with_client(self.client)]) async def on_stop(self): try: From 23b7f752b52349165eb6253708829b61b95c6455 Mon Sep 17 00:00:00 2001 From: adk23333 <2633103794@qq.com> Date: Wed, 10 Apr 2024 01:25:03 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:?= =?UTF-8?q?=20nothing=20to=20repeat=20at=20position=200?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tieba-admin-server/plugins/review/checker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tieba-admin-server/plugins/review/checker.py b/tieba-admin-server/plugins/review/checker.py index 9a5b10e..e1bdc7f 100644 --- a/tieba-admin-server/plugins/review/checker.py +++ b/tieba-admin-server/plugins/review/checker.py @@ -139,7 +139,7 @@ async def check_keyword(t: Union[Thread, Post, Comment], client: Client): if t.user.level in Level.LOW.value: keywords = await Keyword.all() for kw in keywords: - if re.search(kw.keyword, t.text): + if re.search(fr"[{kw.keyword}]", t.text): return delete(client, t) return empty() From 18d8d06876b545d6443753359f880d6b754d18a9 Mon Sep 17 00:00:00 2001 From: adk23333 <2633103794@qq.com> Date: Wed, 10 Apr 2024 14:50:00 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tieba-admin-web/src/pages/Manager.vue | 2 +- tieba-admin-web/src/pages/Module.vue | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tieba-admin-web/src/pages/Manager.vue b/tieba-admin-web/src/pages/Manager.vue index c3cd19a..f8e9745 100644 --- a/tieba-admin-web/src/pages/Manager.vue +++ b/tieba-admin-web/src/pages/Manager.vue @@ -117,7 +117,7 @@ function submit(del = 0) { - + From 8911589597bd7b42b55efd0da54c393ced101782 Mon Sep 17 00:00:00 2001 From: adk23333 <2633103794@qq.com> Date: Thu, 11 Apr 2024 21:47:05 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AD=A3=E5=88=99?= =?UTF-8?q?=E8=A1=A8=E8=BE=BE=E5=BC=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tieba-admin-server/plugins/review/checker.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tieba-admin-server/plugins/review/checker.py b/tieba-admin-server/plugins/review/checker.py index e1bdc7f..76f823f 100644 --- a/tieba-admin-server/plugins/review/checker.py +++ b/tieba-admin-server/plugins/review/checker.py @@ -1,4 +1,3 @@ -import re from enum import Enum from typing import Union, Callable, Coroutine, Dict, Any, Literal, List @@ -139,7 +138,7 @@ async def check_keyword(t: Union[Thread, Post, Comment], client: Client): if t.user.level in Level.LOW.value: keywords = await Keyword.all() for kw in keywords: - if re.search(fr"[{kw.keyword}]", t.text): + if t.text.find(kw.keyword) != -1: return delete(client, t) return empty() From d1020bc00c20cb90c28974124e618982ecc42426 Mon Sep 17 00:00:00 2001 From: adk23333 <2633103794@qq.com> Date: Thu, 11 Apr 2024 21:52:47 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E5=AF=B9=E7=AD=89=E7=BA=A7=E5=A2=99?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=9B=B4=E7=BB=86=E8=87=B4=E7=9A=84=E5=88=86?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tieba-admin-server/plugins/review/checker.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tieba-admin-server/plugins/review/checker.py b/tieba-admin-server/plugins/review/checker.py index 76f823f..858201b 100644 --- a/tieba-admin-server/plugins/review/checker.py +++ b/tieba-admin-server/plugins/review/checker.py @@ -151,8 +151,17 @@ async def check_black(t: Union[Thread, Post, Comment], client: Client): return empty() -@manager.thread() -async def ban_low_user(thread: Thread, client: Client): - if thread.user.level == 1: +def _level_wall(level: int, thread: Thread, client: Client): + if thread.user.level == level: return delete(client, thread) return empty() + + +@manager.thread() +async def level_wall_1(thread: Thread, client: Client): + return _level_wall(1, thread, client) + + +@manager.thread() +async def level_wall_3(thread: Thread, client: Client): + return _level_wall(3, thread, client) From 1192df892dd40bcd496090a3eb21898b7c03220f Mon Sep 17 00:00:00 2001 From: adk23333 <2633103794@qq.com> Date: Thu, 11 Apr 2024 21:54:33 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=A0=B7=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tieba-admin-server/plugins/review/test_reviewer.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tieba-admin-server/plugins/review/test_reviewer.py b/tieba-admin-server/plugins/review/test_reviewer.py index 6516b5a..4e9d5f7 100644 --- a/tieba-admin-server/plugins/review/test_reviewer.py +++ b/tieba-admin-server/plugins/review/test_reviewer.py @@ -1,5 +1,7 @@ import unittest +from tortoise import Tortoise + from .reviewer import Reviewer @@ -7,9 +9,15 @@ class MyTestCase(unittest.IsolatedAsyncioTestCase): def __init__(self, method_name='runTest'): super().__init__(method_name) + async def test_init(self): + await Tortoise.init(db_url="sqlite://../../.cache/db.sqlite", + modules={"models": ["core.models", "review.models"]}) + await Reviewer.init_plugin() + async def test_run(self): reviewer = Reviewer() reviewer.PLUGIN_MODEL = "review.models" + await reviewer._start_plugin_with_process( db_url="sqlite://../../.cache/db.sqlite", log_level="DEBUG", From d77ec10ff32d7428db0bc64c0f1a29208ff26475 Mon Sep 17 00:00:00 2001 From: adk23333 <2633103794@qq.com> Date: Fri, 12 Apr 2024 17:33:24 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=B9=E4=B8=AD?= =?UTF-8?q?=E6=96=87=E7=BF=BB=E8=AF=91=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=B4=E5=83=8F=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tieba-admin-web/index.html | 2 +- tieba-admin-web/src/App.vue | 57 ++++++++++++++++++-------------- tieba-admin-web/src/store/app.ts | 7 ++++ 3 files changed, 41 insertions(+), 25 deletions(-) diff --git a/tieba-admin-web/index.html b/tieba-admin-web/index.html index b7ecd6b..ad8d656 100644 --- a/tieba-admin-web/index.html +++ b/tieba-admin-web/index.html @@ -1,5 +1,5 @@ - + diff --git a/tieba-admin-web/src/App.vue b/tieba-admin-web/src/App.vue index adf8ae5..7808893 100644 --- a/tieba-admin-web/src/App.vue +++ b/tieba-admin-web/src/App.vue @@ -7,24 +7,24 @@ + mobile-breakpoint="sm" + v-model="drawer" + expand-on-hover rail width="260"> - + :to="'/'+select_info[0].uri"/> + :prepend-icon="i.icon" + :title="i.title" + :value="i.uri" + :key="i.uri" + :to="'/'+i.uri">