fix comments from @Proladge

danbilokha · Apr 19, 2020 · fd8e048 · fd8e048
1 parent ac59206
commit fd8e048
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 18 deletions.
diff --git a/server/src/bots/telegram/botResponse/assistantResponse.ts b/server/src/bots/telegram/botResponse/assistantResponse.ts
@@ -43,13 +43,13 @@ export const assistantStrategyResponse: CallBackQueryHandlerWithCommandArgument
     bot: TelegramBot,
     message: TelegramBot.Message,
     chatId: number,
-    parameterAfterCommand?: string
+    commandParameter?: string
 ): Promise<TelegramBot.Message> => {
-    if (!parameterAfterCommand) {
+    if (!commandParameter) {
         return showAssistantFeatures(bot, message, chatId);
     }
 
-    const answers: Array<Answer> = await fetchAnswer(parameterAfterCommand);
+    const answers: Array<Answer> = await fetchAnswer(commandParameter);
     if (!answers.length) {
         return assistantNoAnswerResponse(bot, chatId);
     }

diff --git a/server/src/bots/telegram/botResponse/countryResponse.ts b/server/src/bots/telegram/botResponse/countryResponse.ts
@@ -23,17 +23,17 @@ export const showCountryByNameStrategyResponse: CallBackQueryHandlerWithCommandA
     bot: TelegramBot,
     message: TelegramBot.Message,
     chatId: number,
-    parameterAfterCommand?: string
+    commandParameter?: string
 ): Promise<TelegramBot.Message> => {
-    if (!parameterAfterCommand) {
+    if (!commandParameter) {
         return bot.sendMessage(chatId, getUserInputWithoutCountryNameMessage());
     }
 
     return showCountryResponse(
         bot,
         message,
         chatId,
-        adaptCountryToSystemRepresentation(parameterAfterCommand)
+        adaptCountryToSystemRepresentation(commandParameter)
     );
 };
 

diff --git a/server/src/bots/telegram/botResponse/subscribeResponse.ts b/server/src/bots/telegram/botResponse/subscribeResponse.ts
@@ -53,9 +53,9 @@ export const subscribingStrategyResponse: CallBackQueryHandlerWithCommandArgumen
     bot: TelegramBot,
     message: TelegramBot.Message,
     chatId: number,
-    parameterAfterCommand?: string
+    commandParameter?: string
 ): Promise<TelegramBot.Message> => {
-    if (!parameterAfterCommand) {
+    if (!commandParameter) {
         return showExistingSubscriptionsResponse(bot, message, chatId);
     }
 

diff --git a/server/src/bots/telegram/botResponse/unsubscribeResponse.ts b/server/src/bots/telegram/botResponse/unsubscribeResponse.ts
@@ -42,16 +42,16 @@ export const unsubscribeStrategyResponse: CallBackQueryHandlerWithCommandArgumen
     bot: TelegramBot,
     message: TelegramBot.Message,
     chatId: number,
-    parameterAfterCommand?: string
+    commandParameter?: string
 ): Promise<TelegramBot.Message> => {
     // If it's called from InlineKeyboard, then @param ikCbData will be available
     // otherwise @param ikCbData will be null
-    if (!parameterAfterCommand) {
+    if (!commandParameter) {
         return buildUnsubscribeInlineResponse(bot, message, chatId);
     }
 
     const [err, result] = await catchAsyncError<string>(
-        unsubscribeMeFrom(message.chat, parameterAfterCommand)
+        unsubscribeMeFrom(message.chat, commandParameter)
     );
     if (err) {
         return bot.sendMessage(chatId, unSubscribeErrorMessage(err.message));

diff --git a/server/src/bots/telegram/models/index.ts b/server/src/bots/telegram/models/index.ts
@@ -4,7 +4,7 @@ export type CallBackQueryHandlerWithCommandArgument<T = TelegramBot.Message> = (
     bot: TelegramBot,
     message: TelegramBot.Message,
     chatId: number,
-    parameterAfterCommand?: string
+    commandParameter?: string
 ) => Promise<T>;
 
 export const TELEGRAM_PREFIX: string = 'telegram';

diff --git a/server/src/bots/telegram/services/messageHandlerRegistry.ts b/server/src/bots/telegram/services/messageHandlerRegistry.ts
@@ -148,9 +148,11 @@ export class MessageHandlerRegistry {
     }
 }
 
-// This function is wrapper around the original User's query handler
-// It adds an additional parameter (if such exist) to original handler,
-// which will be an parameter following after command
+/**
+ * This function is wrapper around the original User's query handler
+ * It adds an additional parameter (if such exist) to original handler,
+ * which will be an parameter following after command
+ */
 export const withSingleParameterAfterCommand = (
     context: MessageHandlerRegistry,
     handlerFn: CallBackQueryHandlerWithCommandArgument
@@ -186,8 +188,10 @@ export const withSingleParameterAfterCommand = (
     };
 };
 
-// Check out how it works here
-// https://codepen.io/belokha/pen/xxwOdWg?editors=0012
+/**
+ * Check out how it works here
+ * https://codepen.io/belokha/pen/xxwOdWg?editors=0012
+ */
 function getParameterAfterCommandFromMessage(
     userFullInput: string | undefined
 ): string | undefined {
@@ -205,7 +209,7 @@ function getParameterAfterCommandFromMessage(
         )})\\s(?<firstargument>.*)`
     ).exec(makeMagicOverUserFullInput);
     if (!execResult) {
-        logger.log('info', getInfoMessage('Entered unsupported command'));
+        logger.log('warn', getInfoMessage('Entered unsupported command'));
         return undefined;
     }