From 0d14b0fdfe55af925e46a59c3cfad1e56d632b0f Mon Sep 17 00:00:00 2001
From: xtaodada <xtao@xtaolink.cn>
Date: Mon, 19 Aug 2024 21:25:26 +0800
Subject: [PATCH] fix: bilibili BV filter

---
 modules/bilibili.py          | 4 ++--
 modules/bilibili_download.py | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/bilibili.py b/modules/bilibili.py
index f6e17db..2b1b55f 100644
--- a/modules/bilibili.py
+++ b/modules/bilibili.py
@@ -20,7 +20,7 @@ from scheduler import scheduler
 @bot.on_message(
     filters.incoming
     & filters.text
-    & filters.regex(r"av(\d{1,12})|BV(1[A-Za-z0-9]{2}4.1.7[A-Za-z0-9]{2})|b23.tv")
+    & filters.regex(r"av(\d{1,12})|BV(\w{10})|b23.tv")
     & ~(
         filters.command(["download", "bilibili_fav"])
         & (filters.user(bili_auth_user) | filters.chat(bili_auth_chat))
@@ -32,7 +32,7 @@ async def bili_resolve(_: Client, message: Message):
     """
     if "b23.tv" in message.text:
         message.text = await b23_extract(message.text)
-    p = re.compile(r"av(\d{1,12})|BV(1[A-Za-z0-9]{2}4.1.7[A-Za-z0-9]{2})")
+    p = re.compile(r"av(\d{1,12})|BV(\w{10})|b23.tv")
     video_number = p.search(message.text)
     if video_number:
         video_number = video_number[0]
diff --git a/modules/bilibili_download.py b/modules/bilibili_download.py
index 741cd79..fbda9fd 100644
--- a/modules/bilibili_download.py
+++ b/modules/bilibili_download.py
@@ -19,7 +19,7 @@ from models.services.bilifav import BiliFavAction
 async def bili_download_resolve(_: Client, message: Message):
     if "b23.tv" in message.text:
         message.text = await b23_extract(message.text)
-    p = re.compile(r"av(\d{1,12})|BV(1[A-Za-z0-9]{2}4.1.7[A-Za-z0-9]{2})")
+    p = re.compile(r"av(\d{1,12})|BV(\w{10})|b23.tv")
     video_number = p.search(message.text)
     if video_number:
         video_number = video_number[0]
@@ -80,9 +80,14 @@ async def bili_download_resolve_cb(_: Client, callback_query: CallbackQuery):
     video = create_video(video_number)
     if video_db := await BiliFavAction.get_by_bv_id(video.get_bvid()):
         await callback_query.answer("找到缓存")
+        caption = (
+            f"详细信息：https://t.me/{bilifav_channel_username}/{video_db.message_id}"
+            if video_db.message_id
+            else None
+        )
         await callback_query.message.reply_video(
             video_db.file_id,
-            caption=f"详细信息：https://t.me/{bilifav_channel_username}/{video_db.message_id}",
+            caption=caption,
             quote=True,
         )
         raise ContinuePropagation