Clean up

.huskyrc.json

@@ -0,0 +1,5 @@
+{
+  "hooks": {
+    "pre-commit": "lint-staged"
+  }
+}

.lintstagedrc.json

@@ -0,0 +1,7 @@
+{
+  "server/src/**/*.ts": [
+    "prettier --write",
+    "npm run tslint:fix",
+    "npm run tslint"
+  ]
+}

.prettierrc.json

@@ -0,0 +1,8 @@
+{
+  "printWidth": 100,
+  "tabWidth": 4,
+  "trailingComma": "es5",
+  "singleQuote": true,
+  "jsxBracketSameLine": false,
+  "bracketSpacing": true
+}

package.json

@@ -11,8 +11,8 @@
     "build": "webpack --config webpack.config.js",
     "start:watch": "ts-node-dev --respawn --transpileOnly server/src/index.ts",
     "start:inspect": "ts-node-dev --inspect --respawn --transpileOnly server/src/index.ts",
-    "lint": "tslint \"server/src/**/*.ts\"",
-    "lint:fix": "tslint \"server/src/**/*.ts\" --fix"
+    "tslint": "tslint \"server/src/**/*.ts\"",
+    "tslint:fix": "tslint \"server/src/**/*.ts\" --fix"
   },
   "homepage": "https://github.com/danbilokha/covid19liveupdates",
   "bugs": {
@@ -50,13 +50,15 @@
     "@types/dotenv": "^8.2.0",
     "@types/express": "^4.17.3",
     "@types/jest": "^25.1.4",
+    "@types/node-telegram-bot-api": "^0.40.3",
     "@types/supertest": "^2.0.8",
     "chai": "^4.2.0",
     "coveralls": "^3.0.11",
     "husky": "^4.2.5",
     "jest": "^25.3.0",
     "lint-staged": "^10.1.3",
     "mocha": "^7.1.0",
+    "prettier": "2.0.4",
     "supertest": "^4.0.2",
     "ts-jest": "^25.3.1",
     "ts-loader": "^6.2.1",
@@ -86,16 +88,6 @@
       "url": "https://github.com/danbilokha"
     }
   ],
-  "lint-staged": {
-    "server/src/**/*.ts": [
-      "npm run lint:fix && npm run lint"
-    ]
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
   "jest": {
     "globals": {
       "ts-jest": {

server/src/bots/telegram/botResponse/adviceResponse.ts

@@ -3,22 +3,23 @@ import {
     encouragingMessage,
     getCovid19ExplanationVideo,
     socialDistancing,
-    suggestedBehaviors
+    suggestedBehaviors,
 } from '../../../messages/feature/adviceMessages';
-import {CallBackQueryHandler} from '../models';
+import { CallBackQueryHandler } from '../models';
+import * as TelegramBot from 'node-telegram-bot-api';
 
 export const showAdvicesHowToBehaveResponse: CallBackQueryHandler = async (
     bot,
     message,
     chatId
-): Promise<void> => {
+): Promise<TelegramBot.Message> => {
     return bot.sendMessage(
         chatId,
         `ℹ Suggested Behaviors for ${getCovid19ExplanationVideo()}
         ${suggestedBehaviors()} \nℹ Social Distancing
         ${socialDistancing()} \nℹ Alternative Greetings
         ${alternativeGreetings()} \n${encouragingMessage()}
         `,
-        {parse_mode: 'HTML'}
+        { parse_mode: 'HTML' }
     );
 };

server/src/bots/telegram/botResponse/assistantResponse.ts

@@ -1,66 +1,75 @@
-import {fetchAnswer, fetchKnowledgeMetainformation} from '../../../services/api/api-knowledgebase';
-import {Answer} from '../../../models/knowledgebase/answer.models';
+import {
+    fetchAnswer,
+    fetchKnowledgeMetainformation,
+} from '../../../services/api/api-knowledgebase';
+import { Answer } from '../../../models/knowledgebase/answer.models';
 import {
     getAnswersOnQuestionMessage,
     getAssistantFeaturesMessage,
-    noAnswersOnQuestionMessage
+    noAnswersOnQuestionMessage,
 } from '../../../messages/feature/assistantMessages';
-import {textAfterUserCommand} from '../../../utils/textAfterCommand';
-import {isCommandOnly, isMatchingDashboardItem, isMessageStartsWithCommand} from '../../../utils/incomingMessages';
-import {KnowledgebaseMeta} from '../../../models/knowledgebase/meta.models';
-import {UserMessages} from '../../../models/constants';
-import {CallBackQueryHandler} from '../models';
+import { textAfterUserCommand } from '../../../utils/textAfterCommand';
+import {
+    isCommandOnly,
+    isMatchingDashboardItem,
+    isMessageStartsWithCommand,
+} from '../../../utils/incomingMessages';
+import { KnowledgebaseMeta } from '../../../models/knowledgebase/meta.models';
+import { UserMessages } from '../../../models/constants';
+import { CallBackQueryHandler } from '../models';
+import * as TelegramBot from 'node-telegram-bot-api';
 
 export const assistantStrategyResponse: CallBackQueryHandler = async (
-    bot,
-    message,
-    chatId): Promise<void> => {
-    if ((isMessageStartsWithCommand(message.text) && isCommandOnly(message.text))
-        || isMatchingDashboardItem(message.text, UserMessages.Assistant)) {
-        return showAssistantFeatures(bot, message, chatId) as Promise<void>;
+    bot: TelegramBot,
+    message: TelegramBot.Message,
+    chatId?: number
+): Promise<TelegramBot.Message> => {
+    if (
+        (isMessageStartsWithCommand(message.text) && isCommandOnly(message.text)) ||
+        isMatchingDashboardItem(message.text, UserMessages.Assistant)
+    ) {
+        return showAssistantFeatures(bot, message, chatId) as Promise<TelegramBot.Message>;
     }
 
-    return answerOnQuestion(bot, message, chatId) as Promise<void>;
+    return answerOnQuestion(bot, message, chatId) as Promise<TelegramBot.Message>;
 };
 
 export const showAssistantFeatures: CallBackQueryHandler = async (
-    bot,
-    message,
-    chatId): Promise<void> => {
+    bot: TelegramBot,
+    message: TelegramBot.Message,
+    chatId: number
+): Promise<TelegramBot.Message> => {
     const knowledgebaseMeta: KnowledgebaseMeta = await fetchKnowledgeMetainformation();
-    return bot.sendMessage(
-        chatId,
-        getAssistantFeaturesMessage(knowledgebaseMeta)
-    )
+    return bot.sendMessage(chatId, getAssistantFeaturesMessage(knowledgebaseMeta));
 };
 
 export const answerOnQuestion: CallBackQueryHandler = async (
-    bot,
-    message,
-    chatId): Promise<void> => {
-    const question = textAfterUserCommand(message.text);
+    bot: TelegramBot,
+    message: TelegramBot.Message,
+    chatId: number
+): Promise<TelegramBot.Message> => {
+    const question: string = textAfterUserCommand(message.text);
     const answers: Array<Answer> = await fetchAnswer(question);
 
     if (!answers.length) {
-        return assistantNoAnswerResponse(bot, message, chatId) as Promise<void>;
+        return assistantNoAnswerResponse(bot, message, chatId) as Promise<TelegramBot.Message>;
     }
 
     return assistantResponse(bot, answers, chatId);
 };
 
 export const assistantNoAnswerResponse: CallBackQueryHandler = async (
-    bot,
-    message,
-    chatId): Promise<void> => {
-    return bot.sendMessage(
-        chatId,
-        noAnswersOnQuestionMessage()
-    )
+    bot: TelegramBot,
+    message: TelegramBot.Message,
+    chatId: number
+): Promise<TelegramBot.Message> => {
+    return bot.sendMessage(chatId, noAnswersOnQuestionMessage());
 };
 
-export const assistantResponse = async (bot, answers, chatId) => {
-    return bot.sendMessage(
-        chatId,
-        getAnswersOnQuestionMessage(answers)
-    );
+export const assistantResponse = async (
+    bot: TelegramBot,
+    answers: Array<Answer>,
+    chatId: number
+) => {
+    return bot.sendMessage(chatId, getAnswersOnQuestionMessage(answers));
 };

server/src/bots/telegram/botResponse/availableResponse.ts

@@ -1,12 +1,14 @@
-import {getAvailableCountries} from '../../../services/domain/covid19';
-import {Country} from '../../../models/country.models';
-import {getShowCountriesMessage} from '../../../messages/feature/availableMessages';
-import {CallBackQueryHandler} from '../models';
+import { getAvailableCountries } from '../../../services/domain/covid19';
+import { Country } from '../../../models/country.models';
+import { getShowCountriesMessage } from '../../../messages/feature/availableMessages';
+import { CallBackQueryHandler } from '../models';
+import * as TelegramBot from 'node-telegram-bot-api';
 
-export const showAvailableCountriesResponse: CallBackQueryHandler = async (bot, message, chatId) => {
+export const showAvailableCountriesResponse: CallBackQueryHandler = async (
+    bot: TelegramBot,
+    message: TelegramBot.Message,
+    chatId: number
+): Promise<TelegramBot.Message> => {
     const countries: Array<Country> = await getAvailableCountries();
-    return bot.sendMessage(
-        chatId,
-        getShowCountriesMessage(countries),
-    );
+    return bot.sendMessage(chatId, getShowCountriesMessage(countries));
 };