db123/worktimeBot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up: remove unused packages, switch to slog, tidy Makefile

Browse Source
This commit is contained in:
db123
2026-06-23 22:34:01 +03:30
parent 32446a99d1
commit b4fab29d45
7 changed files with 122 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
cmd/bot/webhook.go
View File

@@ -1,7 +1,7 @@
package main
import (
"log"
"log/slog"
"net/http"
"os"
@@ -10,49 +10,48 @@ import (
"worktimeBot/internal/bot"
)
// startWebhook configures the Telegram webhook and starts the HTTP(S) listener.
func startWebhook(botAPI *tgbotapi.BotAPI, handler *bot.Handler, webhookURL string) {
// Delete any previously set webhook
if _, err := botAPI.Request(tgbotapi.DeleteWebhookConfig{}); err != nil {
log.Fatal("DeleteWebhook:", err)
slog.Error("delete webhook", "error", err)
os.Exit(1)
}
// Set the new webhook
wh, err := tgbotapi.NewWebhook(webhookURL)
if err != nil {
log.Fatal("NewWebhook:", err)
slog.Error("new webhook", "error", err)
os.Exit(1)
}
if _, err := botAPI.Request(wh); err != nil {
log.Fatal("SetWebhook:", err)
slog.Error("set webhook", "error", err)
os.Exit(1)
}
// Register the webhook endpoint and get the updates channel
updates := botAPI.ListenForWebhook("/webhook")
// Determine where to listen
listenAddr := getEnvDefault("BOT_LISTEN", ":8080")
tlsCert := os.Getenv("BOT_TLS_CERT")
tlsKey := os.Getenv("BOT_TLS_KEY")
if tlsCert != "" && tlsKey != "" {
log.Printf("Starting HTTPS webhook on %s", listenAddr)
slog.Info("starting HTTPS webhook", "addr", listenAddr)
go func() {
if err := http.ListenAndServeTLS(listenAddr, tlsCert, tlsKey, nil); err != nil {
log.Fatal("HTTPS server:", err)
slog.Error("HTTPS server", "error", err)
os.Exit(1)
}
}()
} else {
log.Printf("Starting HTTP webhook on %s (TLS handled by reverse proxy)", listenAddr)
slog.Info("starting HTTP webhook (TLS by reverse proxy)", "addr", listenAddr)
go func() {
if err := http.ListenAndServe(listenAddr, nil); err != nil {
log.Fatal("HTTP server:", err)
slog.Error("HTTP server", "error", err)
os.Exit(1)
}
}()
}
log.Printf("Webhook registered at %s", webhookURL)
slog.Info("webhook registered", "url", webhookURL)
// Process incoming updates
for update := range updates {
if update.Message != nil {
handler.HandleMessage(update)