knexfile.js

@@ -1,11 +1,15 @@
 require('dotenv').config();
 
+const pg = require('pg');
+pg.defaults.ssl = {
+  rejectUnauthorized: false,
+};
 
 module.exports = {
   development: {
     client: process.env.DB_CLIENT,
     connection: {
-      host: process.env.DATABASE_URL,
+      host: process.env.DB_HOST,
       database: process.env.DATABASE,
       user: process.env.DB_USERNAME,
       password: process.env.DB_PASSWORD,
@@ -19,4 +23,17 @@ module.exports = {
       directory: process.env.MIGRATIONS
     }
   },
-};
+  production: {
+    client: process.env.DB_CLIENT,
+    connection: process.env.DATABASE_URL,
+    ssl: { rejectUnauthorized: false },
+    pool: {
+      min: 2,
+      max: 10
+    },
+    migrations: {
+      tableName: 'knex_migrations',
+      directory: process.env.MIGRATIONS
+    }
+  },
+}

src/commands/index.js

@@ -199,6 +199,9 @@ module.exports = bot => {
   async function removeFeedCommand(ctx, finishedViewChatCmd) {
     const feedTitle = removeCommand(ctx.message.text, '/remove');
 
+    const userId = String(ctx.message.from.id);
+    const chatId = await chatRepository.getIsActiveConfigChat(userId);
+
     if (!feedTitle) {
       ctx.telegram.sendMessage(getChatId(ctx), remove_feed.cmd_error, { parse_mode: 'HTML'});
       return;
@@ -208,8 +211,6 @@ module.exports = bot => {
       return;
     }
 
-    const userId = String(ctx.message.from.id);
-    const chatId = await chatRepository.getIsActiveConfigChat(userId);
     await feedRepository.dropFeed(feedTitle, chatId);
 
     ctx.reply(remove_feed.success);