Merge branch 'HibiKier:main' into main

plugins/genshin/query_user/query_memo/__init__.py

@@ -3,7 +3,6 @@ from nonebot.adapters.onebot.v11 import MessageEvent, GroupMessageEvent
 from services.log import logger
 from .data_source import get_user_memo, get_memo
 from .._models import Genshin
-from nonebot.plugin import export
 
 
 __zx_plugin_name__ = "原神便笺查询"
@@ -28,10 +27,6 @@ __plugin_settings__ = {
 __plugin_block_limit__ = {}
 
 
-export = export()
-
-export.get_memo = get_memo
-
 query_memo_matcher = on_command("原神便签查询", aliases={"原神便笺查询", "yss"}, priority=5, block=True)
 
 

plugins/genshin/query_user/resin_remind/init_task.py

@@ -19,7 +19,9 @@ import pytz
 driver: Driver = nonebot.get_driver()
 
 
-get_memo = require("query_memo").get_memo
+require("query_memo")
+
+from ..query_memo import get_memo
 
 
 global_map = {}

plugins/pix_gallery/__init__.py

@@ -1,5 +1,5 @@
 from configs.config import Config
-from utils.manager import GDict
+from utils.utils import GDict
 import nonebot
 
 

plugins/sign_in/__init__.py

@@ -18,6 +18,7 @@ from configs.path_config import DATA_PATH
 from services.log import logger
 from .utils import clear_sign_data_pic
 from utils.utils import is_number
+from .goods_register import driver
 
 try:
     import ujson as json

plugins/sign_in/goods_register.py

@@ -0,0 +1,60 @@
+
+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
+
+driver: Driver = nonebot.get_driver()
+
+
+@driver.on_startup
+async def _():
+    """
+    导入内置的三个商品
+    """
+
+    @shop_register(
+        name=("好感度双倍加持卡Ⅰ", "好感度双倍加持卡Ⅱ", "好感度双倍加持卡Ⅲ"),
+        price=(30, 150, 250),
+        des=(
+            "下次签到双倍好感度概率 + 10%（谁才是真命天子？）（同类商品将覆盖）",
+            "下次签到双倍好感度概率 + 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},
+    )
+    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()
+
+    @shop_register(
+        name="测试道具A",
+        price=99,
+        des="随便侧而出",
+        load_status=False,
+        icon="sword.png",
+    )
+    async def _(user_id: int, group_id: int):
+        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）')
+
+    @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("太笨了！")     # 抛出异常，阻断使用，并返回信息
+
+    @shop_register.after_handle(name="测试道具A", load_status=False)
+    async def _(user_id: int, group_id: int):
+        print(user_id, group_id, '第一个使用后函数（after handle）')
+
+
+@driver.on_bot_connect
+async def _():
+    await shop_register.load_register()
+