Merge pull request #33 from lurory/fix/webhook

Fix webhook

index.ts

@@ -1,6 +1,6 @@
 import 'dotenv/config'
-import * as bot from './src/bot.js'
+import { tgBot } from './src/bot.js'
 import web from './src/web.js'
 
 process.title = 'caronaBot'
-web(bot)
+web(tgBot)

src/bot.ts

@@ -16,7 +16,7 @@ let tgBot: Bot
 if (process.env.NODE_ENV === 'production') {
   token = process.env.TOKEN as string
   tgBot = new Bot(token)
-  tgBot.setWebHook(process.env.HEROKU_URL + token)
+  tgBot.setWebHook(`${process.env.APP_URL}/bot${token}`)
 } else {
   token = process.env.TOKEN_DEV as string
   tgBot = new Bot(token, { polling: true })
@@ -215,4 +215,4 @@ const sendAdminMessageToGroup = async (user: Bot.User, params: Array<string>) =>
   }
 }
 
-export default tgBot
+export { tgBot, token }

src/web.ts

@@ -1,7 +1,10 @@
+import Bot from 'node-telegram-bot-api'
 import express, { Request, Response } from 'express'
 import { AddressInfo } from 'net'
 import bodyParser from 'body-parser'
 
+import { token } from './bot.js'
+
 const port = process.env.PORT || '80'
 const app = express()
 
@@ -22,8 +25,9 @@ function isAddressInfo(info: string | AddressInfo | null): info is AddressInfo {
   return (info as AddressInfo).address !== undefined
 }
 
-export default (bot: any) => {
-  app.post('/' + bot.token, (req: Request, res: Response) => {
+export default (bot: Bot) => {
+  app.post(`/bot${token}`, (req: Request, res: Response) => {
+    console.log('token: ', token)
     bot.processUpdate(req.body)
     res.sendStatus(200)
   })