fix port

chofnar · Jan 23, 2024 · 054a3c0 · 054a3c0
1 parent 6cce6f1
commit 054a3c0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/vm-deploy.yml b/.github/workflows/vm-deploy.yml
@@ -51,4 +51,6 @@ jobs:
               -e SUPER_SECRET_TOKEN=${{ secrets.SUPER_SECRET_TOKEN }} \
               -e LIMIT=${{ secrets.LIMIT }} \
               -e RESET_WEBHOOK_URL=${{ secrets.RESET_WEBHOOK_URL }} \
+              -e WEBHOOK_PORT=${{ secrets.WEBHOOK_PORT }} \
+              -e PORT=${{ secrets.PORT }} \
               chofnar/go-release-bot:${{ github.sha }}
diff --git a/internal/server/config/config.go b/internal/server/config/config.go
@@ -6,8 +6,8 @@ import (
 )
 
 type BotConfig struct {
-	TelegramToken, WebhookSite, Port, GithubGQLToken, ResetWebhookUrl string
-	Limit                                                             int
+	TelegramToken, WebhookSite, WebhookPort, Port, GithubGQLToken, ResetWebhookUrl string
+	Limit                                                                          int
 }
 
 func LoadBotConfig() *BotConfig {
@@ -24,6 +24,7 @@ func LoadBotConfig() *BotConfig {
 			TelegramToken:   os.Getenv("TELEGRAM_BOT_TOKEN"),
 			WebhookSite:     os.Getenv("TELEGRAM_BOT_SITE_URL"),
 			Port:            os.Getenv("PORT"),
+			WebhookPort:     os.Getenv("WEBHOOK_PORT"),
 			GithubGQLToken:  os.Getenv("GRAPHQL_TOKEN"),
 			ResetWebhookUrl: os.Getenv("RESET_WEBHOOK_URL"),
 			Limit:           limit,

diff --git a/internal/server/server.go b/internal/server/server.go
@@ -75,7 +75,11 @@ func Start() {
 	}
 
 	if botConf.ResetWebhookUrl != "" {
-		url := botConf.WebhookSite + "/bot/" + botConf.TelegramToken
+		var webhookPort string
+		if botConf.WebhookPort != "" {
+			webhookPort = ":" + botConf.WebhookPort
+		}
+		url := botConf.WebhookSite + webhookPort + "/bot/" + botConf.TelegramToken
 		logger.Info("resetting webhook url to: " + botConf.WebhookSite + "/bot/TOKEN")
 		err = bot.SetWebhook(&telego.SetWebhookParams{
 			URL: url,