modified: basic_plugins/admin_bot_manage/_data_source.py

modified: basic_plugins/admin_bot_manage/admin_config.py modified: basic_plugins/admin_bot_manage/custom_welcome_message.py modified: basic_plugins/admin_bot_manage/timing_task.py modified: basic_plugins/apscheduler/__init__.py modified: basic_plugins/ban/__init__.py modified: basic_plugins/ban/data_source.py modified: basic_plugins/chat_history/chat_message.py modified: basic_plugins/chat_history/chat_message_handle.py modified: basic_plugins/group_handle/__init__.py modified: basic_plugins/hooks/_utils.py modified: basic_plugins/hooks/ban_hook.py modified: basic_plugins/hooks/chkdsk_hook.py modified: basic_plugins/init_plugin_config/__init__.py deleted: basic_plugins/init_plugin_config/init_group_manager.py modified: basic_plugins/invite_manager/__init__.py new file: basic_plugins/invite_manager/utils.py modified: basic_plugins/nickname.py modified: basic_plugins/plugin_shop/__init__.py modified: basic_plugins/plugin_shop/data_source.py modified: basic_plugins/scripts.py modified: basic_plugins/shop/__init__.py modified: basic_plugins/shop/buy.py modified: basic_plugins/shop/gold.py modified: basic_plugins/shop/my_props/__init__.py deleted: basic_plugins/shop/reset_today_gold.py modified: basic_plugins/shop/shop_handle/__init__.py modified: basic_plugins/shop/shop_handle/data_source.py modified: basic_plugins/shop/use/__init__.py modified: basic_plugins/shop/use/data_source.py modified: basic_plugins/super_cmd/__init__.py modified: basic_plugins/super_cmd/bot_friend_group.py modified: basic_plugins/super_cmd/clear_data.py modified: basic_plugins/super_cmd/exec_sql.py modified: basic_plugins/super_cmd/manager_group.py modified: basic_plugins/super_cmd/reload_setting.py modified: basic_plugins/super_cmd/set_admin_permissions.py deleted: basic_plugins/super_cmd/super_task_switch.py modified: basic_plugins/super_cmd/update_friend_group_info.py modified: basic_plugins/super_help/__init__.py modified: basic_plugins/update_info.py modified: configs/config.py modified: configs/utils/__init__.py modified: models/bag_user.py modified: models/ban_user.py modified: models/chat_history.py modified: models/friend_user.py modified: models/goods_info.py modified: models/group_info.py modified: models/group_member_info.py modified: models/level_user.py modified: models/sign_group_user.py modified: models/user_shop_gold_log.py modified: plugins/aconfig/__init__.py modified: plugins/ai/__init__.py modified: plugins/ai/data_source.py modified: plugins/bilibili_sub/__init__.py modified: plugins/bilibili_sub/data_source.py modified: plugins/bilibili_sub/model.py modified: plugins/black_word/__init__.py modified: plugins/black_word/model.py modified: plugins/black_word/utils.py modified: plugins/bt/data_source.py modified: plugins/genshin/almanac/__init__.py modified: plugins/genshin/material_remind/__init__.py modified: plugins/genshin/query_user/_models/__init__.py modified: plugins/genshin/query_user/_utils/__init__.py modified: plugins/genshin/query_user/bind/__init__.py modified: plugins/genshin/query_user/genshin_sign/__init__.py modified: plugins/genshin/query_user/genshin_sign/data_source.py modified: plugins/genshin/query_user/genshin_sign/init_task.py modified: plugins/genshin/query_user/mihoyobbs_sign/__init__.py modified: plugins/genshin/query_user/query_memo/__init__.py modified: plugins/genshin/query_user/query_memo/data_source.py modified: plugins/genshin/query_user/query_role/__init__.py modified: plugins/genshin/query_user/query_role/data_source.py modified: plugins/genshin/query_user/reset_today_query_user_data/__init__.py modified: plugins/genshin/query_user/resin_remind/__init__.py modified: plugins/genshin/query_user/resin_remind/init_task.py modified: plugins/gold_redbag/model.py modified: plugins/image_management/send_image/__init__.py modified: plugins/my_info/__init__.py modified: plugins/open_cases/models/buff_prices.py modified: plugins/open_cases/models/open_cases_user.py modified: plugins/open_cases/open_cases_c.py modified: plugins/open_cases/utils.py modified: plugins/parse_bilibili_json.py modified: plugins/pid_search.py modified: plugins/pix_gallery/__init__.py modified: plugins/pix_gallery/_data_source.py modified: plugins/pix_gallery/_model/omega_pixiv_illusts.py modified: plugins/pix_gallery/_model/pixiv.py modified: plugins/pix_gallery/_model/pixiv_keyword_user.py modified: plugins/pix_gallery/pix_add_keyword.py modified: plugins/pix_gallery/pix_pass_del_keyword.py modified: plugins/pix_gallery/pix_show_info.py modified: plugins/pix_gallery/pix_update.py modified: plugins/pixiv_rank_search/data_source.py modified: plugins/poke/__init__.py modified: plugins/russian/__init__.py modified: plugins/russian/data_source.py modified: plugins/russian/model.py modified: plugins/send_dinggong_voice/__init__.py modified: plugins/send_setu_/_model.py modified: plugins/send_setu_/send_setu/__init__.py modified: plugins/send_setu_/send_setu/data_source.py modified: plugins/send_setu_/update_setu/data_source.py modified: plugins/sign_in/goods_register.py modified: plugins/sign_in/group_user_checkin.py modified: plugins/sign_in/random_event.py modified: plugins/sign_in/utils.py modified: plugins/statistics/_model.py modified: plugins/statistics/statistics_handle.py modified: plugins/statistics/statistics_hook.py modified: plugins/update_picture.py modified: plugins/web_ui/api/request.py modified: plugins/word_bank/_model.py deleted: plugins/word_bank/_old_model.py modified: plugins/word_bank/_rule.py modified: plugins/word_bank/word_handle.py modified: plugins/word_clouds/data_source.py modified: resources/image/sign/sign_res/bar.png modified: resources/image/sign/sign_res/bar_white.png modified: services/db_context.py modified: services/log.py modified: utils/browser.py modified: utils/data_utils.py modified: utils/depends/__init__.py modified: utils/http_utils.py modified: utils/image_utils.py modified: utils/manager/admin_manager.py modified: utils/message_builder.py modified: utils/utils.py
2026-10-09 22:00:01 +08:00 · 2023-02-18 18:46:54 +08:00
parent a6105e8a1b
commit 7685b95031
134 changed files with 5402 additions and 6033 deletions
@@ -1,28 +1,30 @@
+from datetime import datetime
+from typing import Any, Tuple
+
+from nonebot import on_command, on_message, on_regex
 from nonebot.adapters.onebot.v11 import (
+    Bot,
    Event,
-    MessageEvent,
    GroupMessageEvent,
    Message,
-    Bot,
+    MessageEvent,
 )
 from nonebot.matcher import Matcher
 from nonebot.message import run_preprocessor
+from nonebot.params import CommandArg, RegexGroup
+from nonebot.permission import SUPERUSER
+
+from configs.config import NICKNAME, Config
+from models.ban_user import BanUser
+from services.log import logger
 from utils.image_utils import BuildImage
 from utils.manager import group_manager
-from utils.utils import get_message_text, is_number
-from nonebot.params import RegexGroup, CommandArg
-from .utils import black_word_manager
-from nonebot import on_command, on_message, on_regex
-from configs.config import Config, NICKNAME
-from nonebot.permission import SUPERUSER
-from .data_source import show_black_text_image, set_user_punish
-from services.log import logger
-from models.ban_user import BanUser
-from datetime import datetime
 from utils.message_builder import image
-from .model import BlackWord
-from typing import Tuple, Any
+from utils.utils import get_message_text, is_number

+from .data_source import set_user_punish, show_black_text_image
+from .model import BlackWord
+from .utils import black_word_manager

 __zx_plugin_name__ = "敏感词检测"
 __plugin_usage__ = """
@@ -38,7 +40,7 @@ usage：
    设置惩罚id需要通过 '记录名单u:xxxxxxxx' 获取
    指令：
        记录名单
-        设置惩罚 [user_id] [id] [punish_level]
+        设置惩罚 [user_id] [下标] [惩罚等级]
        示例：记录名单
        示例：记录名单u:12345678
        示例：设置惩罚 12345678 1 4
@@ -150,24 +152,32 @@ async def _(
    matcher: Matcher,
    event: Event,
 ):
+    msg = get_message_text(event.json())
    if (
        isinstance(event, MessageEvent)
        and event.is_tome()
-        and matcher.plugin_name == "black_word"
-        and not await BanUser.is_ban(event.user_id)
-        and str(event.user_id) not in bot.config.superusers
-        and not get_message_text(event.json()).startswith("原神绑定")
+        and not msg.startswith("原神绑定")
    ):
-        # 屏蔽群权限-1的群
-        if isinstance(event, GroupMessageEvent) and group_manager.get_group_level(event.group_id) < 0:
-            return
-        user_id = event.user_id
-        group_id = event.group_id if isinstance(event, GroupMessageEvent) else None
-        msg = get_message_text(event.json())
-        if await black_word_manager.check(user_id, group_id, msg) and Config.get_config(
-            "black_word", "CONTAIN_BLACK_STOP_PROPAGATION"
+        # if str(event.user_id) not in bot.config.superusers:
+        #     return logger.debug(f"超级用户跳过黑名单词汇检查 Message: {msg}", target=event.user_id)
+        if (
+            event.is_tome()
+            and matcher.plugin_name == "black_word"
+            and not await BanUser.is_ban(event.user_id)
        ):
-            matcher.stop_propagation()
+            # 屏蔽群权限-1的群
+            if (
+                isinstance(event, GroupMessageEvent)
+                and group_manager.get_group_level(event.group_id) < 0
+            ):
+                return
+            user_id = event.user_id
+            group_id = event.group_id if isinstance(event, GroupMessageEvent) else None
+            msg = get_message_text(event.json())
+            if await black_word_manager.check(
+                user_id, group_id, msg
+            ) and Config.get_config("black_word", "CONTAIN_BLACK_STOP_PROPAGATION"):
+                matcher.stop_propagation()


@show_black.handle()
@@ -1,47 +1,34 @@
-from services.db_context import db
-from typing import Optional, List
 from datetime import datetime, timedelta
+from typing import List, Optional
+
+from tortoise import fields
+
+from services.db_context import Model


-class BlackWord(db.Model):
-    __tablename__ = "black_word"
+class BlackWord(Model):
+    # __tablename__ = "black_word"

-    id = db.Column(db.Integer(), primary_key=True, autoincrement=True)
-    user_qq = db.Column(db.BigInteger(), nullable=False, primary_key=True)
-    group_id = db.Column(db.BigInteger())
-    plant_text = db.Column(db.String())
-    black_word = db.Column(db.String())
-    punish = db.Column(db.String(), default="")
-    punish_level = db.Column(db.Integer())
-    create_time = db.Column(db.DateTime(timezone=True), nullable=False)
+    id = fields.IntField(pk=True, generated=True, auto_increment=True)
+    """自增id"""
+    user_qq = fields.BigIntField()
+    """用户id"""
+    group_id = fields.BigIntField(null=True)
+    """群聊id"""
+    plant_text = fields.TextField()
+    """检测文本"""
+    black_word = fields.TextField()
+    """黑名单词语"""
+    punish = fields.TextField(default="")
+    """惩罚内容"""
+    punish_level = fields.IntField()
+    """惩罚等级"""
+    create_time = fields.DatetimeField(auto_now_add=True)
+    """创建时间"""

-    @classmethod
-    async def add_user_black_word(
-        cls,
-        user_qq: int,
-        group_id: Optional[int],
-        black_word: str,
-        plant_text: str,
-        punish_level: int,
-    ):
-        """
-        说明:
-            添加用户发送的敏感词
-        参数:
-            :param user_qq: 用户id
-            :param group_id: 群号
-            :param black_word: 黑名单词汇
-            :param plant_text: 消息文本
-            :param punish_level: 惩罚等级
-        """
-        await cls.create(
-            user_qq=user_qq,
-            group_id=group_id,
-            plant_text=plant_text,
-            black_word=black_word,
-            punish_level=punish_level,
-            create_time=datetime.now(),
-        )
+    class Meta:
+        table = "black_word"
+        table_description = "惩罚机制数据表"

    @classmethod
    async def set_user_punish(
@@ -63,17 +50,21 @@ class BlackWord(db.Model):
        user = None
        if (not black_word and not id_) or not punish:
            return False
-        query = cls.query.where(cls.user_qq == user_qq).with_for_update()
        if black_word:
-            user = await query.where(cls.black_word == black_word).order_by(cls.id.desc()).gino.first()
+            user = (
+                await cls.filter(user_qq=user_qq, black_word=black_word)
+                .order_by("id")
+                .first()
+            )
        elif id_:
-            user_list = await query.gino.all()
+            user_list = await cls.filter(user_qq=user_qq).order_by("id").all()
            if len(user_list) == 0 or (id_ < 0 or id_ > len(user_list)):
                return False
            user = user_list[id_]
        if not user:
            return False
-        await user.update(punish=cls.punish + punish + " ").apply()
+        user.punish = f"{user.punish}{punish} "
+        await user.save(update_fields=["punish"])
        return True

    @classmethod
@@ -88,15 +79,14 @@ class BlackWord(db.Model):
            :param days: 周期天数
            :param punish_level: 惩罚等级
        """
