Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/service/vk/handlers/MessageNewHandler.ts

src/service/vk/handlers/MessageNewHandler.ts

@@ -3,8 +3,22 @@ import { MessageContext } from "vk-io";
 import { NextMiddleware } from "middleware-io";
 import logger from "../../logger";
 import { ContextDefaultState } from "vk-io/lib/structures/contexts/context";
+import { UsersUserFull } from "vk-io/lib/api/schemas/objects";
+import { ConfigGroup } from "../types";
+import { ExtraReplyMessage } from "telegraf/typings/telegram-types";
 
-export class MessageNewHandler extends VkEventHandler {
+interface Fields {
+  buttons?: string[];
+  link_text?: string;
+}
+
+interface Values {
+  user: UsersUserFull;
+  group: ConfigGroup;
+  text: string;
+}
+
+export class MessageNewHandler extends VkEventHandler<Fields, Values> {
   public execute = async (
     context: MessageContext<ContextDefaultState>,
     next: NextMiddleware
@@ -14,15 +28,44 @@ export class MessageNewHandler extends VkEventHandler {
       return;
     }
 
-    const users = await this.instance.api.users.get({
-      user_ids: [String(context.senderId)],
-    });
-    const from = users[0];
+    const user = await this.getUserByID(String(context.senderId));
 
     logger.debug(
       `vk, group ${this.group.name} received message from ${from.first_name} ${from.last_name}: ${context.text}`
     );
 
+    const parsed = this.template.theme({
+      user,
+      group: this.group,
+      text: context.text,
+    });
+
+    const extras: ExtraReplyMessage = {
+      parse_mode: "Markdown",
+    };
+
+    this.appendButtons(extras, user.id);
+
+    await this.telegram
+      .sendMessageToChan(this.channel, parsed, extras)
+      .catch(next);
+
     await next();
   };
+
+  /**
+   * Appending buttons (if needed) by mutating original extras
+   */
+  private appendButtons = (extras: ExtraReplyMessage, userId: number) => {
+    if (!this.template?.fields?.buttons?.includes("link")) {
+      return;
+    }
+
+    const text = this.template?.fields?.link_text || "View dialog";
+    const url = this.makeDialogUrl(this.group.id, userId);
+
+    extras.reply_markup = {
+      inline_keyboard: [[{ text, url }]],
+    };
+  };
 }