ryg/royalnet
ryg/royalnet
1
Fork 0
mirror of https://github.com/RYGhub/royalnet.git synced 2024-11-23 19:44:20 +00:00
Code Activity

Successfully get rid of interfaces in the telegram serf

Browse source
This commit is contained in:
Steffo 2020-08-05 01:21:55 +02:00
parent 51a50a3b2a
commit f33e781e04
1 changed files with 30 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
royalnet/serf/telegram/telegramserf.py
View file

@ -1,17 +1,19 @@
from typing import *
import contextlib import contextlib
import logging import logging
import asyncio as aio import asyncio as aio
import uuid import uuid
from typing import *
import royalnet.commands as rc
import royalnet.utils as ru
import royalnet.backpack.tables as rbt
from .escape import escape
from ..serf import Serf
import io
import telegram import telegram
import urllib3 import urllib3
from telegram.utils.request import Request as TRequest from telegram.utils.request import Request as TRequest
from dataclasses import dataclass
import royalnet.commands as rc
import royalnet.utils as ru
import royalnet.backpack.tables as rbt
from .escape import escape
from ..serf import Serf
try: try:
from sqlalchemy.orm.session import Session from sqlalchemy.orm.session import Session
@ -21,6 +23,12 @@ except ImportError:
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@dataclass(frozen=True)
class TelegramKeyCallback:
command: rc.Command
key: rc.KeyboardKey
class TelegramSerf(Serf): class TelegramSerf(Serf):
"""A Serf that connects to `Telegram <https://telegram.org/>`_ as a bot.""" """A Serf that connects to `Telegram <https://telegram.org/>`_ as a bot."""
interface_name = "telegram" interface_name = "telegram"
@ -55,7 +63,7 @@ class TelegramSerf(Serf):
self.update_offset: int = -100 self.update_offset: int = -100
"""The current `update offset <https://core.telegram.org/bots/api#getupdates>`_.""" """The current `update offset <https://core.telegram.org/bots/api#getupdates>`_."""
self.key_callbacks: Dict[str, rc.KeyboardKey] = {} self.key_callbacks: Dict[str, TelegramKeyCallback] = {}
self.MessageData: Type[rc.CommandData] = self.message_data_factory() self.MessageData: Type[rc.CommandData] = self.message_data_factory()
self.CallbackData: Type[rc.CommandData] = self.callback_data_factory() self.CallbackData: Type[rc.CommandData] = self.callback_data_factory()
@ -106,7 +114,7 @@ class TelegramSerf(Serf):
parse_mode="HTML", parse_mode="HTML",
disable_web_page_preview=True) disable_web_page_preview=True)
async def reply_image(data, image: io.IOBase, caption: Optional[str] = None) -> None: async def reply_image(data, image: BinaryIO, caption: Optional[str] = None) -> None:
await self.api_call(data.message.chat.send_photo, await self.api_call(data.message.chat.send_photo,
photo=image, photo=image,
caption=escape(caption) if caption is not None else None, caption=escape(caption) if caption is not None else None,
@ -138,7 +146,7 @@ class TelegramSerf(Serf):
for key in keys: for key in keys:
uid: str = str(uuid.uuid4()) uid: str = str(uuid.uuid4())
key_uids.append(uid) key_uids.append(uid)
self.register_keyboard_key(uid, key) data.register_keyboard_key(uid, key)
tg_button: telegram.InlineKeyboardButton = telegram.InlineKeyboardButton(key.text, tg_button: telegram.InlineKeyboardButton = telegram.InlineKeyboardButton(key.text,
callback_data=uid) callback_data=uid)
tg_row: List[telegram.InlineKeyboardButton] = [tg_button] tg_row: List[telegram.InlineKeyboardButton] = [tg_button]
@ -152,7 +160,13 @@ class TelegramSerf(Serf):
yield message yield message
await self.api_call(message.edit_reply_markup, reply_markup=None) await self.api_call(message.edit_reply_markup, reply_markup=None)
for uid in key_uids: for uid in key_uids:
self.unregister_keyboard_key(uid) data.unregister_keyboard_key(uid)
def register_keyboard_key(data, identifier: str, key: rc.KeyboardKey):
self.key_callbacks[identifier] = TelegramKeyCallback(key=key, command=data.command)
def unregister_keyboard_key(data, identifier: str):
del self.key_callbacks[identifier]
return TelegramMessageData return TelegramMessageData
@ -238,6 +252,7 @@ class TelegramSerf(Serf):
# Send a typing notification # Send a typing notification
await self.api_call(message.chat.send_action, telegram.ChatAction.TYPING) await self.api_call(message.chat.send_action, telegram.ChatAction.TYPING)
# Prepare data # Prepare data
# noinspection PyArgumentList
data = self.MessageData(command=command, message=message) data = self.MessageData(command=command, message=message)
# Call the command # Call the command
await self.call(command, data, parameters) await self.call(command, data, parameters)
@ -247,15 +262,10 @@ class TelegramSerf(Serf):
if uid not in self.key_callbacks: if uid not in self.key_callbacks:
await self.api_call(cbq.answer, text="⚠️ This keyboard has expired.", show_alert=True) await self.api_call(cbq.answer, text="⚠️ This keyboard has expired.", show_alert=True)
return return
key: rc.KeyboardKey = self.key_callbacks[uid] cbd = self.key_callbacks[uid]
data: rc.CommandData = self.CallbackData(command=command, cbq=cbq) # noinspection PyArgumentList
await self.press(key, data) data: rc.CommandData = self.CallbackData(command=cbd.command, cbq=cbq)
await self.press(cbd.key, data)
def register_keyboard_key(self, identifier: str, key: rc.KeyboardKey):
self.key_callbacks[identifier] = key
def unregister_keyboard_key(self, identifier: str):
del self.key_callbacks[identifier]
async def run(self): async def run(self):
await super().run() await super().run()