Merge branch 'main' into stable

server/custom.py

@@ -11,7 +11,7 @@ import logging
 import typing as ty
 from olgram.settings import ServerSettings
 from olgram.models.models import Bot, GroupChat, BannedUser
-
+from server.inlines import inline_handler
 
 _logger = logging.getLogger(__name__)
 _logger.setLevel(logging.INFO)
@@ -90,8 +90,8 @@ async def message_handler(message: types.Message, *args, **kwargs):
                 await message.reply("<i>Невозможно переслать сообщение (автор заблокировал бота?)</i>",
                                     parse_mode="HTML")
                 return
-        else:
-            # в супер-чате кто-то пишет сообщение сам себе
+        elif super_chat_id > 0:
+            # в супер-чате кто-то пишет сообщение сам себе, только для личных сообщений
             await message.forward(super_chat_id)
             # И отправить пользователю специальный текст, если он указан
             if bot.second_text:
@@ -136,6 +136,12 @@ async def receive_left(message: types.Message):
             await bot.save()
 
 
+async def receive_inline(inline_query):
+    _logger.info("inline handler")
+    bot = db_bot_instance.get()
+    return await inline_handler(inline_query, bot)
+
+
 async def receive_migrate(message: types.Message):
     bot = db_bot_instance.get()
     from_id = message.chat.id
@@ -175,6 +181,7 @@ class CustomRequestHandler(WebhookRequestHandler):
         dp.register_message_handler(receive_left, content_types=[types.ContentType.LEFT_CHAT_MEMBER])
         dp.register_message_handler(receive_migrate, content_types=[types.ContentType.MIGRATE_TO_CHAT_ID])
         dp.register_message_handler(receive_group_create, content_types=[types.ContentType.GROUP_CHAT_CREATED])
+        dp.register_inline_handler(receive_inline)
 
         return dp
 

server/inlines.py

@@ -0,0 +1,56 @@
+from aiocache import cached
+import hashlib
+from aiogram.types import InlineQuery, InputTextMessageContent, InlineQueryResultArticle
+from aiogram.bot import Bot as AioBot
+
+from olgram.models.models import Bot
+import typing as ty
+
+
+@cached(ttl=60)
+async def get_phrases(bot: Bot) -> ty.List:
+    objects = await bot.answers
+    return [obj.text for obj in objects]
+
+
+async def check_chat_member(chat_id: int, user_id: int, bot: AioBot) -> bool:
+    member = await bot.get_chat_member(chat_id, user_id)
+    return member.is_chat_member()
+
+
+@cached(ttl=60)
+async def check_permissions(inline_query: InlineQuery, bot: Bot):
+    user_id = inline_query.from_user.id
+    super_chat_id = await bot.super_chat_id()
+
+    if super_chat_id == user_id:
+        return True
+
+    if super_chat_id < 0:  # Group chat
+        is_member = await check_chat_member(super_chat_id, user_id, inline_query.bot)
+        return is_member
+
+    return False
+
+
+async def inline_handler(inline_query: InlineQuery, bot: Bot):
+    # Check permissions at first
+    allow = await check_permissions(inline_query, bot)
+    if not allow:
+        return await inline_query.answer([])  # forbidden
+
+    all_phrases = await get_phrases(bot)
+    phrases = [phrase for phrase in all_phrases if inline_query.query.lower() in phrase.lower()]
+    items = []
+    for phrase in phrases:
+
+        input_content = InputTextMessageContent(phrase)
+        result_id: str = hashlib.md5(phrase.encode()).hexdigest()
+        item = InlineQueryResultArticle(
+            id=result_id,
+            title=phrase,
+            input_message_content=input_content,
+        )
+        items.append(item)
+
+    await inline_query.answer(results=items)

server/server.py

@@ -65,5 +65,5 @@ def main():
     runner = web.AppRunner(app)
     loop.run_until_complete(runner.setup())
     logger.info("Server initialization done")
-    site = web.TCPSite(runner, host=ServerSettings.app_host(), port=ServerSettings.app_port(), ssl_context=context)
+    site = web.TCPSite(runner, port=ServerSettings.app_port(), ssl_context=context)
     return site