revert 512275a8b8

revert Switch to synchronous Python.

Signed-off-by: Abdulkadir Furkan Şanlı <me@abdulocra.cy>

Dockerfile

@@ -1,12 +1,15 @@
-FROM python:3
+FROM python:3.14
+
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
 
 ENV PYTHONUNBUFFERED=1
 
 WORKDIR /usr/src/app
 
-COPY main.py parker.gif requirements.txt ./
+COPY requirements.txt ./
+RUN uv pip install --system --no-cache -r requirements.txt
 
-RUN pip install --no-cache-dir -r requirements.txt
+COPY main.py parker.gif ./
 
 USER 1000:1000
 

README.md

@@ -1,16 +1,17 @@
 # ParkerBot
 
 ParkerBot is a Matrix bot that monitors a channel for YouTube links and
-generates weekly playlists from them.
+generates weekly playlists from them. It also sends YouTube link titles to the
+channel it's in.
 
 ## Running locally
 
 1. Clone the repo
 2. Install the dependencies, preferably in a venv:
    ```shell
-   python3 -m venv venv
+   uv venv --python 3.14 --seed
-   source ./venv/bin/activate
+   source .venv/bin/activate
-   pip3 install -r requirements.txt
+   uv pip install -r requirements.txt
    ```
 3. Copy [example.env](example.env) to `.env`, customize it.
 4. Source `.env`:

main.py

@@ -4,6 +4,7 @@
 import argparse
 import asyncio
 import datetime
+import html
 import os
 import pickle
 import re
@@ -177,29 +178,31 @@ def add_video_to_playlist(youtube, playlist_id, video_id, retry_count=6):
                 continue
             raise error
 
+
 def get_video_info(youtube, video_id):
-    """Check whether a YouTube video is music and return its title."""
+    """Check whether a YouTube video is music and return its title and channel."""
     try:
         video_details = youtube.videos().list(id=video_id, part="snippet").execute()
         
         # Check if the video actually exists/is accessible
         if not video_details.get("items"):
-            return False, "[Video unavailable or private]"
+            return False, "[Video unavailable or private]", ""
 
         snippet = video_details["items"][0]["snippet"]
         
         # Check if the video category is Music (10) or Entertainment (24)
         is_music = snippet.get("categoryId") in ("10", "24")
         title = snippet.get("title", "[Unknown Title]")
+        channel = snippet.get("channelTitle", "[Unknown Channel]")
         
-        return is_music, title
+        return is_music, title, channel
 
     except errors.HttpError as error:
         print(f"YouTube API error fetching info for {video_id}: {error}")
-        return False, "[Error fetching title]"
+        return False, "[Error fetching title]", ""
     except Exception as e:
         print(f"Unexpected error fetching info for {video_id}: {e}")
-        return False, "[Error fetching title]"
+        return False, "[Error fetching title]", ""
 
 
 async def send_intro_message(client, sender, room_id):
@@ -256,6 +259,7 @@ async def send_playlist_of_all(client, sender, room_id, playlist_id):
         content={"msgtype": "m.text", "body": reply_msg},
     )
 
+
 async def message_callback(conn, cursor, youtube, client, room, event):
     """Event handler for received messages."""
     sender = event.sender
@@ -273,7 +277,9 @@ async def message_callback(conn, cursor, youtube, client, room, event):
             event.server_timestamp / 1000, datetime.UTC  # millisec to sec
         )
         current_time = datetime.datetime.now(datetime.UTC)
-        recent = current_time - timestamp_sec < datetime.timedelta(seconds=30)
+        
+        # Account for up to 5 minutes of clock drift
+        recent = abs(current_time - timestamp_sec) < datetime.timedelta(minutes=5)
 
         if body == "!parkerbot" and recent:
             await send_intro_message(client, sender, room.room_id)
@@ -296,16 +302,29 @@ async def message_callback(conn, cursor, youtube, client, room, event):
         for link in youtube_links:
             video_id = link.split("v=")[-1].split("&")[0].split("/")[-1]
             
-            # Safely fetch the category check and the title
+            # Safely fetch the category check, title, and channel
-            is_music_vid, title = get_video_info(youtube, video_id)
+            is_music_vid, title, channel = get_video_info(youtube, video_id)
             
             # Send the title to the channel so people know what the link is
             # Only do this for recent messages to prevent spam during backwards-sync
             if recent:
+                plain_text = f"{title}"
+                if channel:
+                    plain_text += f" - {channel}"
+                
+                # Escape HTML characters to prevent broken rendering in Matrix
+                escaped_text = html.escape(plain_text)
+                html_text = f"<em><span data-mx-color='#808080'>{escaped_text}</span></em>"
+                    
                 await client.room_send(
                     room_id=room.room_id,
                     message_type="m.room.message",
-                    content={"msgtype": "m.text", "body": f"▶️ {title}"},
+                    content={
+                        "msgtype": "m.text", 
+                        "body": plain_text,
+                        "format": "org.matrix.custom.html",
+                        "formatted_body": html_text
+                    },
                 )
 
             # Only add to the playlist if it's categorized as music/entertainment

requirements.txt

@@ -1,3 +1,3 @@
 matrix-nio == 0.24.0
-google-auth-oauthlib
+google-auth-oauthlib == 1.3.1
-google-api-python-client
+google-api-python-client == 2.194.0