add inline run

actions.py

@@ -1,6 +1,7 @@
 from random import uniform
 from asyncio import sleep
 
+from aiohttp import ClientSession
 from tortoise.contrib.postgres.functions import Random
 from telethon.utils import get_input_document
 from telethon.tl.functions.stickers import (
@@ -15,6 +16,7 @@ from telethon.tl.types import (
     InputMediaUploadedDocument,
     InputPeerSelf,
 )
+from telethon.errors import MessageEmptyError
 from tortoise.expressions import F
 
 from models import (
@@ -27,7 +29,7 @@ from models import (
     AllowedChat,
     MarkovChat,
 )
-from utils import is_valid_name, is_valid_ip
+from utils import is_valid_name, is_valid_ip, remove_ansi_escapes
 from config import config
 
 
@@ -288,4 +290,48 @@ async def markov_say(bot, peer_id, reply_to=None, init_state=None):
 
         await sleep(min(amount, 8))
 
-    await bot.send_message(peer_id, message=text, reply_to=reply_to)
+    await bot.send_message(peer_id, message=text, reply_to=reply_to)
+
+async def run(text):
+    match = re.match(r"^(\w+)(?:\s|\n)((?:\n|.)*)$", text)
+    if not match:
+        return "Пожалуйста, не оставляйте ввод пустым!"
+
+    language_name, text = match.groups()
+
+    if text.startswith("```") and text.endswith("```"):
+        text = text[3:-3]
+
+    text = text.replace("\xa0", " ")  # i hate telegram
+
+    async with ClientSession() as session:
+        try:
+            async with session.post(
+                f"https://farlands.txlyre.website/run/{language_name}", data=text
+            ) as resp:
+                if resp.status in (404, 500):
+                    info = await resp.json()
+
+                    return f"Произошла ошибка при попытке обращения к API… :(\nОтвет API: {info['detail']}"
+                elif resp.status != 200:
+                    return "Сервер API временно недоступен. Пожалуйста, попробуйте ещё раз чуть позже."
+
+                text = await resp.read()
+                text = text.decode("UTF-8")[:4096]
+        except:
+            return "Произошла ошибка при попытке обращения к API… :("
+
+    text = remove_ansi_escapes(text).strip()
+    text = filter(
+        lambda c: (c in " \t\n" or ord(c) >= 32) and ord(c) not in range(128, 159), text
+    )
+    text = "".join(text)
+    text = text.replace("`", "")
+
+    if not text:
+        return "<пусто>"
+
+    try:
+        return f"```\n{text}```"
+    except ValueError, MessageEmptyError:
+        return "<Telegram не смог декодировать текст сообщения>"

commands.py

@@ -8,7 +8,6 @@ from datetime import datetime
 
 from ujson import dumps
 from tortoise.exceptions import IntegrityError
-from telethon.errors import MessageEmptyError
 from telethon.utils import get_display_name, get_peer_id
 from telethon.tl.types import MessageEntityCode
 
@@ -39,6 +38,7 @@ from actions import (
     set_markov_options,
     get_markov_option,
     markov_say,
+    run,
 )
 from utils import (
     make_temporary_filename,
@@ -47,7 +47,6 @@ from utils import (
     get_user_name,
     calculate_age,
     unparse,
-    remove_ansi_escapes,
 )
 
 
@@ -532,65 +531,7 @@ async def run_handler(bot, event, command):
 
         return
 
-    match = re.match(r"^(\w+)(?:\s|\n)((?:\n|.)*)$", command.args_string)
-    if not match:
-        await event.reply("Пожалуйста, не оставляйте ввод пустым!")
-
-        return
-
-    language_name, text = match.groups()
-
-    if text.startswith("```") and text.endswith("```"):
-        text = text[3:-3]
-
-    text = text.replace("\xa0", " ")  # i hate telegram
-
-    async with ClientSession() as session:
-        try:
-            async with session.post(
-                f"https://farlands.txlyre.website/run/{language_name}", data=text
-            ) as resp:
-                if resp.status in (404, 500):
-                    info = await resp.json()
-
-                    await event.reply(
-                        f"Произошла ошибка при попытке обращения к API… :(\nОтвет API: {info['detail']}"
-                    )
-
-                    return
-                elif resp.status != 200:
-                    await event.reply(
-                        "Сервер API временно недоступен. Пожалуйста, попробуйте ещё раз чуть позже."
-                    )
-
-                    return
-
-                text = await resp.read()
-                text = text.decode("UTF-8")[:4096]
-        except:
-            await event.reply("Произошла ошибка при попытке обращения к API… :(")
-
-            return
-
-    text = remove_ansi_escapes(text).strip()
-    text = filter(
-        lambda c: (c in " \t\n" or ord(c) >= 32) and ord(c) not in range(128, 159), text
-    )
-    text = "".join(text)
-    text = text.replace("`", "")
-
-    if not text:
-        await event.reply("<пусто>")
-
-        return
-
-    try:
-        try:
-            await event.reply(f"```\n{text}```")
-        except ValueError:
-            await event.reply(text, parse_mode=None)
-    except MessageEmptyError:
-        await event.reply("<Telegram не смог декодировать текст сообщения>")
+    await event.reply(await run(command.args_string))
 
 
 async def sylvy_handler(bot, event, command):

openkriemy.py

@@ -3,7 +3,7 @@ from asyncio import sleep
 from datetime import datetime, timedelta, date, time
 
 from telethon import TelegramClient
-from telethon.events import NewMessage
+from telethon.events import NewMessage, InlineQuery
 from telethon.utils import resolve_bot_file_id, get_peer_id
 
 from actions import get_all_birthdays
@@ -19,6 +19,7 @@ from actions import (
     get_markov_option,
     list_markov_chats,
     markov_say,
+    run
 )
 from commands import COMMANDS
 from markov import Markov
@@ -33,6 +34,13 @@ markov = Markov()
 bot.markov = markov
 
 
[email protected](InlineQuery)
+async def on_inline_query(event):
+  await event.answer([
+    event.builder.article("Результат.", await run(event.text)),
+  ])
+
+
 @bot.on(NewMessage)
 async def on_message(event):
     peer_id = get_peer_id(event.peer_id)