-        setattr(BlackWord, "count", db.func.count(cls.id).label("count"))
-        query = cls.select("count").where(
-            (cls.user_qq == user_qq)
-            & (cls.punish_level != -1)
-            & (cls.create_time > datetime.now() - timedelta(days=days))
+        query = cls.filter(
+            user_qq=user_qq,
+            create_time__gte=datetime.now() - timedelta(days=days),
+            punish_level__not_in=[-1],
        )
        if punish_level is not None:
-            query = query.where(cls.punish_level == punish_level)
-        return (await query.gino.first())[0]
+            query = query.filter(punish_level=punish_level)
+        return await query.count()

    @classmethod
    async def get_user_punish_level(cls, user_qq: int, days: int = 7) -> Optional[int]:
@@ -108,12 +98,14 @@ class BlackWord(db.Model):
            :param days: 周期天数
        """
        if (
-            query := await cls.query.where(cls.user_qq == user_qq)
-            .where(cls.create_time > datetime.now() - timedelta(days=days))
-            .order_by(cls.id.desc())
-            .gino.first()
+            user := await cls.filter(
+                user_qq=user_qq,
+                create_time__gte=datetime.now() - timedelta(days=days),
+            )
+            .order_by("id")
+            .first()
        ):
-            return query.punish_level
+            return user.punish_level
        return None

    @classmethod
@@ -133,16 +125,18 @@ class BlackWord(db.Model):
            :param date: 日期
            :param date_type: 日期查询类型
        """
-        query = cls.query
+        query = cls
        if user_qq:
-            query = query.where(cls.user_qq == user_qq)
+            query = query.filter(user_qq=user_qq)
        if group_id:
-            query = query.where(cls.group_id == group_id)
+            query = query.filter(group_id=group_id)
        if date:
            if date_type == "=":
-                query = query.where(cls.create_time == date)
+                query = query.filter(
+                    create_time__range=[date, date + timedelta(days=1)]
+                )
            elif date_type == ">":
-                query = query.where(cls.create_time > date)
+                query = query.filter(create_time__gte=date)
            elif date_type == "<":
-                query = query.where(cls.create_time < date)
-        return await query.gino.all()
+                query = query.filter(create_time__lte=date)
+        return await query.order_by("id").all()
@@ -1,15 +1,18 @@
-from utils.utils import cn2py, get_bot
-from configs.path_config import DATA_PATH
-from typing import Optional, Union, Tuple
-from .model import BlackWord
-from configs.config import Config
-from pathlib import Path
-from services.log import logger
-from models.ban_user import BanUser
-from nonebot.adapters.onebot.v11 import ActionFailed
-from models.group_member_info import GroupInfoUser
-from utils.http_utils import AsyncHttpx
 import random
+from pathlib import Path
+from typing import Optional, Tuple, Union
+
+from nonebot.adapters.onebot.v11 import ActionFailed
+
+from configs.config import Config
+from configs.path_config import DATA_PATH
+from models.ban_user import BanUser
+from models.group_member_info import GroupInfoUser
+from services.log import logger
+from utils.http_utils import AsyncHttpx
+from utils.utils import cn2py, get_bot
+
+from .model import BlackWord

 try:
    import ujson as json
@@ -49,7 +52,7 @@ class BlackWordManager:
                "hanbi",
                "hanpi",
                "laji",
-                "fw"
+                "fw",
            ],
            "5": [],
        }
