Merge branch 'main' into feat/xp-boost

1 files changed, 16 insertions, 15 deletions

diff --git a/events.go b/events.go
index 3e55e4b..6f15fd8 100644
--- a/events.go
+++ b/events.go
@@ -2,13 +2,14 @@ package main
 
 import (
 	"fmt"
-	"github.com/anhgelus/gokord/utils"
-	"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"
+	discordgo "github.com/nyttikord/gokord"
 )
 
 const (
@@ -31,13 +32,13 @@ 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)
 	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 +70,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 +80,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 +98,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 +111,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,