Merge 99bf963 into 1da4c6e

danbilokha · May 9, 2020 · 08cf132 · 08cf132
2 parents 1da4c6e + 99bf963
commit 08cf132
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 6 deletions.
diff --git a/server/src/locales/en.json → locales/en.json b/server/src/locales/en.json → locales/en.json
diff --git a/server/src/locales/ua.json → locales/ua.json b/server/src/locales/ua.json → locales/ua.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "covid19liveupdates",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Get latest info about COVID-19 (coronavirus) situation around the world and in your country",
   "main": "index.js",
   "scripts": {

diff --git a/server/src/services/infrastructure/scheduler.ts b/server/src/services/infrastructure/scheduler.ts
@@ -67,13 +67,11 @@ export const runSendScheduledNotificationToUsersJob = async (
                     LogCategory.Scheduler
                 );
             }
-
-            for (const user of users) {
-                message.replace('#UserName#', getUserName(user));
+            for (const [key, user] of Object.entries(users)) {
                 messageRegistry.sendUserNotification(
                     user.settings?.locale,
                     user.chatId,
-                    message
+                    message.replace('#UserName#', getUserName(user))
                 );
             }
         }

diff --git a/webpack.config.js b/webpack.config.js
@@ -23,7 +23,7 @@ module.exports = {
     plugins: [
         new CleanWebpackPlugin(),
         new CopyPlugin([
-            { from: './server/src/locales', to: 'locales' },
+            { from: './locales', to: 'locales' },
         ]),
     ],
     output: {