- db/db.go: Add write-time username sync in AddLog to prevent duplicate leaderboard entries when users change display names. Revert correlated subqueries back to GROUP BY user_id, username (simpler approach). - db/db.go: Early return in onMessageCreate if bot already reacted (prevents duplicate emoji reactions on Discord reconnection). - bot/bot.go: Add /version slash command with build version injection. - main.go: Add version variable with ldflags support. - Makefile: Add dns-fix, test, vet, build-native, pg-*, boot targets. Prepend test+vet to deploy pipeline. Add version ldflags to build. - db/migrations/002_fix_usernames.sql: One-time SQL to backfill old usernames. - scripts/fix-jail-dns.sh: Script to update jail resolv.conf from 8.8.8.8 to reachable nameservers (1.1.1.1, 9.9.9.9, 172.16.0.1). Signed-off-by: Blake Ridgway <blake@blakeridgway.com>
72 lines
1.4 KiB
Go
72 lines
1.4 KiB
Go
package main
|
|
|
|
import (
|
|
"log"
|
|
"os"
|
|
"os/signal"
|
|
"syscall"
|
|
"time"
|
|
|
|
"github.com/joho/godotenv"
|
|
|
|
"cycling-discord-bot/bot"
|
|
"cycling-discord-bot/db"
|
|
)
|
|
|
|
// Build version, set via ldflags at build time (see Makefile)
|
|
var version = "dev"
|
|
|
|
func main() {
|
|
_ = godotenv.Load()
|
|
|
|
token := mustEnv("DISCORD_TOKEN")
|
|
dbURL := mustEnv("DATABASE_URL")
|
|
guildID := getEnv("GUILD_ID", "") // empty = global commands (takes ~1h to propagate)
|
|
|
|
database, err := db.Open(dbURL)
|
|
if err != nil {
|
|
log.Fatalf("open database: %v", err)
|
|
}
|
|
defer database.Close()
|
|
|
|
b, err := bot.New(token, database, guildID, version)
|
|
if err != nil {
|
|
log.Fatalf("create bot: %v", err)
|
|
}
|
|
|
|
if err := b.Open(); err != nil {
|
|
log.Fatalf("open connection: %v", err)
|
|
}
|
|
defer b.Close()
|
|
|
|
// Give the session a moment to identify before registering commands
|
|
time.Sleep(500 * time.Millisecond)
|
|
|
|
log.Printf("starting cycling-discord-bot version %s", version)
|
|
|
|
if err := b.RegisterCommands(); err != nil {
|
|
log.Fatalf("register commands: %v", err)
|
|
}
|
|
|
|
log.Println("bot is running — press Ctrl+C to stop")
|
|
stop := make(chan os.Signal, 1)
|
|
signal.Notify(stop, syscall.SIGINT, syscall.SIGTERM)
|
|
<-stop
|
|
log.Println("shutting down")
|
|
}
|
|
|
|
func mustEnv(key string) string {
|
|
v := os.Getenv(key)
|
|
if v == "" {
|
|
log.Fatalf("missing required env var: %s", key)
|
|
}
|
|
return v
|
|
}
|
|
|
|
func getEnv(key, fallback string) string {
|
|
if v := os.Getenv(key); v != "" {
|
|
return v
|
|
}
|
|
return fallback
|
|
}
|