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 }]],
+    };
+  };
 }

src/service/vk/handlers/StubHandler.ts

@@ -0,0 +1,13 @@
+import { VkEventHandler } from "./VkEventHandler";
+import { NextMiddleware } from "middleware-io";
+import logger from "../../logger";
+
+/**
+ * StubHandler is used to stub event calls
+ */
+export class StubHandler extends VkEventHandler {
+  public execute = async (context: any, next: NextMiddleware) => {
+    logger.debug(`received unhandled message of type "${context.type}"`);
+    await next();
+  };
+}

src/service/vk/handlers/VkEventHandler.ts

@@ -1,14 +1,21 @@
 import { NextMiddleware } from "middleware-io";
-import { ConfigGroup, GroupInstance } from "../types";
+import { ConfigGroup, GroupInstance, VkEvent } from "../types";
 import { VkService } from "../index";
 import { TelegramService } from "../../telegram";
+import { Template } from "../../template";
 
-export abstract class VkEventHandler {
+export class VkEventHandler<
+  F extends Record<string, any> = any,
+  V extends Record<string, any> = any
+> {
   public constructor(
+    protected type: VkEvent,
     protected group: ConfigGroup,
+    protected channel: string,
     protected instance: GroupInstance,
     protected vk: VkService,
-    protected telegram: TelegramService
+    protected telegram: TelegramService,
+    protected template: Template<F, V>
   ) {}
 
   public execute: (
@@ -18,4 +25,23 @@ export abstract class VkEventHandler {
     console.log(`vk received unknown event`, ctx);
     await next();
   };
+
+  /**
+   * Fetches user by id
+   * @param id
+   */
+  protected getUserByID = async (id: string) => {
+    const users = await this.instance.api.users.get({
+      user_ids: [id],
+      fields: ["sex"],
+    });
+
+    return users[0];
+  };
+
+  /**
+   * Returns url for group dialog
+   */
+  protected makeDialogUrl = (groupId: number, userId: number): string =>
+    `https://vk.com/gim${groupId}?sel=${userId}`;
 }

src/service/vk/handlers/index.ts

@@ -1,14 +1,27 @@
-import { VkEvent } from "../types";
+import { ConfigGroup, GroupInstance, VkEvent } from "../types";
 import { VkEventHandler } from "./VkEventHandler";
 import { MessageNewHandler } from "./MessageNewHandler";
+import { StubHandler } from "./StubHandler";
+import { VkService } from "../index";
+import { TelegramService } from "../../telegram";
+import { Template } from "../../template";
 
-type DerivedHandler = typeof VkEventHandler;
-interface Handler extends DerivedHandler {}
+interface Handler {
+  new (
+    type: VkEvent,
+    group: ConfigGroup,
+    channel: string,
+    instance: GroupInstance,
+    vk: VkService,
+    telegram: TelegramService,
+    template: Template<any, any>
+  ): VkEventHandler;
+}
 
 export const vkEventToHandler: Record<VkEvent, Handler> = {
-  [VkEvent.GroupJoin]: MessageNewHandler,
-  [VkEvent.GroupLeave]: MessageNewHandler,
+  [VkEvent.GroupJoin]: StubHandler,
+  [VkEvent.GroupLeave]: StubHandler,
   [VkEvent.MessageNew]: MessageNewHandler,
-  [VkEvent.PostSuggestion]: MessageNewHandler,
-  [VkEvent.WallPostNew]: MessageNewHandler,
+  [VkEvent.PostSuggestion]: StubHandler,
+  [VkEvent.WallPostNew]: StubHandler,
 };