Merge pull request #30 from Aidenable/dev

v1.3.7: URL value in @rt.keyboard.static

Author: Aidenable

docs/source/plugins/conversations.rst

@@ -5,6 +5,13 @@ Building multi-step dialogs in Telegram bots is often clunky.
 
 Raito provides a lightweight way to wait for the **next user message** in a clean, linear style.
 
+.. warning::
+
+   Conversations DO NOT work with ``Dispatcher.events_isolation``,
+   since ``SimpleEventIsolation`` operates with a ``asyncio.Lock`` on active handlers,
+   and ``wait_for`` will never receive an update.
+
+
 --------
 
 Example

examples/12-conversations/__main__.py

@@ -2,6 +2,7 @@
 from pathlib import Path
 
 from aiogram import Bot, Dispatcher
+from aiogram.fsm.storage.memory import DisabledEventIsolation
 
 from raito import Raito
 
@@ -10,7 +11,7 @@
 DEBUG = False
 
 bot = Bot(token=TOKEN)
-dispatcher = Dispatcher()
+dispatcher = Dispatcher(events_isolation=DisabledEventIsolation())
 raito = Raito(dispatcher, HANDLERS_DIR, developers=[], locales=["en"], production=not DEBUG)
 raito.init_logging()
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "raito"
-version = "1.3.6"
+version = "1.3.7"
 description = "REPL, hot-reload, keyboards, pagination, and internal dev tools — all in one. That's Raito."
 authors = [{ name = "Aiden", email = "aidenthedev@gmail.com" }]
 license = "MIT"

raito/plugins/keyboards/static.py

@@ -20,7 +20,7 @@
 P = ParamSpec("P")
 R = TypeVar("R")
 
-ButtonData: TypeAlias = str | tuple[str] | tuple[str, str]
+ButtonData: TypeAlias = str | tuple[str] | tuple[str, str] | list[str]
 LayoutRow: TypeAlias = Sequence[ButtonData]
 LayoutReturn: TypeAlias = Sequence[ButtonData | LayoutRow]
 
@@ -31,6 +31,12 @@
 BuilderFn: TypeAlias = Callable[P, KeyboardMarkupT]
 
 
+@overload
+def _get_button(data: ButtonData, *, inline: Literal[True]) -> InlineKeyboardButton: ...
+@overload
+def _get_button(data: ButtonData, *, inline: Literal[False]) -> KeyboardButton: ...
+@overload
+def _get_button(data: ButtonData, *, inline: bool) -> InlineKeyboardButton | KeyboardButton: ...
 def _get_button(data: ButtonData, *, inline: bool) -> InlineKeyboardButton | KeyboardButton:
     """Convert button data to the appropriate button type.
 
@@ -44,7 +50,24 @@ def _get_button(data: ButtonData, *, inline: bool) -> InlineKeyboardButton | Key
 
     if isinstance(data, str) or len(data) != 2:
         raise ValueError("InlineKeyboardButton must be tuple of (text, callback_data)")
-    return InlineKeyboardButton(text=data[0], callback_data=data[1])
+
+    name, value = data
+
+    url: str | None = None
+    if value.startswith("t.me/"):
+        url = "https://" + value
+    elif value.startswith(
+        (
+            "http://",
+            "https://",
+            "tg://",
+        )
+    ):
+        url = value
+
+    if url:
+        return InlineKeyboardButton(text=name, url=url)
+    return InlineKeyboardButton(text=name, callback_data=value)
 
 
 def _is_button(row: LayoutRow) -> bool: