fix build; add main menu appearance for viber notifications

danbilokha · May 7, 2020 · bf4bc78 · bf4bc78
1 parent da2ffae
commit bf4bc78
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/server/src/bots/telegram/services/registry/telegramMessageRegistry.ts b/server/src/bots/telegram/services/registry/telegramMessageRegistry.ts
@@ -74,6 +74,7 @@ export class TelegramMessageRegistry extends MessageRegistry {
     }
 
     public sendUserNotification(
+        locale: string,
         chatId: number,
         notification: string
     ): Promise<TelegramBot.Message> {

diff --git a/server/src/bots/viber/services/user.ts b/server/src/bots/viber/services/user.ts
@@ -3,18 +3,6 @@ import { viberStorage } from './storage';
 import { StorageService } from '../../../services/domain/storage.service';
 import { User } from '../../../models/user.model';
 
-class ViberUserService extends UserService {
-    constructor(protected storage: StorageService) {
-        super(storage);
-    }
-
-    public getUser(user: number | string): Promise<User | null>;
-    public getUser(user: User): Promise<User | null>;
-    public getUser(user: User | number | string): Promise<User | null> {
-        return super.getUser(user);
-    }
-}
-
 export function viberUserService() {
     let userService;
     return (() => {

diff --git a/server/src/bots/viber/services/viberMessageRegistry.ts b/server/src/bots/viber/services/viberMessageRegistry.ts
@@ -1,12 +1,16 @@
 import { MessageRegistry } from '../../../services/domain/registry/messageRegistry';
 import { ViberBot, ViberTextMessage } from '../models';
-import { getViberChatId } from '../utils/getViberChatId';
+import {
+    getViberChatId,
+    mapBackToRealViberChatId,
+} from '../utils/getViberChatId';
 import { DEFAULT_USER_SETTINGS, User } from '../../../models/user.model';
 import * as TelegramBot from 'node-telegram-bot-api';
 import { UserService } from '../../../services/domain/user.service';
 import { logger } from '../../../utils/logger';
 import { LogCategory } from '../../../models/constants';
 import { Message } from 'viber-bot';
+import { vGetFullMenuKeyboard } from './keyboard';
 
 export class ViberMessageRegistry extends MessageRegistry {
     public getChatId: (params: ViberTextMessage) => string = getViberChatId;
@@ -34,13 +38,14 @@ export class ViberMessageRegistry extends MessageRegistry {
     }
 
     public sendUserNotification(
-        chatId: number,
+        locale: string,
+        chatId: string,
         notification: string
     ): Promise<TelegramBot.Message> {
-        return this.bot.sendMessage(
-            { id: mapBackToRealViberChatId(chatId).toString() },
-            new Message.Text(notification)
-        );
+        return this.bot.sendMessage({ id: mapBackToRealViberChatId(chatId) }, [
+            new Message.Text(notification),
+            new Message.Keyboard(vGetFullMenuKeyboard(locale, chatId)),
+        ]);
     }
 
     protected createUser(message: ViberTextMessage, chatId: number): User {

diff --git a/server/src/services/domain/registry/messageRegistry.ts b/server/src/services/domain/registry/messageRegistry.ts
@@ -137,6 +137,7 @@ export abstract class MessageRegistry {
     }
 
     public abstract sendUserNotification(
+        locale: string,
         chatId: number | string,
         notification: string
     ): Promise<Message>;

diff --git a/server/src/services/domain/subscription.service.ts b/server/src/services/domain/subscription.service.ts
@@ -73,6 +73,7 @@ const getAndSendUserNotificationSubscriptions = async (
             sendingNotificationResult,
         ] = await catchAsyncError(
             messageHandlerRegistry.sendUserNotification(
+                settings?.locale,
                 chatId,
                 userSubscriptionsUpdate
                     .map(

diff --git a/server/src/services/infrastructure/scheduler.ts b/server/src/services/infrastructure/scheduler.ts
@@ -70,7 +70,11 @@ export const runSendScheduledNotificationToUsersJob = async (
 
             for (const user of users) {
                 message.replace('#UserName#', getUserName(user));
-                messageRegistry.sendUserNotification(user.chatId, message);
+                messageRegistry.sendUserNotification(
+                    user.settings?.locale,
+                    user.chatId,
+                    message
+                );
             }
         }
     );