@@ -94,9 +97,9 @@ class BlackWordManager:
                    user_id, group_id, data[0], message, int(data[1])
                )
                return True
-        if Config.get_config(
-            "black_word", "ALAPI_CHECK_FLAG"
-        ) and not await check_text(message):
+        if Config.get_config("black_word", "ALAPI_CHECK_FLAG") and not await check_text(
+            message
+        ):
            await send_msg(
                0, None, f"USER {user_id} GROUP {group_id} ALAPI 疑似检测：{message}"
            )
@@ -146,8 +149,12 @@ async def _add_user_black_word(
        "black_word", "AUTO_ADD_PUNISH_LEVEL"
    ) and user_count > Config.get_config("black_word", "ADD_PUNISH_LEVEL_TO_COUNT"):
        punish_level -= 1
-    await BlackWord.add_user_black_word(
-        user_id, group_id, black_word, message, punish_level
+    await BlackWord.create(
+        user_qq=user_id,
+        group_id=group_id,
+        plant_text=message,
+        black_word=black_word,
+        punish_level=punish_level,
    )
    logger.info(
        f"已将 USER {user_id} GROUP {group_id} 添加至黑名单词汇记录 Black_word：{black_word} Plant_text：{message}"
@@ -172,7 +179,9 @@ async def _punish_handle(
    # 用户周期内触发punish_level级惩罚的次数
    user_count = await BlackWord.get_user_count(user_id, cycle_days, punish_level)
    # 获取最近一次的惩罚等级，将在此基础上增加
-    punish_level = await BlackWord.get_user_punish_level(user_id, cycle_days) or punish_level
+    punish_level = (
+        await BlackWord.get_user_punish_level(user_id, cycle_days) or punish_level
+    )
    # 容忍次数：List[int]
    tolerate_count = Config.get_config("black_word", "TOLERATE_COUNT")
    if not tolerate_count or len(tolerate_count) < 5:
@@ -226,15 +235,17 @@ async def _get_punish(
    ban_4_duration = Config.get_config("black_word", "BAN_4_DURATION")
    # 口头警告内容
    warning_result = Config.get_config("black_word", "WARNING_RESULT")
-    try:
-        uname = (await GroupInfoUser.get_member_info(user_id, group_id)).user_name
-    except AttributeError:
+    if user := await GroupInfoUser.get_or_none(user_qq=user_id, group_id=group_id):
+        uname = user.user_name
+    else:
        uname = user_id
    # 永久ban
    if id_ == 1:
        if str(user_id) not in bot.config.superusers:
            await BanUser.ban(user_id, 10, 99999999)
-            await send_msg(user_id, group_id, f"BlackWordChecker 永久ban USER {uname}({user_id})")
+            await send_msg(
+                user_id, group_id, f"BlackWordChecker 永久ban USER {uname}({user_id})"
+            )
            logger.info(f"BlackWord 永久封禁 USER {user_id}...")
    # 删除好友（有的话
    elif id_ == 2:
@@ -319,4 +330,7 @@ async def check_text(text: str) -> bool:
    return True


-black_word_manager = BlackWordManager(DATA_PATH / "black_word" / "black_word.json", DATA_PATH / "black_word" / "black_py.json")
+black_word_manager = BlackWordManager(
+    DATA_PATH / "black_word" / "black_word.json",
+    DATA_PATH / "black_word" / "black_py.json",
+)