From b35b5d37319eab92b58a32dcbd15b1cf6d5e964b Mon Sep 17 00:00:00 2001 From: Fedor Katurov Date: Thu, 29 Apr 2021 11:12:17 +0700 Subject: [PATCH] #1 added buttons to MessageNewHandler.ts --- src/service/template/index.ts | 16 ++++++- src/service/vk/handlers/MessageNewHandler.ts | 44 ++++++++++++++++---- src/service/vk/handlers/VkEventHandler.ts | 19 +++++++++ templates/message_new.md | 6 ++- 4 files changed, 73 insertions(+), 12 deletions(-) diff --git a/src/service/template/index.ts b/src/service/template/index.ts index 312128c..5577fc4 100644 --- a/src/service/template/index.ts +++ b/src/service/template/index.ts @@ -40,7 +40,21 @@ export class Template< } } - theme = (values: V) => { + /** + * Themes the tempalte with values + */ + public theme = (values: V) => { return hb.compile(this.template)(values); }; + + /** + * Registers handlebars helpers + */ + public static registerHelpers() { + hb.registerHelper("ifEq", function (arg1, arg2, options) { + return arg1 == arg2 ? options.fn(this) : options.inverse(this); + }); + } } + +Template.registerHelpers(); diff --git a/src/service/vk/handlers/MessageNewHandler.ts b/src/service/vk/handlers/MessageNewHandler.ts index 43d2143..e3debae 100644 --- a/src/service/vk/handlers/MessageNewHandler.ts +++ b/src/service/vk/handlers/MessageNewHandler.ts @@ -4,13 +4,17 @@ 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"; interface Fields { - buttons: string[]; + buttons?: string[]; + link_text?: string; } interface Values { user: UsersUserFull; + group: ConfigGroup; text: string; } @@ -24,22 +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( - `received message from ${from.first_name} ${from.last_name}: ${context.text}` + logger.info( + `received message from ${user.first_name} ${user.last_name}: ${context.text}` ); const parsed = this.template.theme({ - user: from, + user, + group: this.group, text: context.text, }); - await this.telegram.sendMessageToChan(this.channel, parsed).catch(next); + 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 }]], + }; + }; } diff --git a/src/service/vk/handlers/VkEventHandler.ts b/src/service/vk/handlers/VkEventHandler.ts index 35d0df0..db30c47 100644 --- a/src/service/vk/handlers/VkEventHandler.ts +++ b/src/service/vk/handlers/VkEventHandler.ts @@ -25,4 +25,23 @@ export 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}`; } diff --git a/templates/message_new.md b/templates/message_new.md index 9f6fead..836d15d 100644 --- a/templates/message_new.md +++ b/templates/message_new.md @@ -1,9 +1,11 @@ --- buttons: [link] + link_text: Посмотреть сообщение --- {{!-- use handlebars template here - available variables are: user, text + available variables are: user, group, text (see MessageNewHandler) --}} -{{user.first_name}} {{user.last_name}} пишет: {{text}} +***Новое сообщение:*** +[{{user.first_name}} {{user.last_name}}](https://vk.com/id{{user.id}}) {{#ifEq user.sex 1}}написала{{else}}написал{{/ifEq}}: {{text}}