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-11 06:39:59 +08:00 · 2023-02-18 18:46:54 +08:00
parent a6105e8a1b
commit 7685b95031
134 changed files with 5402 additions and 6033 deletions
@@ -1,116 +1,48 @@
 from datetime import datetime
+from typing import List, Optional, Set
+
+from tortoise import fields
+
 from configs.config import Config
-from services.db_context import db
-from typing import List, Optional
+from services.db_context import Model


-class GroupInfoUser(db.Model):
-    __tablename__ = "group_info_users"
+class GroupInfoUser(Model):

-    id = db.Column(db.Integer(), primary_key=True)
-    user_qq = db.Column(db.BigInteger(), nullable=False)
-    user_name = db.Column(db.Unicode(), nullable=False)
-    group_id = db.Column(db.BigInteger(), nullable=False)
-    user_join_time = db.Column(db.DateTime(), nullable=False)
-    nickname = db.Column(db.Unicode())
-    uid = db.Column(db.BigInteger())
+    id = fields.IntField(pk=True, generated=True, auto_increment=True)
+    """自增id"""
+    user_qq = fields.BigIntField()
+    """用户id"""
+    user_name = fields.CharField(255, default="")
+    """用户昵称"""
+    group_id = fields.BigIntField()
+    """群聊id"""
+    user_join_time = fields.DatetimeField(null=True)
+    """用户入群时间"""
+    nickname = fields.CharField(255, null=True)
+    """群聊昵称"""
+    uid = fields.BigIntField(null=True)
+    """用户uid"""

-    _idx1 = db.Index("info_group_users_idx1", "user_qq", "group_id", unique=True)
+    class Meta:
+        table = "group_info_users"
+        table_description = "群员信息数据表"
+        unique_together = ("user_qq", "group_id")

    @classmethod
-    async def add_member_info(
-        cls,
-        user_qq: int,
-        group_id: int,
-        user_name: str,
-        user_join_time: datetime,
-        uid: Optional[int] = None,
-    ) -> bool:
-        """
-        说明:
-            添加群内用户信息
-        参数:
-            :param user_qq: qq号
-            :param group_id: 群号
-            :param user_name: 用户名称
-            :param user_join_time: 入群时间
-            :param uid: 用户唯一 id（自动生成）
-        """
-        query = cls.query.where(
-            (cls.user_qq == user_qq) & (cls.group_id == group_id)
-        )
-        try:
-            if not await query.gino.first():
-                await cls.create(
-                    user_qq=user_qq,
-                    user_name=user_name,
-                    group_id=group_id,
-                    user_join_time=user_join_time,
-                    uid=uid
-                )
-            return True
-        except Exception:
-            return False
-
-    @classmethod
-    async def get_member_info(
-        cls, user_qq: int, group_id: int
-    ) -> "GroupInfoUser":
-        """
-        说明:
-            查询群员信息
-        参数:
-            :param user_qq: qq号
-            :param group_id: 群号
-        """
-        query = cls.query.where(
-            (cls.user_qq == user_qq) & (cls.group_id == group_id)
-        )
-        return await query.gino.first()
-
-    @classmethod
-    async def delete_member_info(cls, user_qq: int, group_id: int) -> bool:
-        """
-        说明:
-            删除群员信息
-        参数:
-            :param user_qq: qq号
-            :param group_id: 群号
-        """
-        query = cls.query.where(
-            (cls.user_qq == user_qq) & (cls.group_id == group_id)
-        )
-        query = query.with_for_update()
-        user = await query.gino.first()
-        try:
-            if user is None:
-                return True
-            else:
-                await cls.delete.where(
-                    (cls.user_qq == user_qq) & (cls.group_id == group_id)
-                ).gino.status()
-                return True
-        except Exception:
-            return False
-
-    @classmethod
-    async def get_group_member_id_list(cls, group_id: int) -> List[int]:
+    async def get_group_member_id_list(cls, group_id: int) -> Set[int]:
        """
        说明:
            获取该群所有用户qq
        参数:
            :param group_id: 群号
        """
-        member_list = []
-        query = cls.query.where((cls.group_id == group_id))
-        for user in await query.gino.all():
-            member_list.append(user.user_qq)
-        return member_list
+        return set(
+            await cls.filter(group_id=group_id).values_list("user_qq", flat=True)
+        )

    @classmethod
