Fix(Webhook): HostURL for generation
Some checks failed
Webhook-Everything/Webhook-Everything/pipeline/head There was a failure building this commit
Some checks failed
Webhook-Everything/Webhook-Everything/pipeline/head There was a failure building this commit
This commit is contained in:
2
Jenkinsfile
vendored
2
Jenkinsfile
vendored
@@ -11,6 +11,7 @@ pipeline {
|
||||
DB_NAME = credentials("DB_NAME")
|
||||
DB_SSL = credentials("DB_SSL")
|
||||
TELEGRAM_API_KEY = credentials("TELEGRAM_API_KEY")
|
||||
HOST_URL = credentials("HOST_URL")
|
||||
}
|
||||
|
||||
stages {
|
||||
@@ -25,6 +26,7 @@ pipeline {
|
||||
sh 'echo DB_NAME=$DB_NAME >> .env'
|
||||
sh 'echo DB_SSL=$DB_SSL >> .env'
|
||||
sh 'echo TELEGRAM_API_KEY=$TELEGRAM_API_KEY >> .env'
|
||||
sh 'echo HOST_URL=$HOST_URL >> .env'
|
||||
echo 'Clearing Git directory'
|
||||
sh 'rm -rf ./.git'
|
||||
}
|
||||
|
||||
@@ -12,13 +12,14 @@ import (
|
||||
type Env struct {
|
||||
DB *gorm.DB
|
||||
TelegramEnv *telegrampackage.Env
|
||||
HostUrl string
|
||||
HostURL string
|
||||
}
|
||||
|
||||
func WebhookEverythingRoutes(db *gorm.DB, telegramEnv *telegrampackage.Env, hostURL string) chi.Router {
|
||||
var env Env
|
||||
env.DB = db
|
||||
env.TelegramEnv = telegramEnv
|
||||
env.HostURL = hostURL
|
||||
|
||||
// Seed random
|
||||
rand.Seed(time.Now().UnixNano())
|
||||
|
||||
@@ -13,7 +13,7 @@ func (env *Env) registerWebhook(shortCode string, text string) (bool, *string) {
|
||||
commandSplitted := telegrampackage.ParseTelegramBotCommand(text)
|
||||
if len(commandSplitted) > 0 && commandSplitted[0] == "/register-webhook" {
|
||||
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, "routes")
|
||||
baseURL.Path = path.Join(baseURL.Path, newWebhookID)
|
||||
|
||||
Reference in New Issue
Block a user