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-10 14:20:04 +08:00 · 2023-02-18 18:46:54 +08:00
parent a6105e8a1b
commit 7685b95031
134 changed files with 5402 additions and 6033 deletions
@@ -1,9 +1,9 @@
-
-from models.sign_group_user import SignGroupUser
-from configs.config import Config
-from nonebot import Driver
-from utils.decorator.shop import shop_register, NotMeetUseConditionsException
 import nonebot
+from nonebot import Driver
+
+from configs.config import Config
+from models.sign_group_user import SignGroupUser
+from utils.decorator.shop import NotMeetUseConditionsException, shop_register

 driver: Driver = nonebot.get_driver()

@@ -22,13 +22,18 @@ async def _():
            "下次签到双倍好感度概率 + 20%（平平庸庸）（同类商品将覆盖）",
            "下次签到双倍好感度概率 + 30%（金币才是真命天子！）（同类商品将覆盖）",
        ),
-        load_status=Config.get_config("shop", "IMPORT_DEFAULT_SHOP_GOODS"),
-        icon=("favorability_card_1.png", "favorability_card_2.png", "favorability_card_3.png"),
-        ** {"好感度双倍加持卡Ⅰ_prob": 0.1, "好感度双倍加持卡Ⅱ_prob": 0.2, "好感度双倍加持卡Ⅲ_prob": 0.3},
+        load_status=bool(Config.get_config("shop", "IMPORT_DEFAULT_SHOP_GOODS")),
+        icon=(
+            "favorability_card_1.png",
+            "favorability_card_2.png",
+            "favorability_card_3.png",
+        ),
+        **{"好感度双倍加持卡Ⅰ_prob": 0.1, "好感度双倍加持卡Ⅱ_prob": 0.2, "好感度双倍加持卡Ⅲ_prob": 0.3},
    )
    async def sign_card(user_id: int, group_id: int, prob: float):
-        user = await SignGroupUser.ensure(user_id, group_id)
-        await user.update(add_probability=prob).apply()
+        user, _ = await SignGroupUser.get_or_create(user_qq=user_id, group_id=group_id)
+        user.add_probability = prob
+        await user.save(update_fields=["add_probability"])

    @shop_register(
        name="测试道具A",
@@ -38,20 +43,17 @@ async def _():
        icon="sword.png",
    )
    async def _(user_id: int, group_id: int):
-        print(user_id, group_id, '使用测试道具')
+        print(user_id, group_id, "使用测试道具")

    @shop_register.before_handle(name="测试道具A", load_status=False)
    async def _(user_id: int, group_id: int):
-        print(user_id, group_id, '第一个使用前函数（before handle）')
+        print(user_id, group_id, "第一个使用前函数（before handle）")

    @shop_register.before_handle(name="测试道具A", load_status=False)
    async def _(user_id: int, group_id: int):
-        print(user_id, group_id, '第二个使用前函数（before handle）222')
-        raise NotMeetUseConditionsException("太笨了！")     # 抛出异常，阻断使用，并返回信息
+        print(user_id, group_id, "第二个使用前函数（before handle）222")
+        raise NotMeetUseConditionsException("太笨了！")  # 抛出异常，阻断使用，并返回信息

    @shop_register.after_handle(name="测试道具A", load_status=False)
    async def _(user_id: int, group_id: int):
-        print(user_id, group_id, '第一个使用后函数（after handle）')
-
-
-
+        print(user_id, group_id, "第一个使用后函数（after handle）")
@@ -1,23 +1,25 @@
-from datetime import datetime, timedelta
-from models.sign_group_user import SignGroupUser
-from models.group_member_info import GroupInfoUser
-from models.bag_user import BagUser
-from configs.config import NICKNAME
-from nonebot.adapters.onebot.v11 import MessageSegment
-from utils.image_utils import BuildImage, BuildMat
-from services.db_context import db
-from .utils import get_card, SIGN_TODAY_CARD_PATH
-from typing import Optional
-from services.log import logger
-from .random_event import random_event
-from utils.data_utils import init_rank
-from utils.utils import get_user_avatar
-from io import BytesIO
-import random
-import math
 import asyncio
