anhgelus/les-copaings-bot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(log): wrong pos in many alerts

Browse source
This commit is contained in:
Anhgelus Morhtuuzh 2025-05-13 13:00:09 +02:00
parent c408afc879
commit d38c57b830
Signed by: anhgelus
GPG key ID: CAD341EFA92DDDE5
5 changed files with 46 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

26
events.go
View file

@ -7,7 +7,7 @@ import (
"github.com/anhgelus/gokord"
"github.com/anhgelus/gokord/utils"
"github.com/anhgelus/les-copaings-bot/config"
xp2 "github.com/anhgelus/les-copaings-bot/exp"
"github.com/anhgelus/les-copaings-bot/exp"
"github.com/anhgelus/les-copaings-bot/user"
"github.com/bwmarrin/discordgo"
"github.com/redis/go-redis/v9"
@ -38,14 +38,14 @@ func OnMessage(s *discordgo.Session, m *discordgo.MessageCreate) {
trimmed := utils.TrimMessage(strings.ToLower(m.Content))
m.Member.User = m.Author
m.Member.GuildID = m.GuildID
xp := xp2.MessageXP(uint(len(trimmed)), calcDiversity(trimmed))
xp := exp.MessageXP(uint(len(trimmed)), calcDiversity(trimmed))
if xp > MaxXpPerMessage {
xp = MaxXpPerMessage
}
c.AddXP(s, m.Member, xp, func(_ uint, _ uint) {
if err := s.MessageReactionAdd(m.ChannelID, m.Message.ID, "⬆"); err != nil {
utils.SendAlert(
"exp/events.go - add reaction for new level", err.Error(),
"events.go - add reaction for new level", err.Error(),
"channel id", m.ChannelID,
"message id", m.Message.ID,
)
@ -71,7 +71,7 @@ func OnVoiceUpdate(s *discordgo.Session, e *discordgo.VoiceStateUpdate) {
cfg := config.GetGuildConfig(e.GuildID)
client, err := config.GetRedisClient()
if err != nil {
utils.SendAlert("exp/events.go - Getting redis client", err.Error())
utils.SendAlert("events.go - Getting redis client", err.Error())
return
}
if e.BeforeUpdate == nil && e.ChannelID != "" {
@ -97,7 +97,7 @@ func onConnection(_ *discordgo.Session, e *discordgo.VoiceStateUpdate, client *r
0,
).Err()
if err != nil {
utils.SendAlert("exp/events.go - Setting connected_since", err.Error())
utils.SendAlert("events.go - Setting connected_since", err.Error())
}
}
@ -114,16 +114,16 @@ func onDisconnect(s *discordgo.Session, e *discordgo.VoiceStateUpdate, client *r
return
}
if res.Err() != nil {
utils.SendAlert("exp/events.go - Getting connected_since", res.Err().Error())
utils.SendAlert("events.go - Getting connected_since", res.Err().Error())
err := client.Set(context.Background(), key, strconv.Itoa(NotConnected), 0).Err()
if err != nil {
utils.SendAlert("exp/events.go - Set connected_since to not connected after get err", err.Error())
utils.SendAlert("events.go - Set connected_since to not connected after get err", err.Error())
}
return
}
con, err := res.Int64()
if err != nil {
utils.SendAlert("exp/events.go - Converting result to int64", err.Error())
utils.SendAlert("events.go - Converting result to int64", err.Error())
return
}
// check validity of user (2)
@ -136,12 +136,12 @@ func onDisconnect(s *discordgo.Session, e *discordgo.VoiceStateUpdate, client *r
utils.SendDebug("User disconnected", "username", e.Member.DisplayName(), "since", con)
err = client.Set(context.Background(), key, strconv.Itoa(NotConnected), 0).Err()
if err != nil {
utils.SendAlert("exp/events.go - Set connected_since to not connected", err.Error())
utils.SendAlert("events.go - Set connected_since to not connected", err.Error())
}
// add exp
timeInVocal := now - con
if timeInVocal < 0 {
utils.SendAlert("exp/events.go - Calculating time spent in vocal", "the time is negative")
utils.SendAlert("events.go - Calculating time spent in vocal", "the time is negative")
return
}
if timeInVocal > MaxTimeInVocal {
@ -149,13 +149,13 @@ func onDisconnect(s *discordgo.Session, e *discordgo.VoiceStateUpdate, client *r
timeInVocal = MaxTimeInVocal
}
e.Member.GuildID = e.GuildID
c.AddXP(s, e.Member, xp2.VocalXP(uint(timeInVocal)), func(_ uint, newLevel uint) {
c.AddXP(s, e.Member, exp.VocalXP(uint(timeInVocal)), func(_ uint, newLevel uint) {
cfg := config.GetGuildConfig(e.GuildID)
_, err = s.ChannelMessageSend(cfg.FallbackChannel, fmt.Sprintf(
"%s est maintenant niveau %d", e.Member.Mention(), newLevel,
))
if err != nil {
utils.SendAlert("exp/events.go - Sending new level in fallback channel", err.Error())
utils.SendAlert("events.go - Sending new level in fallback channel", err.Error())
}
})
}
@ -165,7 +165,7 @@ func OnLeave(_ *discordgo.Session, e *discordgo.GuildMemberRemove) {
c := user.GetCopaing(e.User.ID, e.GuildID)
if err := gokord.DB.Where("guild_id = ?", e.GuildID).Delete(c).Error; err != nil {
utils.SendAlert(
"exp/events.go - deleting user from db", err.Error(),
"events.go - deleting user from db", err.Error(),
"user_id", e.User.ID,
"guild_id", e.GuildID,
)