telboon/webhook-everything
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix(Webhook): HostURL for generation
Some checks failed
Webhook-Everything/Webhook-Everything/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Samuel Pua
2022-05-29 00:22:21 +08:00
parent 53829a2788
commit cd2faaa02e
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@@ -11,6 +11,7 @@ pipeline {
DB_NAME = credentials("DB_NAME") DB_NAME = credentials("DB_NAME")
DB_SSL = credentials("DB_SSL") DB_SSL = credentials("DB_SSL")
TELEGRAM_API_KEY = credentials("TELEGRAM_API_KEY") TELEGRAM_API_KEY = credentials("TELEGRAM_API_KEY")
HOST_URL = credentials("HOST_URL")
} }
stages { stages {
@@ -25,6 +26,7 @@ pipeline {
sh 'echo DB_NAME=$DB_NAME >> .env' sh 'echo DB_NAME=$DB_NAME >> .env'
sh 'echo DB_SSL=$DB_SSL >> .env' sh 'echo DB_SSL=$DB_SSL >> .env'
sh 'echo TELEGRAM_API_KEY=$TELEGRAM_API_KEY >> .env' sh 'echo TELEGRAM_API_KEY=$TELEGRAM_API_KEY >> .env'
sh 'echo HOST_URL=$HOST_URL >> .env'
echo 'Clearing Git directory' echo 'Clearing Git directory'
sh 'rm -rf ./.git' sh 'rm -rf ./.git'
} }

3
backend/internal/webhookeverything/main.go
View File

@@ -12,13 +12,14 @@ import (
type Env struct { type Env struct {
DB *gorm.DB DB *gorm.DB
TelegramEnv *telegrampackage.Env TelegramEnv *telegrampackage.Env
HostUrl string HostURL string
} }
func WebhookEverythingRoutes(db *gorm.DB, telegramEnv *telegrampackage.Env, hostURL string) chi.Router { func WebhookEverythingRoutes(db *gorm.DB, telegramEnv *telegrampackage.Env, hostURL string) chi.Router {
var env Env var env Env
env.DB = db env.DB = db
env.TelegramEnv = telegramEnv env.TelegramEnv = telegramEnv
env.HostURL = hostURL
// Seed random // Seed random
rand.Seed(time.Now().UnixNano()) rand.Seed(time.Now().UnixNano())

2
backend/internal/webhookeverything/routegencontrollertelegram.go
View File

@@ -13,7 +13,7 @@ func (env *Env) registerWebhook(shortCode string, text string) (bool, *string) {
commandSplitted := telegrampackage.ParseTelegramBotCommand(text) commandSplitted := telegrampackage.ParseTelegramBotCommand(text)
if len(commandSplitted) > 0 && commandSplitted[0] == "/register-webhook" { if len(commandSplitted) > 0 && commandSplitted[0] == "/register-webhook" {
newWebhookID := genWebhookCode(6) newWebhookID := genWebhookCode(6)
baseURL, _ := url.Parse(env.HostUrl) baseURL, _ := url.Parse(env.HostURL)
baseURL.Path = path.Join(baseURL.Path, "webhook") baseURL.Path = path.Join(baseURL.Path, "webhook")
baseURL.Path = path.Join(baseURL.Path, "routes") baseURL.Path = path.Join(baseURL.Path, "routes")
baseURL.Path = path.Join(baseURL.Path, newWebhookID) baseURL.Path = path.Join(baseURL.Path, newWebhookID)