v2.3

Made bot poll from user
Added VK attachment bug workaround
---
I promised not to deploy on friday
But I'm tired and I hate VK

Author: dhvcc

README.md

@@ -95,7 +95,7 @@ The syntax for config is the following:
 ```ini
 [forwarding-bot]
 BOT_TOKEN =
-GROUP_TOKEN =
+USER_TOKEN =
 SOURCE_ID =
 DESTINATION_ID =
 ```

forwarding_bot/arguments/_parser.py

@@ -3,6 +3,7 @@
 from forwarding_bot.__version__ import __version__
 from .models import ArgsModel
 from typing import Union
+from distutils.util import strtobool
 
 
 class ArgParser:
@@ -15,12 +16,15 @@ def __init__(self):
                                  version=f"forwarding-bot {__version__}")
         self.parser.add_argument("-b", "--bot-token", help="TG bot token",
                                  type=str)
-        self.parser.add_argument("-g", "--group-token", help="VK group token",
+        self.parser.add_argument("-u", "--user-token", help="VK user token",
                                  type=str)
         self.parser.add_argument("-s", "--source-id", help="VK source conversation id",
                                  type=int)
         self.parser.add_argument("-d", "--destination-id", help="TG destination conversation id",
                                  type=int)
+        self.parser.add_argument('--limited-attachments', help="Limited attachments mode, re-asks for the message "
+                                                               "attachments to ensure attachment parsing",
+                                 type=lambda x: bool(strtobool(x)), nargs='?', const=True, default=None)
 
     def get_args(self) -> Union[argparse.Namespace, ArgsModel]:
         """Using namespace because it is in fact a Namespace, but linting should be according to ArgsModel"""

forwarding_bot/arguments/models.py

@@ -1,6 +1,7 @@
 class ArgsModel:
     """Argparse output namespace schema to make linters work"""
     bot_token: str
-    group_token: str
+    user_token: str
     destination_id: str
     source_id: str
+    limited_attachments: bool

forwarding_bot/config/_data.py

@@ -3,7 +3,7 @@
 from os import environ
 from os.path import join
 from pathlib import Path
-from typing import Union
+from typing import Optional
 
 from forwarding_bot.arguments import ArgsModel, ArgParser
 
@@ -17,10 +17,11 @@ class DataConfig:
     """Class that provides loading of all of the config sources by priority"""
 
     def __init__(self):
-        self.bot_token: Union[None, str] = None
-        self.group_token: Union[None, str] = None
-        self.destination_id: Union[None, int] = None
-        self.source_id: Union[None, int] = None
+        self.bot_token: Optional[str] = None
+        self.user_token: Optional[int] = None
+        self.destination_id: Optional[int] = None
+        self.source_id: Optional[int] = None
+        self.limited_attachments: Optional[bool] = None
 
     def load(
             self,
@@ -41,9 +42,10 @@ def load_cli(self, arguments: ArgsModel):
         logger.debug("Loading CLI args")
 
         self.bot_token = arguments.bot_token
-        self.group_token = arguments.group_token
+        self.user_token = arguments.user_token
         self.destination_id = arguments.destination_id
         self.source_id = arguments.source_id
+        self.limited_attachments = arguments.limited_attachments
 
     def load_ini(self, config_: ConfigParser):
         logger.debug("Loading ini config")
@@ -55,23 +57,26 @@ def load_ini(self, config_: ConfigParser):
         if not self.bot_token and config.get("BOT_TOKEN"):
             self.bot_token = config["BOT_TOKEN"]
 
-        if not self.group_token and config.get("GROUP_TOKEN"):
-            self.group_token = config["GROUP_TOKEN"]
+        if not self.user_token and config.get("USER_TOKEN"):
+            self.user_token = config["USER_TOKEN"]
 
         if not self.destination_id and config.get("DESTINATION_ID"):
             self.destination_id = config.getint("DESTINATION_ID")
 
         if not self.source_id and config.get("SOURCE_ID"):
             self.source_id = config.getint("SOURCE_ID")
 
+        if not self.limited_attachments and "LIMITED_ATTACHMENTS" in config:
+            self.limited_attachments = config.getboolean("LIMITED_ATTACHMENTS")
+
     def load_environ(self, environment):
         logger.debug("Loading environ")
 
         if self.bot_token is None:
             self.bot_token = environment.get("FORWARDING_BOT_BOT_TOKEN")
 
-        if self.group_token is None:
-            self.group_token = environment.get("FORWARDING_BOT_GROUP_TOKEN")
+        if self.user_token is None:
+            self.user_token = environment.get("FORWARDING_BOT_USER_TOKEN")
 
         if self.destination_id is None:
             self.destination_id = int(environment.get("FORWARDING_BOT_DESTINATION_ID", 0))

forwarding_bot/vk/_blueprint/blueprint.py

@@ -2,8 +2,8 @@
 from asyncio import sleep
 
 import aiohttp
-from vkbottle.bot import Blueprint, Message
 from vkbottle.api import API
+from vkbottle.user import Blueprint, Message
 
 from forwarding_bot.config import data_config
 from . import attachment_handlers, fwd_handlers
@@ -17,16 +17,18 @@
 @bot_bp.on.chat_message()
 async def handler(message: Message) -> None:
     """Default handler that handles every message"""
-    api = API(data_config.group_token)
-    # Workaround to avoid VK event ignoring attachments
-    message_data = (await api.messages.get_by_id(message_ids=message.id)).items[0]
-    message.attachments = message_data.attachments
-    #
-    request_params = RequestHelper.get_params(bot=bot_bp)
+    api = API(data_config.user_token)
+    if data_config.limited_attachments:
+        # VK attachment limit workaround
+        message_id = message.id
+        message_data = (await api.messages.get_by_id(message_ids=[message_id])).items[0]
+        message.attachments = message_data.attachments
+
+    request_params = RequestHelper.get_params()
 
     session = aiohttp.ClientSession()
     if not message.fwd_messages:
-        sender = await MessageHelper.get_sender(data_config.group_token, message)
+        sender = await MessageHelper.get_sender(data_config.user_token, message)
         formatted_message = "{}:\n{}".format(MessageHelper.get_name(
             sender), MessageHelper.get_text(message.text))
         attachments = MessageHelper.get_valid_attachments(message)

forwarding_bot/vk/_blueprint/fwd_handlers.py

@@ -42,7 +42,7 @@ async def walk_message_tree(node: Message, depth: int = 0):
         if message.from_id in sender_cache:
             sender = sender_cache[message.from_id]
         else:
-            sender = await MessageHelper.get_sender(data_config.group_token, message)
+            sender = await MessageHelper.get_sender(data_config.user_token, message)
             sender_cache[message.from_id] = sender
 
         result.append(ParsedMessage(

forwarding_bot/vk/_blueprint/helpers/request.py

@@ -1,17 +1,22 @@
 import logging
-from typing import Union, List
+from random import randint
+from typing import List
 
 from aiohttp import ClientSession, FormData
-from vkbottle.bot import Blueprint
-from vkbottle.bot import Bot
 from vkbottle.types.objects.docs import Doc
-from vkbottle.types.objects.photos import Photo
 from vkbottle.types.objects.messages import AudioMessage, MessageAttachment
+from vkbottle.types.objects.photos import Photo
 
 from forwarding_bot.config import data_config
 from ..settings import parse_mode, api_url
 
 logger = logging.getLogger("forwarding-bot")
+RANGE_MAX = int(2e9)
+
+
+def get_random_id() -> int:
+    """Random id generator"""
+    return randint(1, RANGE_MAX)
 
 
 class BadDoctypeError(Exception):
@@ -23,9 +28,9 @@ def __str__(self):
 
 class RequestHelper:
     @staticmethod
-    def get_params(bot: Union[Bot, Blueprint]) -> dict:
+    def get_params() -> dict:
         return {
-            "random_id": bot.extension.random_id(),
+            "random_id": get_random_id(),
             "chat_id": data_config.destination_id,
             "parse_mode": parse_mode
         }

forwarding_bot/vk/_bot.py

@@ -1,6 +1,6 @@
 import logging
 
-from vkbottle import Bot
+from vkbottle import User
 
 from forwarding_bot.config import data_config
 from forwarding_bot.vk._middleware import middleware_bp
@@ -11,12 +11,12 @@
 
 class VKBot:
     def __init__(self):
-        self.bot = Bot(data_config.group_token, debug="DEBUG")
+        self.bot = User(data_config.user_token, debug="DEBUG")
         self.bot.set_blueprints(middleware_bp, bot_bp)
 
     def start(self) -> None:
         logger.info("Starting VKBot")
         try:
-            self.bot.run_polling(skip_updates=True)
+            self.bot.run_polling()
         except Exception as e:
             logger.exception(f"VK bot crashed. {e}")

forwarding_bot/vk/_middleware.py

@@ -1,5 +1,5 @@
-from vkbottle.bot import Blueprint, Message
 from vkbottle.ext import Middleware
+from vkbottle.user import Blueprint, Message
 
 from forwarding_bot.config import data_config