From 23c82bf872c682368c2b11c2a2dc456c4e4b1cbd Mon Sep 17 00:00:00 2001
From: Fuxing Loh <4266087+fuxingloh@users.noreply.github.com>
Date: Mon, 19 Oct 2020 17:00:39 +0800
Subject: [PATCH] Removed process.env.TELEGRAM_WEBHOOK_URL as it's an aesthetic
 variable (#153)

---
 sadeaf-web/config.js          |  1 -
 sadeaf-web/telegram/server.js | 21 ++++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/sadeaf-web/config.js b/sadeaf-web/config.js
index 4126d12..3528a3e 100644
--- a/sadeaf-web/config.js
+++ b/sadeaf-web/config.js
@@ -46,7 +46,6 @@ module.exports = {
   },
   TELEGRAM: {
     WEBHOOK_ENDPOINT: process.env.TELEGRAM_WEBHOOK_ENDPOINT || 'http://localhost:4001/',
-    WEBHOOK_URL: process.env.TELEGRAM_WEBHOOK_URL || 'https://sadeaftest.tunnelto.dev/_telegram/webhook',
     BASE_URL: `https://api.telegram.org/bot${process.env.SADEAF_TELEGRAM_API_KEY}`,
   },
   BOOTSTRAP: {
diff --git a/sadeaf-web/telegram/server.js b/sadeaf-web/telegram/server.js
index 547a428..e5fe496 100644
--- a/sadeaf-web/telegram/server.js
+++ b/sadeaf-web/telegram/server.js
@@ -1,12 +1,9 @@
 import express from 'express';
 import bodyParser from 'body-parser';
-import { PRODUCTION } from '../config';
 import { INVALID_MESSAGE } from './registration-messages';
 import { getRegisterMessage, getStartMessage } from './actions';
 
-const {
-  TELEGRAM: { WEBHOOK_URL },
-} = require('../config');
+const { PRODUCTION } = require('../config');
 
 export default {
   async start(port) {
@@ -53,14 +50,16 @@ export default {
 
     return new Promise((resolve, reject) => {
       app.listen(port, (err) => {
-        if (err) reject(err);
-        else {
-          if (!PRODUCTION) {
-            console.warn('Remember to install tunnelto and run -> tunnelto --port 3000 -s sadeaftest');
-          }
-          console.log(`Telegram webhook listening on: ${WEBHOOK_URL}`);
-          resolve();
+        if (err) {
+          return reject(err);
         }
+
+        if (!PRODUCTION) {
+          console.warn('Remember to install tunnelto and run -> tunnelto --port 3000 -s sadeaftest');
+          console.warn(`Telegram webhook listening on: https://sadeaftest.tunnelto.dev/_telegram/webhook`);
+        }
+
+        resolve();
       });
     });
   },