-    async def set_group_member_nickname(
-        cls, user_qq: int, group_id: int, nickname: str
-    ) -> bool:
+    async def set_user_nickname(cls, user_qq: int, group_id: int, nickname: str):
        """
        说明:
            设置群员在该群内的昵称
@@ -119,14 +51,11 @@ class GroupInfoUser(db.Model):
            :param group_id: 群号
            :param nickname: 昵称
        """
-        query = cls.query.where(
-            (cls.user_qq == user_qq) & (cls.group_id == group_id)
+        await cls.update_or_create(
+            user_qq=user_qq,
+            group_id=group_id,
+            defaults={"nickname": nickname},
        )
-        user = await query.with_for_update().gino.first()
-        if user:
-            await user.update(nickname=nickname).apply()
-            return True
-        return False

    @classmethod
    async def get_user_all_group(cls, user_qq: int) -> List[int]:
@@ -136,13 +65,12 @@ class GroupInfoUser(db.Model):
        参数:
            :param user_qq: 用户qq
        """
-        query = await cls.query.where(cls.user_qq == user_qq).gino.all()
-        if query:
-            query = [x.group_id for x in query]
-        return query
+        return list(
+            await cls.filter(user_qq=user_qq).values_list("group_id", flat=True)
+        )

    @classmethod
-    async def get_group_member_nickname(cls, user_qq: int, group_id: int) -> str:
+    async def get_user_nickname(cls, user_qq: int, group_id: int) -> str:
        """
        说明:
            获取用户在该群的昵称
@@ -150,46 +78,34 @@ class GroupInfoUser(db.Model):
            :param user_qq: qq号
            :param group_id: 群号
        """
-        query = cls.query.where(
-            (cls.user_qq == user_qq) & (cls.group_id == group_id)
-        )
-        user = await query.gino.first()
-        if user:
+        if user := await cls.get_or_none(user_qq=user_qq, group_id=group_id):
            if user.nickname:
-                _tmp = ""
-                black_word = Config.get_config("nickname", "BLACK_WORD")
-                if black_word:
+                nickname = ""
+                if black_word := Config.get_config("nickname", "BLACK_WORD"):
                    for x in user.nickname:
-                        _tmp += "*" if x in black_word else x
-                return _tmp
+                        nickname += "*" if x in black_word else x
+                    return nickname
+                return user.nickname
        return ""

    @classmethod
-    async def get_group_member_uid(cls, user_qq: int, group_id: int) -> Optional[str]:
-        query = cls.query.where(
-            (cls.user_qq == user_qq) & (cls.group_id == group_id)
-        )
-        user = await query.gino.first()
-        _max_uid = cls.query.where((cls.user_qq == 114514) & (cls.group_id == 114514)).with_for_update()
-        _max_uid_user = await _max_uid.gino.first()
+    async def get_group_member_uid(cls, user_qq: int, group_id: int) -> Optional[int]:
+        user, _ = await cls.get_or_create(user_qq=user_qq, group_id=group_id)
+        _max_uid_user, _ = await cls.get_or_create(user_qq=114514, group_id=114514)
        _max_uid = _max_uid_user.uid
-        if not user or not user.uid:
-            all_user = await cls.query.where(cls.user_qq == user_qq).gino.all()
+        if not user.uid:
+            all_user = await cls.filter(user_qq=user_qq).all()
            for x in all_user:
                if x.uid:
                    return x.uid
-            else:
-                if not user:
-                    await GroupInfoUser.add_member_info(user_qq, group_id, '', datetime.min)
-                    user = await cls.query.where(
-                        (cls.user_qq == user_qq) & (cls.group_id == group_id)
-                    ).gino.first()
-                await user.update(
-                    uid=_max_uid + 1,
-                ).apply()
-                await _max_uid_user.update(
-                    uid=_max_uid + 1,
-                ).apply()
-
-        return user.uid if user and user.uid else None
+            user.uid = _max_uid + 1
+            _max_uid_user.uid = _max_uid + 1
+            await cls.bulk_update([user, _max_uid_user], ["uid"])
+        return user.uid

+    @classmethod
+    async def _run_script(cls):
+        await cls.raw(
+            "alter table group_info_users alter user_join_time drop not null;"
+        )
+        """允许 user_join_time 为空"""