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

plugins/send_setu_/_model.py

@@ -1,64 +1,44 @@
-from services.db_context import db
 from typing import List, Optional
 
+from tortoise import fields
+from tortoise.contrib.postgres.functions import Random
+from tortoise.expressions import Q
 
-class Setu(db.Model):
-    __tablename__ = "setu"
-    __table_args__ = {'extend_existing': True}
+from services.db_context import Model
 
-    id = db.Column(db.Integer(), primary_key=True)
-    local_id = db.Column(db.Integer(), nullable=False)
-    title = db.Column(db.String(), nullable=False)
-    author = db.Column(db.String(), nullable=False)
-    pid = db.Column(db.BigInteger(), nullable=False)
-    img_hash = db.Column(db.String(), nullable=False)
-    img_url = db.Column(db.String(), nullable=False)
-    is_r18 = db.Column(db.Boolean(), nullable=False)
-    tags = db.Column(db.String())
 
-    _idx1 = db.Index("setu_pid_img_url_idx1", "pid", "img_url", unique=True)
+class Setu(Model):
 
-    @classmethod
-    async def add_setu_data(
-        cls,
-        local_id: int,
-        title: str,
-        author: str,
-        pid: int,
-        img_hash: str,
-        img_url: str,
-        tags: str,
-    ):
-        """
-        说明:
-            添加一份色图数据
-        参数:
-            :param local_id: 本地存储id
-            :param title: 标题
-            :param author: 作者
-            :param pid: 图片pid
-            :param img_hash: 图片hash值
-            :param img_url: 图片链接
-            :param tags: 图片标签
-        """
-        if not await cls._check_exists(pid, img_url):
-            await cls.create(
-                local_id=local_id,
-                title=title,
-                author=author,
-                pid=pid,
-                img_hash=img_hash,
-                img_url=img_url,
-                is_r18=True if "R-18" in tags else False,
-                tags=tags,
-            )
+    id = fields.IntField(pk=True, generated=True, auto_increment=True)
+    """自增id"""
+    local_id = fields.IntField()
+    """本地存储下标"""
+    title = fields.CharField(255)
+    """标题"""
+    author = fields.CharField(255)
+    """作者"""
+    pid = fields.BigIntField()
+    """pid"""
+    img_hash = fields.TextField()
+    """图片hash"""
+    img_url = fields.CharField(255)
+    """pixiv url链接"""
+    is_r18 = fields.BooleanField()
+    """是否r18"""
+    tags = fields.TextField()
+    """tags"""
+
+    class Meta:
+        table = "setu"
+        table_description = "色图数据表"
+        unique_together = ("pid", "img_url")
 
     @classmethod
     async def query_image(
         cls,
         local_id: Optional[int] = None,
         tags: Optional[List[str]] = None,
-        r18: int = 0,
+        r18: bool = False,
         limit: int = 50,
     ):
         """
@@ -71,58 +51,17 @@ class Setu(db.Model):
             :param limit: 获取数量
         """
         if local_id:
-            flag = True if r18 == 1 else False
-            return await cls.query.where(
-                (cls.local_id == local_id) & (cls.is_r18 == flag)
-            ).gino.first()
-        if r18 == 0:
-            query = cls.query.where(cls.is_r18 == False)
-        elif r18 == 1:
-            query = cls.query.where(cls.is_r18 == True)
-        else:
-            query = cls.query
+            return await cls.filter(is_r18=r18, local_id=local_id).first()
+        query = cls.filter(is_r18=r18)
         if tags:
             for tag in tags:
-                query = query.where(cls.tags.contains(tag) | cls.title.contains(tag) | cls.author.contains(tag))
-        query = query.order_by(db.func.random()).limit(limit)
-        return await query.gino.all()
-
-    @classmethod
-    async def get_image_count(cls, r18: int = 0) -> int:
-        """
-        说明:
-            查询图片数量
-        """
-        flag = False if r18 == 0 else True
-        setattr(Setu, 'count', db.func.count(cls.local_id).label('count'))
-        count = await cls.select('count').where(cls.is_r18 == flag).gino.first()
-        return count[0]
-
-    @classmethod
-    async def get_image_in_hash(cls, img_hash: str) -> "Setu":
-        """
-        说明:
-            通过图像hash获取图像信息
-        参数:
-            :param img_hash: = 图像hash值
-        """
-        query = await cls.query.where(cls.img_hash == img_hash).gino.first()
-        return query
-
-    @classmethod
-    async def _check_exists(cls, pid: int, img_url: str) -> bool:
-        """
-        说明:
-            检测图片是否存在
-        参数:
-            :param pid: 图片pid
-            :param img_url: 图片链接
-        """
-        return bool(
-            await cls.query.where(
-                (cls.pid == pid) & (cls.img_url == img_url)
-            ).gino.first()
-        )
+                query = query.filter(
+                    Q(tags__contains=tag)
+                    | Q(title__contains=tag)
+                    | Q(author__contains=tag)
+                )
+        query = query.annotate(rand=Random()).limit(limit)
+        return await query.all()
 
     @classmethod
     async def delete_image(cls, pid: int) -> int:
@@ -132,66 +71,14 @@ class Setu(db.Model):
         参数:
             :param pid: 图片pid
         """
-        query = await cls.query.where(cls.pid == pid).gino.first()
+        return_id = -1
+        query = await cls.get_or_none(pid=pid)
         if query:
-            is_r18 = query.is_r18
-            num = await cls.get_image_count(is_r18)
-            x = await cls.query.where((cls.is_r18 == is_r18) & (cls.local_id == num - 1)).gino.first()
-            _tmp_local_id = x.local_id
-            if x:
-                x.update(local_id=query.local_id).apply()
-            await cls.delete.where(cls.pid == pid).gino.status()
-            return _tmp_local_id
-        return -1
-
-    @classmethod
-    async def update_setu_data(
-        cls,
-        pid: int,
-        *,
-        local_id: Optional[int] = None,
-        title: Optional[str] = None,
-        author: Optional[str] = None,
-        img_hash: Optional[str] = None,
-        img_url: Optional[str] = None,
-        tags: Optional[str] = None,
-    ) -> bool:
-        """
-        说明:
-            根据PID修改图片数据
-        参数:
-            :param local_id: 本地id
-            :param pid: 图片pid
-            :param title: 标题
-            :param author: 作者
-            :param img_hash: 图片hash值
-            :param img_url: 图片链接
-            :param tags: 图片标签
-        """
-        query = cls.query.where(cls.pid == pid).with_for_update()
-        image_list = await query.gino.all()
-        if image_list:
-            for image in image_list:
-                if local_id:
-                    await image.update(local_id=local_id).apply()
-                if title:
-                    await image.update(title=title).apply()
-                if author:
-                    await image.update(author=author).apply()
-                if img_hash:
-                    await image.update(img_hash=img_hash).apply()
-                if img_url:
-                    await image.update(img_url=img_url).apply()
-                if tags:
-                    await image.update(tags=tags).apply()
-            return True
-        return False
-
-    @classmethod
-    async def get_all_setu(cls) -> List["Setu"]:
-        """
-        说明:
-            获取所有图片对象
-        """
-        return await cls.query.gino.all()
-
+            num = await cls.filter(is_r18=query.is_r18).count()
+            last_image = await cls.get_or_none(is_r18=query.is_r18, local_id=num - 1)
+            if last_image:
+                return_id = last_image.local_id
+                last_image.local_id = query.local_id
+                await last_image.save(update_fields=["local_id"])
+            await query.delete()
+        return return_id