Compare commits
4 Commits
555bb588a0
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
| 6cc4c543e2 | |||
| ed4ae89369 | |||
| deec858857 | |||
| d37eedf7cf |
@@ -2,6 +2,8 @@ package db_management
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
|
"log"
|
||||||
|
"os"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
_ "modernc.org/sqlite"
|
_ "modernc.org/sqlite"
|
||||||
@@ -12,7 +14,12 @@ var DB *sql.DB
|
|||||||
func InitDB() {
|
func InitDB() {
|
||||||
var err error
|
var err error
|
||||||
// Öffnet bot.db im aktuellen Verzeichnis
|
// Öffnet bot.db im aktuellen Verzeichnis
|
||||||
DB, err = sql.Open("sqlite", "./bot.db")
|
dbPath := os.Getenv("DB_PATH")
|
||||||
|
if dbPath == "" {
|
||||||
|
dbPath = "./bot.db"
|
||||||
|
}
|
||||||
|
|
||||||
|
DB, err = sql.Open("sqlite", dbPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
@@ -85,3 +92,18 @@ func GetTopUsers(limit int) []UserStats {
|
|||||||
|
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func CleanupOldEntries() {
|
||||||
|
query := `DELETE FROM voice_sessions WHERE created_at < datetime('now', '-40 days)`
|
||||||
|
|
||||||
|
result, err := DB.Exec(query)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("Fehler beim DB-Cleanup: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
rowsAffected, _ := result.RowsAffected()
|
||||||
|
if rowsAffected > 0 {
|
||||||
|
log.Printf("DB Cleanup erfolgreich: %d alte Einträge gelöscht.", rowsAffected)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -2,14 +2,21 @@ version: '3.8'
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
# Build-Anweisung: Portainer sucht nach dem 'Dockerfile' im selben Ordner
|
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
image: discord_vc_bot:latest # So heißt dein lokal gebautes Image dann
|
image: discord_vc_bot:latest
|
||||||
pull_policy: build
|
pull_policy: build
|
||||||
container_name: docker_vc_bot
|
container_name: docker_vc_bot
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
- discord_db:/app/data
|
||||||
|
|
||||||
|
environment:
|
||||||
|
- DB_PATH=/app/data/bot.db
|
||||||
|
- DISCORD_TOKEN=${DISCORD_TOKEN}
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
@@ -17,14 +24,20 @@ services:
|
|||||||
memory: 256M
|
memory: 256M
|
||||||
reservations:
|
reservations:
|
||||||
memory: 64M
|
memory: 64M
|
||||||
|
|
||||||
logging:
|
logging:
|
||||||
driver: "json-file"
|
driver: "json-file"
|
||||||
options:
|
options:
|
||||||
max-size: "10m"
|
max-size: "10m"
|
||||||
max-file: "3"
|
max-file: "3"
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
- discord_backend_net
|
- discord_backend_net
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
discord_backend_net:
|
discord_backend_net:
|
||||||
driver: bridge
|
driver: bridge
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
discord_db:
|
||||||
|
external: true
|
||||||
1
go.mod
1
go.mod
@@ -18,6 +18,7 @@ require (
|
|||||||
github.com/ncruces/go-strftime v1.0.0 // indirect
|
github.com/ncruces/go-strftime v1.0.0 // indirect
|
||||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
|
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
|
||||||
|
github.com/robfig/cron/v3 v3.0.1 // indirect
|
||||||
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b // indirect
|
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b // indirect
|
||||||
golang.org/x/sys v0.42.0 // indirect
|
golang.org/x/sys v0.42.0 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
|
|||||||
2
go.sum
2
go.sum
@@ -22,6 +22,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
|
|||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
|
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
|
||||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
|
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
|
||||||
|
github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
|
||||||
|
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
|
||||||
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
||||||
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
||||||
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b h1:7mWr3k41Qtv8XlltBkDkl8LoP3mpSgBW8BUoxtEdbXg=
|
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b h1:7mWr3k41Qtv8XlltBkDkl8LoP3mpSgBW8BUoxtEdbXg=
|
||||||
|
|||||||
77
main.go
77
main.go
@@ -10,6 +10,7 @@ import (
|
|||||||
|
|
||||||
"github.com/bwmarrin/discordgo"
|
"github.com/bwmarrin/discordgo"
|
||||||
"github.com/joho/godotenv"
|
"github.com/joho/godotenv"
|
||||||
|
"github.com/robfig/cron/v3"
|
||||||
|
|
||||||
"heydeman/vc-stat-bot-discord/db_management"
|
"heydeman/vc-stat-bot-discord/db_management"
|
||||||
)
|
)
|
||||||
@@ -38,22 +39,39 @@ func main() {
|
|||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handler
|
// Handler & Intents
|
||||||
discord.AddHandler(interactionCreate)
|
discord.AddHandler(interactionCreate)
|
||||||
discord.AddHandler(voiceUpdate)
|
discord.AddHandler(voiceUpdate)
|
||||||
|
discord.Identify.Intents = discordgo.IntentsGuilds | discordgo.IntentsGuildVoiceStates
|
||||||
// Intents
|
|
||||||
discord.Identify.Intents = discordgo.IntentsGuilds |
|
|
||||||
discordgo.IntentsGuildVoiceStates
|
|
||||||
|
|
||||||
err = discord.Open()
|
err = discord.Open()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal("Error opening connection:", err)
|
log.Fatal("Error opening connection:", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Slash Commands registrieren
|
|
||||||
registerCommands(discord)
|
registerCommands(discord)
|
||||||
go autoSaveSessions()
|
|
||||||
|
// ==========================================
|
||||||
|
// 🕒 CRON SCHEDULER SETUP
|
||||||
|
// ==========================================
|
||||||
|
c := cron.New()
|
||||||
|
|
||||||
|
// Alle 5 Minuten: Aktuellen Stand in die DB schieben
|
||||||
|
_, _ = c.AddFunc("*/5 * * * *", func() {
|
||||||
|
fmt.Println("🔄 Cron Auto-Save: Speichere Zwischenstände...")
|
||||||
|
for uid, sess := range sessions {
|
||||||
|
processAndSave(uid, sess)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
// Jeden Tag um 00:00 Uhr: Alte Daten (40+ Tage) löschen
|
||||||
|
_, _ = c.AddFunc("0 0 * * *", func() {
|
||||||
|
fmt.Println("🧹 Cron Cleanup: Lösche Daten älter als 40 Tage...")
|
||||||
|
db_management.CleanupOldEntries()
|
||||||
|
})
|
||||||
|
|
||||||
|
c.Start()
|
||||||
|
defer c.Stop()
|
||||||
|
|
||||||
fmt.Println("Bot läuft stabil. CTRL+C zum Beenden.")
|
fmt.Println("Bot läuft stabil. CTRL+C zum Beenden.")
|
||||||
|
|
||||||
@@ -62,22 +80,10 @@ func main() {
|
|||||||
signal.Notify(stop, syscall.SIGINT, syscall.SIGTERM)
|
signal.Notify(stop, syscall.SIGINT, syscall.SIGTERM)
|
||||||
<-stop
|
<-stop
|
||||||
|
|
||||||
fmt.Println("Speichere aktive Sessions...")
|
fmt.Println("Speichere aktive Sessions vor Shutdown...")
|
||||||
|
// Beim Beenden alles wegschreiben, was noch im RAM ist
|
||||||
// 🔥 NEUE Shutdown-Logik (wichtig!)
|
|
||||||
for uid, sess := range sessions {
|
for uid, sess := range sessions {
|
||||||
|
processAndSave(uid, sess)
|
||||||
var total time.Duration
|
|
||||||
|
|
||||||
// bereits gesammelte Zeit
|
|
||||||
total += sess.Accum
|
|
||||||
|
|
||||||
// wenn NICHT pausiert → aktuelle Zeit dazu
|
|
||||||
if !sess.Paused {
|
|
||||||
total += time.Since(sess.Start)
|
|
||||||
}
|
|
||||||
|
|
||||||
db_management.SaveSession(uid, int(total.Seconds()))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
discord.Close()
|
discord.Close()
|
||||||
@@ -266,29 +272,34 @@ func formatDuration(d time.Duration) string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func autoSaveSessions() {
|
func autoSaveSessions() {
|
||||||
|
ticker := time.NewTicker(5 * time.Minute)
|
||||||
ticker := time.NewTicker(5 * time.Minute) // ⏱ Intervall anpassen
|
|
||||||
defer ticker.Stop()
|
defer ticker.Stop()
|
||||||
|
|
||||||
for range ticker.C {
|
for range ticker.C {
|
||||||
|
fmt.Println("Auto-Save")
|
||||||
fmt.Println("🔄 Auto-Save: speichere Sessions...")
|
|
||||||
|
|
||||||
for uid, sess := range sessions {
|
for uid, sess := range sessions {
|
||||||
|
processAndSave(uid, sess)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var total time.Duration
|
// Hilfsfunktion, die die Zeit berechnet, speichert und den Timer resettet
|
||||||
|
func processAndSave(uid string, sess *Session) {
|
||||||
|
var totalToSave time.Duration
|
||||||
|
|
||||||
total += sess.Accum
|
totalToSave += sess.Accum
|
||||||
|
|
||||||
if !sess.Paused {
|
if !sess.Paused {
|
||||||
total += time.Since(sess.Start)
|
totalToSave += time.Since(sess.Start)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Zwischenspeichern (ADD statt replace!)
|
if totalToSave.Seconds() >= 1 {
|
||||||
db_management.SaveSession(uid, int(total.Seconds()))
|
db_management.SaveSession(uid, int(totalToSave.Seconds()))
|
||||||
|
|
||||||
// ⚠️ Wichtig:
|
sess.Accum = 0
|
||||||
// NICHT löschen → Session läuft weiter
|
if !sess.Paused {
|
||||||
|
sess.Start = time.Now()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user