update v0.1

basic_plugins/init_plugin_config/__init__.py

@@ -11,7 +11,6 @@ from .init_plugins_limit import (
 )
 from .init import init
 from .check_plugin_status import check_plugin_status
-from utils.manager import admin_manager
 from nonebot.adapters.cqhttp import Bot
 from configs.path_config import DATA_PATH
 from services.log import logger

basic_plugins/scripts.py

@@ -93,6 +93,18 @@ async def _():
             "ALTER TABLE bag_users ADD property json NOT NULL DEFAULT '{}';",
             "bag_users",
         ),  # bag_users 新增字段 property 替代 props
+        (
+            "ALTER TABLE genshin ADD auto_sign_time timestamp with time zone;",
+            "genshin"
+        ),  # 新增原神自动签到字段
+        (
+            "ALTER TABLE genshin ADD resin_remind boolean DEFAULT False;",
+            "genshin"
+        ),  # 新增原神自动签到字段
+        (
+            "ALTER TABLE genshin ADD resin_recovery_time timestamp with time zone;",
+            "genshin"
+        ),  # 新增原神自动签到字段
     ]
     for sql in sql_str:
         try:

basic_plugins/shop/buy.py

@@ -7,6 +7,7 @@ from models.bag_user import BagUser
 from services.db_context import db
 from nonebot.adapters.cqhttp.permission import GROUP
 from models.goods_info import GoodsInfo
+import time
 
 
 __zx_plugin_name__ = "商店 - 购买道具"
@@ -20,7 +21,7 @@ usage：
 """.strip()
 __plugin_des__ = "商店 - 购买道具"
 __plugin_cmd__ = ["购买 [序号或名称] ?[数量=1]"]
-__plugin_type__ = ('商店',)
+__plugin_type__ = ("商店",)
 __plugin_version__ = 0.1
 __plugin_author__ = "HibiKier"
 __plugin_settings__ = {
@@ -29,9 +30,7 @@ __plugin_settings__ = {
     "limit_superuser": False,
     "cmd": ["商店", "购买道具"],
 }
-__plugin_cd_limit__ = {
-    "cd": 3
-}
+__plugin_cd_limit__ = {"cd": 3}
 
 
 buy = on_command("购买", aliases={"购买道具"}, priority=5, block=True, permission=GROUP)
@@ -42,8 +41,11 @@ async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
     goods = None
     if get_message_text(event.json()) in ["神秘药水"]:
         await buy.finish("你们看看就好啦，这是不可能卖给你们的~", at_sender=True)
-    goods_lst = await GoodsInfo.get_all_goods()
-    goods_name_lst = [x.goods_name for x in goods_lst]
+    goods_name_lst = [
+        x.goods_name
+        for x in await GoodsInfo.get_all_goods()
+        if x.goods_limit_time > time.time() or x.goods_limit_time == 0
+    ]
     msg = get_message_text(event.json()).split()
     num = 1
     if len(msg) > 1:
@@ -51,17 +53,16 @@ async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
             num = int(msg[1])
         else:
             await buy.finish("购买的数量要是数字且大于0！", at_sender=True)
-    # print(msg, num)
     if is_number(msg[0]):
         msg = int(msg[0])
-        if msg > len(goods_lst) or msg < 1:
+        if msg > len(goods_name_lst) or msg < 1:
             await buy.finish("请输入正确的商品id！", at_sender=True)
-        goods = goods_lst[msg - 1]
+        goods = goods_name_lst[msg - 1]
     else:
         if msg[0] in goods_name_lst:
             for i in range(len(goods_name_lst)):
                 if msg[0] == goods_name_lst[i]:
-                    goods = goods_lst[i]
+                    goods = goods_name_lst[i]
                     break
             else:
                 await buy.finish("请输入正确的商品名称！")

basic_plugins/shop/shop_handle/data_source.py

@@ -217,11 +217,12 @@ async def update_goods(**kwargs) -> "str, str, int":
             tmp += f'折扣：{discount} --> {kwargs["discount"]}\n'
             discount = kwargs["discount"]
         if kwargs.get("limit_time"):
+            kwargs["limit_time"] = float(kwargs["limit_time"])
             new_time = time.strftime(
                 "%Y-%m-%d %H:%M:%S",
-                time.localtime(time.time() + int(kwargs["limit_time"] * 60 * 60)),
+                time.localtime(time.time() + kwargs["limit_time"] * 60 * 60),
             )
-            tmp += f"折扣至： {new_time}\n"
+            tmp += f"限时至： {new_time}\n"
             limit_time = kwargs["limit_time"]
         return (
             await GoodsInfo.update_goods(
@@ -249,7 +250,6 @@ def parse_goods_info(msg: str) -> Union[dict, str]:
         sp = x.split(":", maxsplit=1)
         if str(sp[1]).strip():
             sp[1] = sp[1].strip()
-            print(sp)
             if sp[0] == "name":
                 data["name"] = sp[1]
             elif sp[0] == "price":

basic_plugins/shop/use/__init__.py

@@ -66,9 +66,11 @@ async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
                 await use_props.finish(f"该道具单次只能使用 {n} 个！")
             if await BagUser.delete_property(
                 event.user_id, event.group_id, name, num
-            ) and await effect(bot, event, name, num):
+            ):
                 if func_manager.check_send_success_message(name):
                     await use_props.send(f"使用道具 {name} {num} 次成功！", at_sender=True)
+                if msg := await effect(bot, event, name, num):
+                    await use_props.send(msg, at_sender=True)
                 logger.info(
                     f"USER {event.user_id} GROUP {event.group_id} 使用道具 {name} {num} 次成功"
                 )

basic_plugins/shop/use/data_source.py

@@ -1,6 +1,7 @@
-from nonebot.adapters.cqhttp import GroupMessageEvent
+from nonebot.adapters.cqhttp import GroupMessageEvent, MessageSegment
 from services.log import logger
 from nonebot.adapters.cqhttp import Bot
+from typing import Optional, Union
 import asyncio
 
 
@@ -32,7 +33,7 @@ class GoodsUseFuncManager:
             return self._data[goods_name]["kwargs"]["_max_num_limit"]
         return 1
 
-    async def use(self, **kwargs):
+    async def use(self, **kwargs) -> Optional[Union[str, MessageSegment]]:
         """
         使用道具
         :param kwargs: kwargs
@@ -40,11 +41,11 @@ class GoodsUseFuncManager:
         goods_name = kwargs.get("goods_name")
         if self.exists(goods_name):
             if asyncio.iscoroutinefunction(self._data[goods_name]["func"]):
-                await self._data[goods_name]["func"](
+                return await self._data[goods_name]["func"](
                     **kwargs,
                 )
             else:
-                self._data[goods_name]["func"](
+                return self._data[goods_name]["func"](
                     **kwargs,
                 )
 
@@ -70,7 +71,9 @@ class GoodsUseFuncManager:
 func_manager = GoodsUseFuncManager()
 
 
-async def effect(bot: Bot, event: GroupMessageEvent, goods_name: str, num: int) -> bool:
+async def effect(
+    bot: Bot, event: GroupMessageEvent, goods_name: str, num: int
+) -> Optional[Union[str, MessageSegment]]:
     """
     商品生效
     :param bot: Bot
@@ -83,7 +86,7 @@ async def effect(bot: Bot, event: GroupMessageEvent, goods_name: str, num: int)
     try:
         if func_manager.exists(goods_name):
             _kwargs = func_manager.get_kwargs(goods_name)
-            await func_manager.use(
+            return await func_manager.use(
                 **{
                     **_kwargs,
                     "_bot": bot,
@@ -94,10 +97,9 @@ async def effect(bot: Bot, event: GroupMessageEvent, goods_name: str, num: int)
                     "goods_name": goods_name,
                 }
             )
-        return True
     except Exception as e:
         logger.error(f"use 商品生效函数effect 发生错误 {type(e)}：{e}")
-    return False
+    return None
 
 
 def register_use(goods_name: str, func, **kwargs):

basic_plugins/super_cmd/reload_setting.py

@@ -8,7 +8,10 @@ from utils.manager import (
     group_manager,
 )
 from nonebot.typing import T_State
+from configs.config import Config
+from services.log import logger
 from nonebot.adapters.cqhttp import Bot, MessageEvent
+from utils.utils import scheduler
 
 
 __zx_plugin_name__ = "重载插件配置 [Superuser]"
@@ -28,6 +31,18 @@ __plugin_cmd__ = [
 ]
 __plugin_version__ = 0.1
 __plugin_author__ = "HibiKier"
+__plugin_configs__ = {
+    "AUTO_RELOAD": {
+        "value": False,
+        "help": "自动重载配置文件",
+        "default_value": False
+    },
+    "AUTO_RELOAD_TIME": {
+        "value": 180,
+        "help": "控制自动重载配置文件时长",
+        "default_value": 180
+    }
+}
 
 
 reload_plugins_manager = on_command(
@@ -41,4 +56,19 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
     plugins2cd_manager.reload()
     plugins2block_manager.reload()
     group_manager.reload()
+    Config.reload()
     await reload_plugins_manager.send("重载完成...")
+
+
+@scheduler.scheduled_job(
+    'interval',
+    seconds=Config.get_config("reload_setting", "AUTO_RELOAD_TIME", 180),
+)
+async def _():
+    if Config.get_config("reload_setting", "AUTO_RELOAD"):
+        plugins2settings_manager.reload()
+        plugins2cd_manager.reload()
+        plugins2block_manager.reload()
+        group_manager.reload()
+        Config.reload()
+        logger.debug("已自动重载所有配置文件...")