-import secrets
+import math
 import os
+import random
+import secrets
+from datetime import datetime, timedelta
+from io import BytesIO
+from typing import Optional
+
+from nonebot.adapters.onebot.v11 import MessageSegment
+
+from configs.config import NICKNAME
+from models.bag_user import BagUser
+from models.group_member_info import GroupInfoUser
+from models.sign_group_user import SignGroupUser
+from services.log import logger
+from utils.data_utils import init_rank
+from utils.image_utils import BuildImage, BuildMat
+from utils.utils import get_user_avatar
+
+from .random_event import random_event
+from .utils import SIGN_TODAY_CARD_PATH, get_card


 async def group_user_check_in(
@@ -25,18 +27,17 @@ async def group_user_check_in(
 ) -> MessageSegment:
    "Returns string describing the result of checking in"
    present = datetime.now()
-    async with db.transaction():
-        # 取得相应用户
-        user = await SignGroupUser.ensure(user_qq, group, for_update=True)
-        # 如果同一天签到过，特殊处理
-        if (
-            user.checkin_time_last + timedelta(hours=8)
-        ).date() >= present.date() or f"{user}_{group}_sign_{datetime.now().date()}" in os.listdir(
-            SIGN_TODAY_CARD_PATH
-        ):
-            gold = await BagUser.get_gold(user_qq, group)
-            return await get_card(user, nickname, -1, gold, "")
-        return await _handle_check_in(nickname, user_qq, group, present)  # ok
+    # 取得相应用户
+    user, is_create = await SignGroupUser.get_or_create(user_qq=user_qq, group_id=group)
+    # 如果同一天签到过，特殊处理
+    if not is_create and (
+        user.checkin_time_last.date() >= present.date()
+        or f"{user}_{group}_sign_{datetime.now().date()}"
+        in os.listdir(SIGN_TODAY_CARD_PATH)
+    ):
+        gold = await BagUser.get_gold(user_qq, group)
+        return await get_card(user, nickname, -1, gold, "")
+    return await _handle_check_in(nickname, user_qq, group, present)  # ok


 async def check_in_all(nickname: str, user_qq: int):
@@ -47,40 +48,39 @@ async def check_in_all(nickname: str, user_qq: int):
        :param nickname: 昵称
        :param user_qq: 用户qq
    """
-    async with db.transaction():
-        present = datetime.now()
-        for u in await SignGroupUser.get_user_all_data(user_qq):
-            group = u.group_id
-            if not ((
-                u.checkin_time_last + timedelta(hours=8)
-            ).date() >= present.date() or f"{u}_{group}_sign_{datetime.now().date()}" in os.listdir(
-                SIGN_TODAY_CARD_PATH
-            )):
-                await _handle_check_in(nickname, user_qq, group, present)
+    present = datetime.now()
+    for u in await SignGroupUser.filter(user_qq=user_qq).all():
+        group = u.group_id
+        if not (
+            u.checkin_time_last.date() >= present.date()
+            or f"{u}_{group}_sign_{datetime.now().date()}"
+            in os.listdir(SIGN_TODAY_CARD_PATH)
+        ):
+            await _handle_check_in(nickname, user_qq, group, present)


 async def _handle_check_in(
    nickname: str, user_qq: int, group: int, present: datetime
 ) -> MessageSegment:
-    user = await SignGroupUser.ensure(user_qq, group, for_update=True)
-    impression_added = (secrets.randbelow(99)+1)/100
+    user, _ = await SignGroupUser.get_or_create(user_qq=user_qq, group_id=group)
+    impression_added = (secrets.randbelow(99) + 1) / 100
    critx2 = random.random()
-    add_probability = user.add_probability
+    add_probability = float(user.add_probability)
    specify_probability = user.specify_probability
    if critx2 + add_probability > 0.97:
        impression_added *= 2
    elif critx2 < specify_probability:
        impression_added *= 2
-    await SignGroupUser.sign(user, impression_added, present)
+    await SignGroupUser.sign(user, impression_added)
    gold = random.randint(1, 100)
-    gift, gift_type = random_event(user.impression)
+    gift, gift_type = random_event(float(user.impression))
    if gift_type == "gold":
        await BagUser.add_gold(user_qq, group, gold + gift)
        gift = f"额外金币 + {gift}"
    else:
        await BagUser.add_gold(user_qq, group, gold)
        await BagUser.add_property(user_qq, group, gift)
-        gift += ' + 1'
+        gift += " + 1"

    logger.info(
        f"(USER {user.user_qq}, GROUP {user.group_id})"
@@ -95,7 +95,7 @@ async def _handle_check_in(

 async def group_user_check(nickname: str, user_qq: int, group: int) -> MessageSegment:
    # heuristic: if users find they have never checked in they are probable to check in
-    user = await SignGroupUser.ensure(user_qq, group)
+    user, _ = await SignGroupUser.get_or_create(user_qq=user_qq, group_id=group)
    gold = await BagUser.get_gold(user_qq, group)
    return await get_card(user, nickname, None, gold, "", is_card_view=True)

@@ -171,18 +171,14 @@ async def _pst(users: list, impressions: list, groups: list):
            impressions.pop(index)
            users.pop(index)
            groups.pop(index)
-            try:
-                user_name = (
-                    await GroupInfoUser.get_member_info(user, group)
-                ).user_name
-            except AttributeError:
+            if user_ := await GroupInfoUser.get_or_none(user_qq=user, group_id=group):
+                user_name = user_.user_name
+            else:
                user_name = f"我名字呢？"
            user_name = user_name if len(user_name) < 11 else user_name[:10] + "..."
            ava = await get_user_avatar(user)
            if ava:
-                ava = BuildImage(
-                    50, 50, background=BytesIO(ava)
-                )
+                ava = BuildImage(50, 50, background=BytesIO(ava))
            else:
                ava = BuildImage(50, 50, color="white")
            ava.circle()
@@ -1,11 +1,12 @@
-from configs.config import Config
 import random
+from typing import Tuple, Union

+from configs.config import Config

 PROB_DATA = None


-def random_event(impression: float) -> 'Union[str, int], str':
+def random_event(impression: float) -> Tuple[Union[str, int], str]:
    """
    签到随机事件
    :param impression: 好感度
@@ -14,20 +15,17 @@ def random_event(impression: float) -> 'Union[str, int], str':
    global PROB_DATA
    if not PROB_DATA:
        PROB_DATA = {
-            Config.get_config("sign_in", "SIGN_CARD3_PROB"): '好感度双倍加持卡Ⅲ',
-            Config.get_config("sign_in", "SIGN_CARD2_PROB"): '好感度双倍加持卡Ⅱ',
-            Config.get_config("sign_in", "SIGN_CARD1_PROB"): '好感度双倍加持卡Ⅰ'
+            Config.get_config("sign_in", "SIGN_CARD3_PROB"): "好感度双倍加持卡Ⅲ",
+            Config.get_config("sign_in", "SIGN_CARD2_PROB"): "好感度双倍加持卡Ⅱ",
+            Config.get_config("sign_in", "SIGN_CARD1_PROB"): "好感度双倍加持卡Ⅰ",
        }
    rand = random.random() - impression / 1000
    for prob in PROB_DATA.keys():
        if rand <= prob:
-            return PROB_DATA[prob], 'props'
-    gold = random.randint(1, random.randint(1, int(1 if impression < 1 else impression)))
+            return PROB_DATA[prob], "props"
+    gold = random.randint(
+        1, random.randint(1, int(1 if impression < 1 else impression))
+    )
    max_sign_gold = Config.get_config("sign_in", "MAX_SIGN_GOLD")
    gold = max_sign_gold if gold > max_sign_gold else gold
-    return gold, 'gold'
-
-
-
-
-
+    return gold, "gold"
@@ -1,31 +1,33 @@
-from .config import (
-    SIGN_RESOURCE_PATH,
-    SIGN_TODAY_CARD_PATH,
-    SIGN_BORDER_PATH,
-    SIGN_BACKGROUND_PATH,
-    lik2level,
-    lik2relation,
-    level2attitude,
-    weekdays,
-)
-from models.sign_group_user import SignGroupUser
-from models.group_member_info import GroupInfoUser
+import asyncio
+import os
+import random
+from datetime import datetime
+from io import BytesIO
+from pathlib import Path
+from typing import List, Optional
+
+import nonebot
+from nonebot import Driver
 from nonebot.adapters.onebot.v11 import MessageSegment
-from configs.config import Config
-from utils.utils import get_user_avatar
+
+from configs.config import NICKNAME, Config
+from configs.path_config import IMAGE_PATH
+from models.group_member_info import GroupInfoUser
+from models.sign_group_user import SignGroupUser
 from utils.image_utils import BuildImage
 from utils.message_builder import image
-from configs.config import NICKNAME
-from pathlib import Path
-from datetime import datetime
-from typing import Optional, List
-from nonebot import Driver
-from io import BytesIO
-import asyncio
-import random
-import nonebot
-import os
+from utils.utils import get_user_avatar

+from .config import (
+    SIGN_BACKGROUND_PATH,
+    SIGN_BORDER_PATH,
+    SIGN_RESOURCE_PATH,
+    SIGN_TODAY_CARD_PATH,
+    level2attitude,
+    lik2level,
+    lik2relation,
+    weekdays,
+)

 driver: Driver = nonebot.get_driver()

@@ -34,10 +36,13 @@ driver: Driver = nonebot.get_driver()
 async def init_image():
    SIGN_RESOURCE_PATH.mkdir(parents=True, exist_ok=True)
    SIGN_TODAY_CARD_PATH.mkdir(exist_ok=True, parents=True)
-    await GroupInfoUser.add_member_info(114514, 114514, "", datetime.min, 0)
-    _u = await GroupInfoUser.get_member_info(114514, 114514)
-    if _u.uid is None:
-        await _u.update(uid=0).apply()
+    if not await GroupInfoUser.get_or_none(user_qq=114514):
+        await GroupInfoUser.create(
+            user_qq=114514,
+            group_id=114514,
+            user_name="",
+            uid=0,
+        )
    generate_progress_bar_pic()
    clear_sign_data_pic()

@@ -58,7 +63,12 @@ async def get_card(
        Path(SIGN_TODAY_CARD_PATH) / f"{user_id}_{user.group_id}_{_type}_{date}.png"
    )
    if card_file.exists():
-        return image(f"{user_id}_{user.group_id}_{_type}_{date}.png", "sign/today_card")
+        return image(
+            IMAGE_PATH
+            / "sign"
+            / "today_card"
+            / f"{user_id}_{user.group_id}_{_type}_{date}.png"
+        )
    else:
        if add_impression == -1:
            card_file = (
@@ -67,8 +77,10 @@ async def get_card(
            )
            if card_file.exists():
                return image(
-                    f"{user_id}_{user.group_id}_view_{date}.png",
-                    "sign/today_card",
+                    IMAGE_PATH
+                    / "sign"
+                    / "today_card"
+                    / f"{user_id}_{user.group_id}_view_{date}.png"
                )
            is_card_view = True
        ava = BytesIO(await get_user_avatar(user_id))
@@ -244,7 +256,7 @@ def _generate_card(
        )
        today_data.text(
            (0, 50),
-            f"色图概率：{(default_setu_prob + user.impression if user.impression < 100 else 100):.2f}%",
+            f"色图概率：{(default_setu_prob + float(user.impression) if user.impression < 100 else 100):.2f}%",
        )
        today_data.text((0, 75), f"开箱次数：{(20 + int(user.impression / 3))}")
        _type = "view"
@@ -285,7 +297,12 @@ def _generate_card(
    bk.paste(today_data, (580, 220), True)
    bk.paste(watermark, (15, 400), True)
    bk.save(SIGN_TODAY_CARD_PATH / f"{user_id}_{user.group_id}_{_type}_{data}.png")
-    return image(f"{user_id}_{user.group_id}_{_type}_{data}.png", "sign/today_card")
+    return image(
+        IMAGE_PATH
+        / "sign"
+        / "today_card"
+        / f"{user_id}_{user.group_id}_{_type}_{data}.png"
+    )


 def generate_progress_bar_pic():