backup

.gitignore

@@ -138,10 +138,21 @@ dmypy.json
 # Cython debug symbols
 cython_debug/
 
+configs/config.py
+demo.py
 test.py
 server_ip.py
-game_utils.py
 member_activity_handle.py
 Yu-Gi-Oh/
 csgo/
 fantasy_card/
+data/
+log/
+backup/
+extensive_plugin/
+test/
+bot.py
+data/
+.env
+.env.dev
+resources/

README.md

@@ -128,7 +128,7 @@
 - [x] 移动图片  （同上）
 - [x] 删除图片  （同上）
 - [x] 群内B站订阅
-- [x] 群词条
+- [x] 词条设置
 - [x] 休息吧/醒来
 
 ### 已实现的超级用户功能
@@ -245,8 +245,51 @@ __Docker 全量版（包含 真寻Bot PostgreSQL数据库 go-cqhttp webui等）_
 **点击上方的 GitHub 徽标查看教程**  
 PS: **ARM平台** 请使用全量版 同时 **如果你的机器 RAM < 1G 可能无法正常启动全量版容器**
 
+## [爱发电](https://afdian.net/@HibiKier)
+<details>
+<summary>爱发电 以及 感谢投喂 </summary>
+<img width="365px" height="450px" src="https://user-images.githubusercontent.com/45528451/175059389-cfeb8174-fa07-4939-80ab-a039087a50f6.png">
+
+### 感谢名单
+(可以告诉我你的 __github__ 地址，我偷偷换掉0v|)  
+[爱发电用户_b9S4](https://afdian.net/u/3d8f30581a2911edba6d52540025c377) 
+[爱发电用户_c58s](https://afdian.net/u/a6ad8dda195e11ed9a4152540025c377) 
+[爱发电用户_eNr9](https://afdian.net/u/05fdb41c0c9a11ed814952540025c377)   
+[MangataAkihi](https://github.com/Sakuracio)   
+[炀](https://afdian.net/u/69b76e9ec77b11ec874f52540025c377)   
+[爱发电用户_Bc6j](https://afdian.net/u/8546be24f44111eca64052540025c377)   
+[大魔王](https://github.com/xipesoy)   
+[CopilotLaLaLa](https://github.com/CopilotLaLaLa)  
+[嘿小欧](https://afdian.net/u/daa4bec4f24911ec82e552540025c377)   
+[回忆的秋千](https://afdian.net/u/e315d9c6f14f11ecbeef52540025c377)  
+[十年くん](https://github.com/shinianj)
+[哇](https://afdian.net/u/9b266244f23911eca19052540025c377)  
+[yajiwa](https://github.com/yajiwa)  
+[爆金币](https://afdian.net/u/0d78879ef23711ecb22452540025c377)  
+
+
+</details>
+
+
 ## 更新
 
+### 2022/8/21
+
+* 重构群词条，改为词库Plus，增加 精准|模糊|正则 问题匹配，问题与回答均支持at，image，face，超级用户额外提供 全局|私聊 词库设置，数据迁移目前只提供了问题和回答都是纯文本的词条
+* 修复b站转发解析av号无法解析
+* 改进插件 `我有一个朋友`，避免触发过于频繁 [@pull/1001](https://github.com/HibiKier/zhenxun_bot/pull/1001)
+* 原神便笺新增洞天宝钱和参量质变仪提示 [@pull/1005](https://github.com/HibiKier/zhenxun_bot/pull/1005)
+* 新增米游社签到功能，自动领取（白嫖）米游币 [@pull/991](https://github.com/HibiKier/zhenxun_bot/pull/991)
+
+### 2022/8/14
+
+* 修复epic未获取到时间时出错
+* 修复订阅主播时动态获取的id是直播间id
+
+### 2022/8/8
+
+* 修复赛马娘重载卡池失败的问题 [@pull/969](https://github.com/HibiKier/zhenxun_bot/pull/969)
+
 ### 2022/8/3
 
 * 修复 bili动态链接在投稿视频时URL和分割线连在一起 [@pull/951](https://github.com/HibiKier/zhenxun_bot/pull/961)
@@ -268,7 +311,7 @@ PS: **ARM平台** 请使用全量版 同时 **如果你的机器 RAM < 1G 可能
 * 替换了cos和bt的url [@pull/951](https://github.com/HibiKier/zhenxun_bot/pull/951)
 * 发言记录统计添加日消息统计 [@pull/953](https://github.com/HibiKier/zhenxun_bot/pull/953)
 
-### 2022/7/24
+### 2022/7/24 \[v0.1.6.2]
 
 * 订阅up动态提供直链
 
@@ -738,10 +781,6 @@ __..... 更多更新信息请查看文档__
 ## Todo
 - [ ] web管理
 
-## 爱发电
-
-<img width="365px" height="450px" src="https://user-images.githubusercontent.com/45528451/175059389-cfeb8174-fa07-4939-80ab-a039087a50f6.png">
-
 ## 感谢
 [botuniverse / onebot](https://github.com/botuniverse/onebot) ：超棒的机器人协议  
 [Mrs4s / go-cqhttp](https://github.com/Mrs4s/go-cqhttp) ：cqhttp的golang实现，轻量、原生跨平台.  

basic_plugins/init_plugin_config/init_plugins_config.py

@@ -6,7 +6,6 @@
 from utils.text_utils import prompt2cn
 from utils.utils import get_matchers
 from ruamel import yaml
-import nonebot
 
 
 _yaml = YAML(typ="safe")

basic_plugins/scripts.py

@@ -108,6 +108,18 @@ async def _():
             "ALTER TABLE genshin ADD bind_group Integer;",
             "genshin"
         ),  # 新增原神群号绑定字段
+        (
+            "ALTER TABLE genshin ADD login_ticket VARCHAR(255) DEFAULT '';",
+            "genshin"
+        ),  # 新增米游社login_ticket绑定字段
+        (
+            "ALTER TABLE genshin ADD stuid VARCHAR(255) DEFAULT '';",
+            "genshin"
+        ),  # 新增米游社stuid绑定字段
+        (
+            "ALTER TABLE genshin ADD stoken VARCHAR(255) DEFAULT '';",
+            "genshin"
+        ),  # 新增米游社stoken绑定字段
         (
             "ALTER TABLE chat_history ADD plain_text Text;",
             "chat_history"

plugins/bilibili_sub/__init__.py

@@ -234,7 +234,7 @@ async def _():
                 rst = await get_sub_status(sub.sub_id, sub.sub_type)
                 await send_sub_msg(rst, sub, bot)
                 if sub.sub_type == "live":
-                    rst = await get_sub_status(sub.sub_id, "up")
+                    rst = await get_sub_status(sub.uid, "up")
                     await send_sub_msg(rst, sub, bot)
         except Exception as e:
             logger.error(f"B站订阅推送发生错误 sub_id：{sub.sub_id if sub else 0} {type(e)}：{e}")

plugins/bilibili_sub/data_source.py

@@ -38,39 +38,39 @@ async def add_live_sub(live_id: int, sub_user: str) -> str:
     :param sub_user: 订阅用户 id # 7384933:private or 7384933:2342344(group)
     :return:
     """
+    # try:
     try:
-        async with db.transaction():
-            try:
-                """bilibili_api.live库的LiveRoom类中get_room_info改为bilireq.live库的get_room_info_by_id方法"""
-                live_info = await get_room_info_by_id(live_id)
-            except ResponseCodeError:
-                return f"未找到房间号Id：{live_id} 的信息，请检查Id是否正确"
-            uid = live_info["uid"]
-            room_id = live_info["room_id"]
-            short_id = live_info["short_id"]
-            title = live_info["title"]
-            live_status = live_info["live_status"]
-            if await BilibiliSub.add_bilibili_sub(
-                room_id,
-                "live",
-                sub_user,
-                uid=uid,
-                live_short_id=short_id,
-                live_status=live_status,
-            ):
-                await _get_up_status(live_id)
-                uname = (await BilibiliSub.get_sub(live_id)).uname
-                return (
-                    "已成功订阅主播：\n"
-                    f"\ttitle：{title}\n"
-                    f"\tname： {uname}\n"
-                    f"\tlive_id：{live_id}\n"
-                    f"\tuid：{uid}"
-                )
-            else:
-                return "添加订阅失败..."
-    except Exception as e:
-        logger.error(f"订阅主播live_id：{live_id} 发生了错误 {type(e)}：{e}")
+        """bilibili_api.live库的LiveRoom类中get_room_info改为bilireq.live库的get_room_info_by_id方法"""
+        live_info = await get_room_info_by_id(live_id)
+    except ResponseCodeError:
+        return f"未找到房间号Id：{live_id} 的信息，请检查Id是否正确"
+    uid = live_info["uid"]
+    room_id = live_info["room_id"]
+    short_id = live_info["short_id"]
+    title = live_info["title"]
+    live_status = live_info["live_status"]
+    await BilibiliSub.add_bilibili_sub(
+        room_id,
+        "live",
+        sub_user,
+        uid=uid,
+        live_short_id=short_id,
+        live_status=live_status,
+    )
+    # await _get_up_status(live_id)
+    uname = (await BilibiliSub.get_sub(live_id)).uname
+    # uname = 1
+    return (
+        "已成功订阅主播：\n"
+        f"\ttitle：{title}\n"
+        f"\tname： {uname}\n"
+        f"\tlive_id：{live_id}\n"
+        f"\tuid：{uid}"
+        )
+    # else:
+    #     return "添加订阅失败..."
+    # except Exception as e:
+    #     logger.error(f"订阅主播live_id：{live_id} 发生了错误 {type(e)}：{e}")
     return "添加订阅失败..."
 
 
@@ -243,7 +243,7 @@ async def _get_live_status(id_: int) -> Optional[str]:
 async def _get_up_status(id_: int) -> Optional[str]:
     """
     获取用户投稿状态
-    :param id_: 用户 id
+    :param id_: 订阅 id
     :return:
     """
     _user = await BilibiliSub.get_sub(id_)

plugins/bilibili_sub/model.py

@@ -65,44 +65,43 @@ async def add_bilibili_sub(
             :param season_update_time: 番剧更新时间
         """
         try:
-            async with db.transaction():
-                query = (
-                    await cls.query.where(cls.sub_id == sub_id)
-                    .with_for_update()
-                    .gino.first()
+            query = (
+                await cls.query.where(cls.sub_id == sub_id)
+                .with_for_update()
+                .gino.first()
+            )
+            sub_user = sub_user if sub_user[-1] == "," else f"{sub_user},"
+            if query:
+                if sub_user not in query.sub_users:
+                    sub_users = query.sub_users + sub_user
+                    await query.update(sub_users=sub_users).apply()
+            else:
+                sub = await cls.create(
+                    sub_id=sub_id, sub_type=sub_type, sub_users=sub_user
                 )
-                sub_user = sub_user if sub_user[-1] == "," else f"{sub_user},"
-                if query:
-                    if sub_user not in query.sub_users:
-                        sub_users = query.sub_users + sub_user
-                        await query.update(sub_users=sub_users).apply()
-                else:
-                    sub = await cls.create(
-                        sub_id=sub_id, sub_type=sub_type, sub_users=sub_user
-                    )
-                    await sub.update(
-                        live_short_id=live_short_id
-                        if live_short_id
-                        else sub.live_short_id,
-                        live_status=live_status if live_status else sub.live_status,
-                        dynamic_upload_time=dynamic_upload_time
-                        if dynamic_upload_time
-                        else sub.dynamic_upload_time,
-                        uid=uid if uid else sub.uid,
-                        uname=uname if uname else sub.uname,
-                        latest_video_created=latest_video_created
-                        if latest_video_created
-                        else sub.latest_video_created,
-                        season_update_time=season_update_time
-                        if season_update_time
-                        else sub.season_update_time,
-                        season_current_episode=season_current_episode
-                        if season_current_episode
-                        else sub.season_current_episode,
-                        season_id=season_id if season_id else sub.season_id,
-                        season_name=season_name if season_name else sub.season_name,
-                    ).apply()
-                return True
+                await sub.update(
+                    live_short_id=live_short_id
+                    if live_short_id
+                    else sub.live_short_id,
+                    live_status=live_status if live_status else sub.live_status,
+                    dynamic_upload_time=dynamic_upload_time
+                    if dynamic_upload_time
+                    else sub.dynamic_upload_time,
+                    uid=uid if uid else sub.uid,
+                    uname=uname if uname else sub.uname,
+                    latest_video_created=latest_video_created
+                    if latest_video_created
+                    else sub.latest_video_created,
+                    season_update_time=season_update_time
+                    if season_update_time
+                    else sub.season_update_time,
+                    season_current_episode=season_current_episode
+                    if season_current_episode
+                    else sub.season_current_episode,
+                    season_id=season_id if season_id else sub.season_id,
+                    season_name=season_name if season_name else sub.season_name,
+                ).apply()
+            return True
         except Exception as e:
             logger.info(f"bilibili_sub 添加订阅错误 {type(e)}: {e}")
         return False

plugins/draw_card/handles/base_handle.py

@@ -50,6 +50,7 @@ class UpEvent(BaseModel):
     start_time: Optional[datetime]  # 开始时间
     end_time: Optional[datetime]  # 结束时间
     up_char: List[UpChar]  # up对象
+    up_name: str = ""  # up名称
 
 
 TC = TypeVar("TC", bound="BaseData")

plugins/draw_card/handles/pretty_handle.py

@@ -350,48 +350,52 @@ async def update_up_char(self):
             char_img = ""
             card_img = ""
             up_chars = []
+            up_chars_name = []
             up_cards = []
+            up_cards_name = []            
             soup = BeautifulSoup(result, "lxml")
             heads = soup.find_all("span", {"class": "mw-headline"})
             for head in heads:
-                if "时间" in head.text:
+                if "时间" in head.text or "期间" in head.text:
                     time = head.find_next("p").text.split("\n")[0]
                     if "～" in time:
                         start, end = time.split("～")
                         start_time = dateparser.parse(start)
                         end_time = dateparser.parse(end)
                 elif "赛马娘" in head.text:
-                    char_img = head.find_next("a", {"class": "image"}).find("img")[
+                    char_img = head.find_next("center").find("img")[
                         "src"
                     ]
                     lines = str(head.find_next("p").text).split("\n")
                     chars = [
                         line
                         for line in lines
-                        if "★" in line and "（" in line and "）" in line
+                        if "★" in line and "【" in line and "】" in line
                     ]
-                    for char in chars:
+                    for char in set(chars):  # list去重
                         star = char.count("★")
-                        name = re.split(r"[（）]", char)[-2].strip()
+                        name = re.split(r"[【】]", char)[-2].strip()
                         up_chars.append(
                             UpChar(name=name, star=star, limited=False, zoom=70)
                         )
+                        up_chars_name.append(name)
                 elif "支援卡" in head.text:
-                    card_img = head.find_next("a", {"class": "image"}).find("img")[
+                    card_img = head.find_next("center").find("img")[
                         "src"
                     ]
                     lines = str(head.find_next("p").text).split("\n")
                     cards = [
                         line
                         for line in lines
-                        if "R" in line and "（" in line and "）" in line
+                        if "R" in line and "【" in line and "】" in line
                     ]
                     for card in cards:
                         star = 3 if "SSR" in card else 2 if "SR" in card else 1
-                        name = re.split(r"[（）]", card)[-2].strip()
+                        name = re.split(r"[【】]", card)[-2].strip()
                         up_cards.append(
                             UpChar(name=name, star=star, limited=False, zoom=70)
                         )
+                        up_cards_name.append(name)
             if start_time and end_time:
                 if start_time <= datetime.now() <= end_time:
                     self.UP_CHAR = UpEvent(
@@ -400,13 +404,15 @@ async def update_up_char(self):
                         start_time=start_time,
                         end_time=end_time,
                         up_char=up_chars,
+                        up_name=up_chars_name,
                     )
                     self.UP_CARD = UpEvent(
                         title=title,
                         pool_img=card_img,
                         start_time=start_time,
                         end_time=end_time,
                         up_char=up_cards,
+                        up_name=up_cards_name,
                     )
                     self.dump_up_char()
                     logger.info(f"成功获取{self.game_name_cn}当前up信息...当前up池: {title}")
@@ -418,9 +424,10 @@ async def _reload_pool(self) -> Optional[Message]:
         self.load_up_char()
         if self.UP_CHAR and self.UP_CARD:
             return Message(
-                Message.template("重载成功！\n当前UP池子：{}{:image}{:image}").format(
-                    self.UP_CHAR.title,
+                Message.template("重载成功！\n当前UP池子：{}{:image}\n当前支援卡池子：{}{:image}").format(
+                    self.UP_CHAR.up_name,
                     self.UP_CHAR.pool_img,
+                    self.UP_CARD.up_name,
                     self.UP_CARD.pool_img,
                 )
             )