update v0.1.4.5

README.md

@@ -236,6 +236,16 @@ __Docker 最新版本由 [Sakuracio](https://github.com/Sakuracio) 提供__
 
 ## 更新
 
+### 2022/4/4 \[v0.1.4.5]
+
+* 替换了bt搜索URL
+* 优化使用playwright的相关代码
+* 原神玩家查询新增层岩巨渊探索
+* 修复原神便笺角色头像黑框
+* 修复同意群聊请求错误
+* 提供webui方面的api
+* 新增web-ui（前端简易管理页面插件）插件
+
 ### 2022/3/21
 
 * 修复statistics_handle.py乱码
@@ -318,15 +328,15 @@ __Docker 最新版本由 [Sakuracio](https://github.com/Sakuracio) 提供__
 * epic restful 替换 [@pull/119](https://github.com/HibiKier/zhenxun_bot/pull/119)
 * fix: 修复远古时期残留的epic推送问题 [@pull/122](https://github.com/HibiKier/zhenxun_bot/pull/122)
 
-### 2022/2/11
+### 2021/2/11
 
 * 修复pix不使用反代无法下载图片
 
-### 2022/2/10 \[v0.1.1]
+### 2021/2/10 \[v0.1.1]
 
 * 修复购买道具出错
 
-### 2022/2/9 \[v0.1]
+### 2021/2/9 \[v0.1]
 
 * 新增原神自动签到和手动签到
 * 新增原神树脂提醒
@@ -336,7 +346,7 @@ __Docker 最新版本由 [Sakuracio](https://github.com/Sakuracio) 提供__
 * 修复修改商品时限制时间出错
 * 修复超时商品依旧可以被购买
 
-### 2022/1/16 \[v0.0.9.0]
+### 2021/1/16 \[v0.0.9.0]
 
 * Ai提供文本敏感词过滤器
 * 疫情插件适配新版腾讯API
@@ -355,7 +365,7 @@ __Docker 最新版本由 [Sakuracio](https://github.com/Sakuracio) 提供__
       * “send_success_msg”(发送成功的交互信息->即：使用道具 {name} {num} 次成功)
       * “_max_num_limit”(该道具单次使用的最多个数，默认1)
 
-### 2022/1/5 \[v0.0.8.2]
+### 2021/1/5 \[v0.0.8.2]
 
 * 提供金币消费hook，可在plugins2settings.yaml中配置该功能需要消费的金币
 * 商店插件将作为内置插件移动至basic_plugins

__version__

@@ -1 +1 @@
-__version__: v0.1.4.4
+__version__: v0.1.4.5

basic_plugins/admin_bot_manage/rule.py

@@ -24,11 +24,17 @@ def switch_rule(event: Event) -> bool:
             _data = plugins2settings_manager.get_data()
             for key in _data:
                 try:
-                    for x in _data[key]["cmd"]:
-                        cmd.append(f"开启{x}")
-                        cmd.append(f"关闭{x}")
-                        cmd.append(f"开启 {x}")
-                        cmd.append(f"关闭 {x}")
+                    if isinstance(_data[key]["cmd"], list):
+                        for x in _data[key]["cmd"]:
+                            cmd.append(f"开启{x}")
+                            cmd.append(f"关闭{x}")
+                            cmd.append(f"开启 {x}")
+                            cmd.append(f"关闭 {x}")
+                    else:
+                        cmd.append(f"开启{key}")
+                        cmd.append(f"关闭{key}")
+                        cmd.append(f"开启 {key}")
+                        cmd.append(f"关闭 {key}")
                 except KeyError:
                     pass
         msg = get_message_text(event.json()).split()

basic_plugins/init_plugin_config/init_plugins_settings.py

@@ -74,7 +74,7 @@ def init_plugins_settings(data_path: str):
                         if plugin_settings.get('cost_gold') is None:
                             plugin_settings['cost_gold'] = 0
                         if (
-                            plugin_settings["cmd"] is not None
+                            plugin_settings.get("cmd") is not None
                             and plugin_name not in plugin_settings["cmd"]
                         ):
                             plugin_settings["cmd"].append(plugin_name)

plugins/ai/data_source.py

@@ -57,7 +57,7 @@ async def get_chat_result(text: str, img_url: str, user_id: int, nickname: str)
                 if random.random() < 0.2:
                     if nickname.find("大人") == -1:
                         nickname += "大~人~"
-        rst = rst.replace("小主人", nickname).replace("小朋友", nickname)
+        rst = str(rst).replace("小主人", nickname).replace("小朋友", nickname)
     ai_message_manager.add_result(user_id, rst)
     return rst
 

plugins/alapi/wbtop.py

@@ -56,15 +56,15 @@ async def _(event: MessageEvent, arg: Message = CommandArg()):
             )
     if is_number(msg) and 0 < int(msg) <= 50:
         url = wbtop_data[int(msg) - 1]["url"]
-        try:
-            await wbtop.send("开始截取数据...")
-            img = await AsyncPlaywright.screenshot(
-                url,
-                f"{IMAGE_PATH}/temp/wbtop_{event.user_id}.png",
-                "#pl_feedlist_index",
-                sleep=5
-            )
+        await wbtop.send("开始截取数据...")
+        img = await AsyncPlaywright.screenshot(
+            url,
+            f"{IMAGE_PATH}/temp/wbtop_{event.user_id}.png",
+            "#pl_feedlist_index",
+            wait_time=5
+        )
+        if img:
             await wbtop.send(img)
-        except Exception as e:
-            logger.error(f"微博热搜截图出错... {type(e)}: {e}")
+        else:
             await wbtop.send("发生了一些错误.....")
+

plugins/bilibili_sub/__init__.py

@@ -211,7 +211,7 @@ async def _():
             await sub_manager.reload_sub_data()
             sub = await sub_manager.random_sub_data()
             if sub:
-                logger.info(f"Bilibili订阅开始检测：{sub.sub_id}")
+                logger.debug(f"Bilibili订阅开始检测：{sub.sub_id}")
                 rst = await get_sub_status(sub.sub_id, sub.sub_type)
                 await send_sub_msg(rst, sub, bot)
                 if sub.sub_type == "live":

plugins/bilibili_sub/data_source.py

@@ -311,28 +311,32 @@ async def get_user_dynamic(
         dynamic_upload_time = dynamic_info["cards"][0]["desc"]["timestamp"]
         if local_user.dynamic_upload_time < dynamic_upload_time:
             page = await browser.new_page()
-            await page.goto(
-                f"https://space.bilibili.com/{local_user.uid}/dynamic",
-                wait_until="networkidle",
-                timeout=10000,
-            )
-            await page.set_viewport_size({"width": 2560, "height": 1080})
-            # 删除置顶
-            await page.evaluate(
+            try:
+                await page.goto(
+                    f"https://space.bilibili.com/{local_user.uid}/dynamic",
+                    wait_until="networkidle",
+                    timeout=10000,
+                )
+                await page.set_viewport_size({"width": 2560, "height": 1080})
+                # 删除置顶
+                await page.evaluate(
+                    """
+                    xs = document.getElementsByClassName('first-card-with-title');
+                    for (x of xs) {
+                      x.remove();
+                    }
                 """
-                xs = document.getElementsByClassName('first-card-with-title');
-                for (x of xs) {
-                  x.remove();
-                }
-            """
-            )
-            card = await page.query_selector(".card")
-            # 截图并保存
-            await card.screenshot(
-                path=dynamic_path / f"{local_user.sub_id}_{dynamic_upload_time}.jpg",
-                timeout=100000,
-            )
-            await page.close()
+                )
+                card = await page.query_selector(".card")
+                # 截图并保存
+                await card.screenshot(
+                    path=dynamic_path / f"{local_user.sub_id}_{dynamic_upload_time}.jpg",
+                    timeout=100000,
+                )
+            except Exception as e:
+                logger.error(f"B站订阅：获取用户动态 发送错误 {type(e)}：{e}")
+            finally:
+                await page.close()
             return (
                 image(
                     f"{local_user.sub_id}_{dynamic_upload_time}.jpg",

plugins/bt/data_source.py

@@ -9,7 +9,7 @@
     asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
 
 
-url = "http://www.eclzz.world"
+url = "http://www.eclzz.mobi"
 
 
 async def get_bt_info(keyword: str, page: int):

plugins/genshin/query_user/query_memo/data_source.py

@@ -200,7 +200,7 @@ def _parse_data_and_draw(
         file_name = x["avatar_side_icon"].split("_")[-1]
         role_avatar = memo_path / "role_avatar" / file_name
         _ava_img = BuildImage(75, 75, background=role_avatar)
-        _ava_img.circle()
+        # _ava_img.circle()
         if x["status"] == "Finished":
             msg = "探索完成"
             font_color = (146, 188, 63)
@@ -218,10 +218,10 @@ def _parse_data_and_draw(
         a_circle.circle()
         b_circle = BuildImage(47, 47)
         b_circle.circle()
-        a_circle.paste(b_circle, (4, 4), alpha=True)
-        _circle_bk.paste(a_circle, (4, 4), alpha=True)
+        a_circle.paste(b_circle, (4, 4), True)
+        _circle_bk.paste(a_circle, (4, 4), True)
 
-        _bk.paste(_circle_bk, (25, 0), True, center_type="by_height")
+        _bk.paste(_circle_bk, (25, 0), True, "by_height")
         _bk.paste(_ava_img, (19, -13), True)
         _bk.text((100, 0), msg, font_color, "by_height")
         _bk.circle_corner(20)

plugins/genshin/query_user/query_role/draw_image.py

@@ -296,9 +296,11 @@ def get_country_data_image(world_data_dict: Dict) -> BuildImage:
     画出国家探索供奉等图像
     :param world_data_dict: 国家数据字典
     """
-    region = BuildImage(790, 267 * len(world_data_dict), color="#F9F6F2")
+    # 层岩巨渊 和 地下矿区 算一个
+    region = BuildImage(790, 267 * (len(world_data_dict) - 1), color="#F9F6F2")
     height = 0
-    for country in ["蒙德", "龙脊雪山", "璃月", "稻妻", "渊下宫"]:
+
+    for country in ["蒙德", "龙脊雪山", "璃月", "璃月层岩巨渊", "稻妻", "渊下宫"]:
         x = BuildImage(790, 250, color="#3A4467")
         logo = BuildImage(180, 180, background=image_path / "logo" / f"{country}.png")
         tmp_bk = BuildImage(770, 230, color="#606779")
@@ -320,6 +322,25 @@ def get_country_data_image(world_data_dict: Dict) -> BuildImage:
                 f"Lv.{world_data_dict[country]['level']}",
                 fill=(255, 255, 255),
             )
+        elif country in ["璃月层岩巨渊"]:
+            content_bk.text((300, 20), "层岩巨渊探索", fill=(239, 211, 114))
+            content_bk.text(
+                (570, 20),
+                f"{world_data_dict['璃月层岩巨渊']['exploration_percentage'] / 10}%",
+                fill=(255, 255, 255),
+            )
+            content_bk.text((300, 85), "地下矿区探索", fill=(239, 211, 114))
+            content_bk.text(
+                (570, 85),
+                f"{world_data_dict['璃月层岩巨渊·地下矿区']['exploration_percentage'] / 10}%",
+                fill=(255, 255, 255),
+            )
+            content_bk.text((300, 150), "流明石触媒", fill=(239, 211, 114))
+            content_bk.text(
+                (570, 150),
+                f"LV.{world_data_dict['璃月层岩巨渊·地下矿区']['offerings'][0]['level']}",
+                fill=(255, 255, 255),
+            )
         elif country in ["龙脊雪山"]:
             content_bk.text((300, 40), "探索", fill=(239, 211, 114))
             content_bk.text(

plugins/statistics/statistics_handle.py

@@ -276,4 +276,4 @@ def update_data(data: dict):
                     tmp_dict[plugin_name] = 1
                 else:
                     tmp_dict[plugin_name] += data[day][plugin_name]
-    return tmp_dict
+    return tmp_dict

plugins/web_ui/__init__.py

@@ -0,0 +1,20 @@
+from configs.config import Config as gConfig
+from .manager import *
+from .auth import *
+
+
+gConfig.add_plugin_config(
+    "web-ui",
+    "username",
+    "admin",
+    name="web-ui",
+    help_="前端管理用户名"
+)
+
+gConfig.add_plugin_config(
+    "web-ui",
+    "password",
+    None,
+    name="web-ui",
+    help_="前端管理密码"
+)

plugins/web_ui/auth/__init__.py

@@ -0,0 +1,89 @@
+from datetime import datetime, timedelta
+from typing import Optional
+from starlette import status
+from fastapi import Depends, HTTPException
+from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
+from pydantic import BaseModel
+from configs.config import Config
+from jose import JWTError, jwt
+import nonebot
+
+app = nonebot.get_app()
+
+
+SECRET_KEY = "09d25e094faa6ca2556c818166b7a9563b93f7099f6f0f4caa6cf63b88e8d3e7"
+ALGORITHM = "HS256"
+ACCESS_TOKEN_EXPIRE_MINUTES = 30
+
+oauth2_scheme = OAuth2PasswordBearer(tokenUrl="webui/login")
+
+
+class User(BaseModel):
+    username: str
+    password: str
+
+
+class Token(BaseModel):
+    access_token: str
+    token_type: str
+
+
+# USER_LIST = [
+#     User(username="admin", password="123")
+# ]
+
+
+def get_user(uname: str) -> Optional[User]:
+    username = Config.get_config("web-ui", "username")
+    password = Config.get_config("web-ui", "password")
+    if username and password and uname == username:
+        return User(username=username, password=password)
+
+
+form_exception = HTTPException(
+    status_code=status.HTTP_401_UNAUTHORIZED,
+    detail="Could not validate credentials",
+    headers={"WWW-Authenticate": "Bearer"},
+)
+
+
+def create_token(user: User, expires_delta: Optional[timedelta] = None):
+    expire = datetime.utcnow() + expires_delta or timedelta(minutes=15)
+    return jwt.encode(
+        claims={"sub": user.username, "exp": expire},
+        key=SECRET_KEY,
+        algorithm=ALGORITHM
+    )
+
+
+@app.post("/webui/login")
+async def login_get_token(form_data: OAuth2PasswordRequestForm = Depends()):
+    user: User = get_user(form_data.username)
+    if not user or user.password != form_data.password:
+        raise form_exception
+    access_token = create_token(user=user, expires_delta=timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES))
+    return {"access_token": access_token, "token_type": "bearer"}
+
+
+credentials_exception = HTTPException(
+    status_code=status.HTTP_401_UNAUTHORIZED,
+    detail="Could not validate credentials",
+    headers={"WWW-Authenticate": "Bearer"},
+)
+
+
+def token_to_user(token: str = Depends(oauth2_scheme)):
+    try:
+        payload = jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM])
+        username, expire = payload.get("sub"), payload.get("exp")
+        user = get_user(username)
+        if user is None:
+            raise JWTError
+    except JWTError:
+        raise credentials_exception
+    return user
+
+
+if __name__ == '__main__':
+    import uvicorn
+    uvicorn.run(app, host="127.0.0.1", port=8080)