Added video support #12

Only links to save space/avoid limits

Author: dhvcc

forwarding_bot/vk/_blueprint/attachment_handler.py

@@ -5,6 +5,7 @@
 
 from forwarding_bot.config import data_config
 from forwarding_bot.settings import PARSE_MODE
+from .message_helper import MessageHelper
 
 logger = logging.getLogger(__name__)
 
@@ -26,6 +27,11 @@ async def handle_attachment(
                                         caption=message_text,
                                         photo=source.url,
                                         parse_mode=PARSE_MODE)
+    elif msg_attachment.type == "video":
+        response = await bot.send_message(chat_id=data_config.destination_id,
+                                          text=message_text +
+                                          MessageHelper.get_video_str(msg_attachment.video),
+                                          parse_mode=PARSE_MODE)
     elif msg_attachment.type == "audio_message":
         response = await bot.send_voice(chat_id=data_config.destination_id,
                                         caption=message_text,

forwarding_bot/vk/_blueprint/blueprint.py

@@ -1,9 +1,10 @@
 import logging
 from asyncio import sleep
+from typing import NoReturn
 
 from aiogram import Bot
 from vkbottle.user import Blueprint, Message
-from typing import NoReturn
+
 from forwarding_bot.config import data_config
 from forwarding_bot.settings import PARSE_MODE
 from . import attachment_handler, nested_handler
@@ -16,7 +17,16 @@
 
 @bot_bp.on.chat_message()
 async def handler(message: Message) -> NoReturn:
-    """Default handler that handles every message"""
+    """
+    Default handler that handles every message
+    ---
+    Attachment types:
+    1. Audio Message/Photo
+    2. Video (sent as a link because of TG API limits and also to save TG space)
+    3. Sticker (cannot be parsed, so instead just becomes "*sticker*")
+    Handling:
+    - If there are no *valid* attachments, then only text will be sent
+    """
     logger.info("New message")
     logger.debug(str(message))
     # VK attachment limit workaround
@@ -51,9 +61,11 @@ async def handler(message: Message) -> NoReturn:
         await nested_handler.handle_nested(bot=bot, message=message, tree_getter=nested_handler.get_fwd_tree)
     elif not message.attachments:
         logger.info("No valid attachments or forwarded messages, sending text")
+
         await bot.send_message(chat_id=data_config.destination_id,
                                text=formatted_message,
                                parse_mode=PARSE_MODE)
 
     await bot.close()
     await sleep(0.1)
+    return

forwarding_bot/vk/_blueprint/message_helper.py

@@ -1,10 +1,11 @@
 from asyncio import sleep
 from datetime import datetime
-from typing import List, Optional
+from typing import List, Optional, Union
 
 from vkbottle.api import API
-from vkbottle.types.objects.messages import MessageAttachment
+from vkbottle.types.objects.messages import MessageAttachment, ForeignMessage
 from vkbottle.types.objects.users import UserXtrCounters
+from vkbottle.types.objects.video import Video
 from vkbottle.user import Message
 
 from forwarding_bot.settings import MINSK_TZ
@@ -13,7 +14,7 @@
 class MessageHelper:
 
     @classmethod
-    def get_date(cls, message: Message) -> str:
+    def get_date(cls, message: Union[Message, ForeignMessage]) -> str:
         dt = datetime.fromtimestamp(message.date)
         now = datetime.now(tz=MINSK_TZ)
         if now.date() != dt.date():
@@ -25,7 +26,7 @@ def get_name(user: UserXtrCounters) -> str:
         return f"{user.last_name} {user.first_name}"
 
     @classmethod
-    def get_header(cls, user: UserXtrCounters, message: Message) -> str:
+    def get_header(cls, user: UserXtrCounters, message: Union[Message, ForeignMessage]) -> str:
         date = cls.get_date(message)
         if date:
             return f"<em>{cls.get_name(user)}, {date}</em>"
@@ -36,11 +37,11 @@ def get_text(text: str) -> str:
         return f"<strong>{text[:1000]}</strong>"
 
     @staticmethod
-    def get_valid_attachments(message: Message) -> List[MessageAttachment]:
+    def get_valid_attachments(message: Union[Message, ForeignMessage]) -> List[MessageAttachment]:
         return [
             attach
             for attach in message.attachments
-            if attach.type in ("photo", "doc", "sticker", "audio_message")
+            if attach.type in ("photo", "video", "doc", "sticker", "audio_message")
         ]
 
     @staticmethod
@@ -52,8 +53,14 @@ def filter_media(attachments: List[MessageAttachment]) -> List[MessageAttachment
         ]
 
     @staticmethod
-    async def get_sender(token: Optional[str], message: Message) -> UserXtrCounters:
+    async def get_sender(token: Optional[str], message: Union[Message, ForeignMessage]) -> UserXtrCounters:
         api = API(token)
         user_list = await api.users.get(user_ids=str(message.from_id))
         await sleep(0.1)
         return user_list[0]
+
+    @staticmethod
+    def get_video_str(video: Video) -> str:
+        url = f"vk.com/video{video.owner_id}_{video.id}" \
+              f"?access_key={video.access_key or ''}"
+        return f"(Видео {url})"

forwarding_bot/vk/_blueprint/nested_handler.py

@@ -112,11 +112,15 @@ def parse_text(message_: ParsedMessage, attachment_storage: List[Tuple[str, Mess
     }
 
     for attach_ in message_.attachments:
-        name = "{name}_{id}".format(name=attach_names[str(attach_.type)],
-                                    id=len(attachment_storage))
-        attachment_storage.append((name, attach_))
-        text += '{indent}<u>{{{name}}}</u>\n'.format(indent="    " * message_.indent,
-                                                     name=name)
+        if attach_.type == "video":
+            text += '{indent}<u>{link}</u>\n'.format(indent="    " * message_.indent,
+                                                     link=MessageHelper.get_video_str(attach_.video))
+        else:
+            name = "{name}_{id}".format(name=attach_names[str(attach_.type)],
+                                        id=len(attachment_storage))
+            attachment_storage.append((name, attach_))
+            text += '{indent}<u>{{{name}}}</u>\n'.format(indent="    " * message_.indent,
+                                                         name=name)
 
     return text