Merge pull request #47 from pythonitalia/feature/targeted-announce

feat: targeted announce

Author: MattiaFailla

schema.sql

@@ -55,6 +55,7 @@ CREATE TABLE IF NOT EXISTS globally_verified_users (
 
 CREATE TABLE IF NOT EXISTS bot_chats (
     chat_id BIGINT PRIMARY KEY,
+    title TEXT,
     added_at TIMESTAMPTZ DEFAULT NOW()
 );
 
@@ -87,3 +88,7 @@ CREATE TABLE IF NOT EXISTS welcomed_users (
 -- Add welcome_delay_minutes column to group_settings (idempotent).
 ALTER TABLE group_settings
     ADD COLUMN IF NOT EXISTS welcome_delay_minutes INTEGER;
+
+-- Add title column to bot_chats for group name lookup (idempotent).
+ALTER TABLE bot_chats
+    ADD COLUMN IF NOT EXISTS title TEXT;

src/python_italy_bot/db/__init__.py

@@ -2,7 +2,7 @@
 
 from .base import AsyncRepository, Repository
 from .in_memory import InMemoryRepository
-from .models import Ban, Mute, Report
+from .models import Ban, Chat, Mute, Report
 from .postgres import PostgresRepository
 
 __all__ = [
@@ -11,6 +11,7 @@
     "InMemoryRepository",
     "PostgresRepository",
     "Ban",
+    "Chat",
     "Mute",
     "Report",
     "create_repository",

src/python_italy_bot/db/base.py

@@ -2,7 +2,7 @@
 
 from abc import ABC, abstractmethod
 
-from .models import KnownUser
+from .models import Chat, KnownUser
 
 
 class Repository(ABC):
@@ -109,7 +109,7 @@ def mark_globally_verified(self, user_id: int) -> None:
         ...
 
     @abstractmethod
-    def register_chat(self, chat_id: int) -> None:
+    def register_chat(self, chat_id: int, title: str | None = None) -> None:
         """Track a chat where the bot is active."""
         ...
 
@@ -118,6 +118,16 @@ def get_all_chats(self) -> list[int]:
         """Get all tracked chat IDs."""
         ...
 
+    @abstractmethod
+    def get_all_chats_with_titles(self) -> list[Chat]:
+        """Get all tracked chats with their titles."""
+        ...
+
+    @abstractmethod
+    def find_chats_by_title(self, query: str) -> list[Chat]:
+        """Find tracked chats whose title contains the query (case-insensitive)."""
+        ...
+
     @abstractmethod
     def add_global_ban(
         self,
@@ -290,7 +300,7 @@ async def mark_globally_verified(self, user_id: int) -> None:
         ...
 
     @abstractmethod
-    async def register_chat(self, chat_id: int) -> None:
+    async def register_chat(self, chat_id: int, title: str | None = None) -> None:
         """Track a chat where the bot is active."""
         ...
 
@@ -299,6 +309,16 @@ async def get_all_chats(self) -> list[int]:
         """Get all tracked chat IDs."""
         ...
 
+    @abstractmethod
+    async def get_all_chats_with_titles(self) -> list[Chat]:
+        """Get all tracked chats with their titles."""
+        ...
+
+    @abstractmethod
+    async def find_chats_by_title(self, query: str) -> list[Chat]:
+        """Find tracked chats whose title contains the query (case-insensitive)."""
+        ...
+
     @abstractmethod
     async def add_global_ban(
         self,

src/python_italy_bot/db/in_memory.py

@@ -3,7 +3,7 @@
 from datetime import datetime, timezone
 
 from .base import AsyncRepository
-from .models import Ban, KnownUser, Mute, Report
+from .models import Ban, Chat, KnownUser, Mute, Report
 
 
 class InMemoryRepository(AsyncRepository):
@@ -17,7 +17,7 @@ def __init__(self) -> None:
         self._reports: list[Report] = []
         self._welcome_messages: dict[int, str] = {}
         self._globally_verified: set[int] = set()
-        self._bot_chats: set[int] = set()
+        self._bot_chats: dict[int, str | None] = {}
         self._global_bans: dict[int, tuple[int, str | None]] = {}
         self._known_users: dict[int, KnownUser] = {}
         self._username_to_user_id: dict[str, int] = {}
@@ -141,11 +141,22 @@ async def is_globally_verified(self, user_id: int) -> bool:
     async def mark_globally_verified(self, user_id: int) -> None:
         self._globally_verified.add(user_id)
 
-    async def register_chat(self, chat_id: int) -> None:
-        self._bot_chats.add(chat_id)
+    async def register_chat(self, chat_id: int, title: str | None = None) -> None:
+        self._bot_chats[chat_id] = title
 
     async def get_all_chats(self) -> list[int]:
-        return list(self._bot_chats)
+        return list(self._bot_chats.keys())
+
+    async def get_all_chats_with_titles(self) -> list[Chat]:
+        return [Chat(chat_id=cid, title=t) for cid, t in self._bot_chats.items()]
+
+    async def find_chats_by_title(self, query: str) -> list[Chat]:
+        query_lower = query.lower()
+        return [
+            Chat(chat_id=cid, title=t)
+            for cid, t in self._bot_chats.items()
+            if t and query_lower in t.lower()
+        ]
 
     async def add_global_ban(
         self,

src/python_italy_bot/db/models.py

@@ -48,3 +48,11 @@ class Report:
     message_id: int | None
     reason: str | None
     created_at: datetime
+
+
+@dataclass
+class Chat:
+    """A tracked chat where the bot is active."""
+
+    chat_id: int
+    title: str | None

src/python_italy_bot/db/postgres.py

@@ -3,7 +3,7 @@
 from psycopg_pool import AsyncConnectionPool
 
 from .base import AsyncRepository
-from .models import KnownUser
+from .models import Chat, KnownUser
 
 
 class PostgresRepository(AsyncRepository):
@@ -208,15 +208,15 @@ async def mark_globally_verified(self, user_id: int) -> None:
                 (user_id,),
             )
 
-    async def register_chat(self, chat_id: int) -> None:
+    async def register_chat(self, chat_id: int, title: str | None = None) -> None:
         async with self._pool.connection() as conn:
             await conn.execute(
                 """
-                INSERT INTO bot_chats (chat_id)
-                VALUES (%s)
-                ON CONFLICT (chat_id) DO NOTHING
+                INSERT INTO bot_chats (chat_id, title)
+                VALUES (%s, %s)
+                ON CONFLICT (chat_id) DO UPDATE SET title = EXCLUDED.title
                 """,
-                (chat_id,),
+                (chat_id, title),
             )
 
     async def get_all_chats(self) -> list[int]:
@@ -226,6 +226,25 @@ async def get_all_chats(self) -> list[int]:
                 rows = await cur.fetchall()
                 return [row[0] for row in rows]
 
+    async def get_all_chats_with_titles(self) -> list[Chat]:
+        async with self._pool.connection() as conn:
+            async with conn.cursor() as cur:
+                await cur.execute(
+                    "SELECT chat_id, title FROM bot_chats ORDER BY chat_id"
+                )
+                rows = await cur.fetchall()
+                return [Chat(chat_id=row[0], title=row[1]) for row in rows]
+
+    async def find_chats_by_title(self, query: str) -> list[Chat]:
+        async with self._pool.connection() as conn:
+            async with conn.cursor() as cur:
+                await cur.execute(
+                    "SELECT chat_id, title FROM bot_chats WHERE title ILIKE %s",
+                    (f"%{query}%",),
+                )
+                rows = await cur.fetchall()
+                return [Chat(chat_id=row[0], title=row[1]) for row in rows]
+
     async def add_global_ban(
         self,
         user_id: int,