From cf2093095e769cdfac7fd83adc61d7ff6e958c0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Herg=C3=A8s?= Date: Mon, 4 Aug 2025 13:21:32 +0200 Subject: refactor(xp): use own trim function for next gokord update --- events.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'events.go') diff --git a/events.go b/events.go index 3e55e4b..e5fd37a 100644 --- a/events.go +++ b/events.go @@ -31,7 +31,7 @@ func OnMessage(s *discordgo.Session, m *discordgo.MessageCreate) { } c := user.GetCopaing(m.Author.ID, m.GuildID) // add exp - trimmed := utils.TrimMessage(strings.ToLower(m.Content)) + trimmed := exp.TrimMessage(strings.ToLower(m.Content)) m.Member.User = m.Author m.Member.GuildID = m.GuildID xp := min(exp.MessageXP(uint(len(trimmed)), exp.CalcDiversity(trimmed)), MaxXpPerMessage) -- cgit v1.2.3 From 5a8da1eaeb9434a18e553a5c50490d06b54a6a1d Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Wed, 6 Aug 2025 02:22:06 +0200 Subject: build(gokord): upgrade to latest version --- events.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'events.go') diff --git a/events.go b/events.go index e5fd37a..4821e38 100644 --- a/events.go +++ b/events.go @@ -2,7 +2,7 @@ package main import ( "fmt" - "github.com/anhgelus/gokord/utils" + "github.com/anhgelus/gokord/logger" "github.com/anhgelus/les-copaings-bot/config" "github.com/anhgelus/les-copaings-bot/exp" "github.com/anhgelus/les-copaings-bot/user" @@ -37,7 +37,7 @@ func OnMessage(s *discordgo.Session, m *discordgo.MessageCreate) { xp := min(exp.MessageXP(uint(len(trimmed)), exp.CalcDiversity(trimmed)), MaxXpPerMessage) c.AddXP(s, m.Member, xp, func(_ uint, _ uint) { if err := s.MessageReactionAdd(m.ChannelID, m.Message.ID, "⬆"); err != nil { - utils.SendAlert( + logger.Alert( "events.go - add reaction for new level", err.Error(), "channel id", m.ChannelID, "message id", m.Message.ID, @@ -69,7 +69,7 @@ func genMapKey(guildID string, userID string) string { } func onConnection(_ *discordgo.Session, e *discordgo.VoiceStateUpdate) { - utils.SendDebug("User connected", "username", e.Member.DisplayName()) + logger.Debug("User connected", "username", e.Member.DisplayName()) connectedSince[genMapKey(e.GuildID, e.UserID)] = time.Now().Unix() } @@ -79,17 +79,17 @@ func onDisconnect(s *discordgo.Session, e *discordgo.VoiceStateUpdate) { // check the validity of user con, ok := connectedSince[genMapKey(e.GuildID, e.UserID)] if !ok || con == NotConnected { - utils.SendWarn(fmt.Sprintf( + logger.Warn(fmt.Sprintf( "User %s diconnect from a vocal but was registered as not connected", e.Member.DisplayName(), )) return } timeInVocal := now - con - utils.SendDebug("User disconnected", "username", e.Member.DisplayName(), "time in vocal", timeInVocal) + logger.Debug("User disconnected", "username", e.Member.DisplayName(), "time in vocal", timeInVocal) connectedSince[genMapKey(e.GuildID, e.UserID)] = NotConnected // add exp if timeInVocal < 0 { - utils.SendAlert( + logger.Alert( "events.go - Calculating time spent in vocal", "the time is negative", "discord_id", e.UserID, "guild_id", e.GuildID, @@ -97,7 +97,7 @@ func onDisconnect(s *discordgo.Session, e *discordgo.VoiceStateUpdate) { return } if timeInVocal > MaxTimeInVocal { - utils.SendWarn(fmt.Sprintf("User %s spent more than 6 hours in vocal", e.Member.DisplayName())) + logger.Warn(fmt.Sprintf("User %s spent more than 6 hours in vocal", e.Member.DisplayName())) timeInVocal = MaxTimeInVocal } e.Member.GuildID = e.GuildID @@ -110,19 +110,19 @@ func onDisconnect(s *discordgo.Session, e *discordgo.VoiceStateUpdate) { "%s est maintenant niveau %d", e.Member.Mention(), newLevel, )) if err != nil { - utils.SendAlert("events.go - Sending new level in fallback channel", err.Error()) + logger.Alert("events.go - Sending new level in fallback channel", err.Error()) } }) } func OnLeave(_ *discordgo.Session, e *discordgo.GuildMemberRemove) { - utils.SendDebug("Leave event", "user_id", e.User.ID) + logger.Debug("Leave event", "user_id", e.User.ID) if e.User.Bot { return } c := user.GetCopaing(e.User.ID, e.GuildID) if err := c.Delete(); err != nil { - utils.SendAlert( + logger.Alert( "events.go - deleting user from db", err.Error(), "user_id", e.User.ID, "guild_id", e.GuildID, -- cgit v1.2.3 From c04f4d9fff2e753f0477a07a9f8f43fbcba8969e Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Thu, 21 Aug 2025 14:59:23 +0200 Subject: build(go): rename module to use git.anhgelus.world instead of github --- events.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'events.go') diff --git a/events.go b/events.go index 4821e38..17a83a0 100644 --- a/events.go +++ b/events.go @@ -2,13 +2,14 @@ package main import ( "fmt" - "github.com/anhgelus/gokord/logger" - "github.com/anhgelus/les-copaings-bot/config" - "github.com/anhgelus/les-copaings-bot/exp" - "github.com/anhgelus/les-copaings-bot/user" - "github.com/bwmarrin/discordgo" "strings" "time" + + "git.anhgelus.world/anhgelus/les-copaings-bot/config" + "git.anhgelus.world/anhgelus/les-copaings-bot/exp" + "git.anhgelus.world/anhgelus/les-copaings-bot/user" + "github.com/anhgelus/gokord/logger" + "github.com/bwmarrin/discordgo" ) const ( -- cgit v1.2.3 From 30ecd60b041398390f11fccdf46444fa28690bd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Herg=C3=A8s?= Date: Thu, 4 Sep 2025 16:25:59 +0200 Subject: build(gokord): upgrade to latest nightly still use discordgo name before merging anhgelus/gokord with nyttikord/gokord --- events.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'events.go') diff --git a/events.go b/events.go index 17a83a0..6f15fd8 100644 --- a/events.go +++ b/events.go @@ -9,7 +9,7 @@ import ( "git.anhgelus.world/anhgelus/les-copaings-bot/exp" "git.anhgelus.world/anhgelus/les-copaings-bot/user" "github.com/anhgelus/gokord/logger" - "github.com/bwmarrin/discordgo" + discordgo "github.com/nyttikord/gokord" ) const ( -- cgit v1.2.3