fix webhook set as false in compose yaml

common.py

@@ -13,7 +13,7 @@ ADMIN = [int(i) for i in os.getenv("BOT_ADMIN", "").split(",") if i]
 
 PIXIV_REFRESH_TOKEN = os.getenv("PIXIV_REFRESH_TOKEN")
 
-WEBHOOK = os.getenv("WEBHOOK", False)
+WEBHOOK = os.getenv("WEBHOOK").strip().lower() in ("true", "yes", "1")
 if WEBHOOK:
     WEBHOOK_LISTEN = os.getenv("WEBHOOK_LISTEN", "0.0.0.0")
     WEBHOOK_PORT = int(os.getenv("WEBHOOK_PORT", 8443))

main.py

@@ -162,6 +162,22 @@ async def query_template(update: Update, context: CustomContext) -> None:
     await _edit_message.forward[0].edit_caption(context.chat_data.template[name])
 
 
+@send_action(ChatAction.TYPING)
+async def cmd_start(update: Update, context: CustomContext) -> None:
+    await update.effective_message.reply_text(
+        "Welcome to the Twitter Fetcher Bot!\n"
+        "You can use this bot to fetch tweets from Twitter and forward them to a channel.\n"
+        "Use /set_forward_channel to set a channel to forward tweets.\n"
+        "Use /remove_forward_channel to remove the channel.\n"
+        "Use /edit_before_forward to enable or disable edit before forward.\n"
+        "Use /set_template to set a template for the forwarded message.\n"
+        "Use /bot_dict to see the bot's data.\n"
+        "Use /clear_edit_message to clear the edit message cache.\n"
+        "You can also reply to a message with a tweet URL to fetch the tweet and forward it to the channel.\n"
+        "You can also use inline query to search for tweets."
+    )
+
+
 @send_action(ChatAction.TYPING)
 async def cmd_set_forward_channel(update: Update, context: CustomContext) -> None:
     if not context.args:
@@ -289,6 +305,7 @@ def main():
         MessageHandler((filters.Regex(regex.x_url) | filters.Regex(regex.pixiv_url)) | filters.Regex(
             regex.bsky_url) & filters.ChatType.PRIVATE,
                        handel_url_media),
+        CommandHandler("start", cmd_start),
         CommandHandler("set_forward_channel", cmd_set_forward_channel),
         CommandHandler("remove_forward_channel", cmd_remove_forward_channel),
         CommandHandler("edit_before_forward", cmd_edit_before_forward),

requirements.txt

@@ -1,4 +1,4 @@
-python-telegram-bot[webhooks]~=21.7
+python-telegram-bot[webhooks]~=22.5
 httpx[http2]~=0.27
-uvloop~=0.21; sys_platform != 'win32'
+uvloop~=0.22; sys_platform != 'win32'
 async-pixiv @ git+https://github.com/TheFunny/async-pixiv@main

utils/bsky.py

@@ -157,6 +157,7 @@ class ProcessBsky:
     @property
     def _sensitive(self) -> bool:
         return any(
-            tag in self._bsky['labels']
+            tag in label['val']
+            for label in self._bsky['labels']
             for tag in SENSITIVE_TAG
         )

utils/regex.py

@@ -1,10 +1,11 @@
 import re
 
-x_url = re.compile(r"^(?:https?://)?(?:www\.|mobile\.)?(?:x|twitter|fixvx|vxtwitter)\.com/(.+)/status/(\d+)")
+x_url = re.compile(
+    r"^(?:https?://)?(?:www\.|mobile\.)?(?:x|twitter|fixvx|vxtwitter|fixupx|fxtwitter)\.com/(.+)/status/(\d+)")
 x_media_url = re.compile(r"^(?:https?://)?(pbs|video)\.twimg\.com/(.*)")
 x_tco_url = re.compile(r"(?:https?://)?t\.co/.+$", re.M)
 message_url = re.compile(r"\[.+]", re.S)
 
 pixiv_url = re.compile(r"^(?:https?://)?(?:www\.)?pixiv\.net/(?:en/)?(?:artworks/|i/)(\d+)")
 
-bsky_url = re.compile(r"^(?:https?://)?(?:bsky)\.app/profile/(.+)/post/(.+)")
+bsky_url = re.compile(r"^(?:https?://)?bsky\.app/profile/(.+)/post/(.+)")

utils/tweet.py

@@ -84,7 +84,7 @@ class Tweet:
 
     @cached_property
     def url(self) -> str:
-        return f"https://twitter.com/{self._author_id}/status/{self._id}"
+        return f"https://x.com/{self._author_id}/status/{self._id}"
 
     @property
     def author(self) -> str:
@@ -92,7 +92,7 @@ class Tweet:
 
     @cached_property
     def author_url(self) -> str:
-        return f"https://twitter.com/{self._author_id}"
+        return f"https://x.com/{self._author_id}"
 
     @property
     def text(self) -> str: