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

perf(xp): use new slices.Contains in calcDiversity

Browse source
This commit is contained in:
Anhgelus Morhtuuzh 2024-04-15 11:43:09 +02:00
parent 1a36ecd053
commit dcc260c4b0
No known key found for this signature in database
GPG key ID: CF4550297832A29F
1 changed files with 18 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

39
xp/events.go
View file

@ -8,7 +8,9 @@ import (
"github.com/anhgelus/gokord/utils" "github.com/anhgelus/gokord/utils"
"github.com/bwmarrin/discordgo" "github.com/bwmarrin/discordgo"
"github.com/redis/go-redis/v9" "github.com/redis/go-redis/v9"
"slices"
"strconv" "strconv"
"strings"
"time" "time"
) )
@ -22,7 +24,7 @@ func OnMessage(s *discordgo.Session, m *discordgo.MessageCreate) {
c := Copaing{DiscordID: m.Author.ID, GuildID: m.GuildID} c := Copaing{DiscordID: m.Author.ID, GuildID: m.GuildID}
c.Load() c.Load()
// add xp // add xp
trimmed := utils.TrimMessage(m.Content) trimmed := utils.TrimMessage(strings.ToLower(m.Content))
c.AddXP(s, XPMessage(uint(len(trimmed)), calcDiversity(trimmed)), func(_ uint, _ uint) { c.AddXP(s, XPMessage(uint(len(trimmed)), calcDiversity(trimmed)), func(_ uint, _ uint) {
if err := s.MessageReactionAdd(m.ChannelID, m.Message.ID, "⬆"); err != nil { if err := s.MessageReactionAdd(m.ChannelID, m.Message.ID, "⬆"); err != nil {
utils.SendAlert("xp/events.go - reaction add new level", "cannot add the reaction: "+err.Error()) utils.SendAlert("xp/events.go - reaction add new level", "cannot add the reaction: "+err.Error())
@ -33,13 +35,7 @@ func OnMessage(s *discordgo.Session, m *discordgo.MessageCreate) {
func calcDiversity(msg string) uint { func calcDiversity(msg string) uint {
var chars []rune var chars []rune
for _, c := range []rune(msg) { for _, c := range []rune(msg) {
toAdd := true if !slices.Contains(chars, c) {
for _, ch := range chars {
if ch == c {
toAdd = false
}
}
if toAdd {
chars = append(chars, c) chars = append(chars, c)
} }
} }
@ -50,22 +46,23 @@ func OnVoiceUpdate(s *discordgo.Session, e *discordgo.VoiceStateUpdate) {
if e.Member.User.Bot { if e.Member.User.Bot {
return return
} }
redis, err := gokord.BaseCfg.Redis.Get() r, err := gokord.BaseCfg.Redis.Get()
if err != nil { if err != nil {
utils.SendAlert("events.go - Getting redis client", err.Error()) utils.SendAlert("xp/events.go - Getting redis client", err.Error())
return
} }
if e.BeforeUpdate == nil { if e.BeforeUpdate == nil {
onConnection(s, e, redis) onConnection(s, e, r)
} else { } else {
onDisconnect(s, e, redis) onDisconnect(s, e, r)
} }
err = redis.Close() err = r.Close()
if err != nil { if err != nil {
utils.SendAlert("events.go - Closing redis client", err.Error()) utils.SendAlert("xp/events.go - Closing redis client", err.Error())
} }
} }
func onConnection(s *discordgo.Session, e *discordgo.VoiceStateUpdate, r *redis.Client) { func onConnection(_ *discordgo.Session, e *discordgo.VoiceStateUpdate, r *redis.Client) {
u := gokord.UserBase{DiscordID: e.UserID, GuildID: e.GuildID} u := gokord.UserBase{DiscordID: e.UserID, GuildID: e.GuildID}
err := r.Set( err := r.Set(
context.Background(), context.Background(),
@ -74,7 +71,7 @@ func onConnection(s *discordgo.Session, e *discordgo.VoiceStateUpdate, r *redis.
0, 0,
).Err() ).Err()
if err != nil { if err != nil {
utils.SendAlert("events.go - Setting connected_since", err.Error()) utils.SendAlert("xp/events.go - Setting connected_since", err.Error())
} }
} }
@ -91,16 +88,16 @@ func onDisconnect(s *discordgo.Session, e *discordgo.VoiceStateUpdate, r *redis.
return return
} }
if res.Err() != nil { if res.Err() != nil {
utils.SendAlert("events.go - Getting connected_since", res.Err().Error()) utils.SendAlert("xp/events.go - Getting connected_since", res.Err().Error())
err := r.Set(context.Background(), key, strconv.Itoa(NotConnected), 0).Err() err := r.Set(context.Background(), key, strconv.Itoa(NotConnected), 0).Err()
if err != nil { if err != nil {
utils.SendAlert("events.go - Set connected_since to not connected after get err", err.Error()) utils.SendAlert("xp/events.go - Set connected_since to not connected after get err", err.Error())
} }
return return
} }
con, err := res.Int64() con, err := res.Int64()
if err != nil { if err != nil {
utils.SendAlert("events.go - Converting result to int64", err.Error()) utils.SendAlert("xp/events.go - Converting result to int64", err.Error())
return return
} }
if con == NotConnected { if con == NotConnected {
@ -112,11 +109,11 @@ func onDisconnect(s *discordgo.Session, e *discordgo.VoiceStateUpdate, r *redis.
} }
err = r.Set(context.Background(), key, strconv.Itoa(NotConnected), 0).Err() err = r.Set(context.Background(), key, strconv.Itoa(NotConnected), 0).Err()
if err != nil { if err != nil {
utils.SendAlert("events.go - Set connected_since to not connected", err.Error()) utils.SendAlert("xp/events.go - Set connected_since to not connected", err.Error())
} }
timeInVocal := now - con timeInVocal := now - con
if timeInVocal < 0 { if timeInVocal < 0 {
utils.SendAlert("events.go - Calculating time spent in vocal", "the time is negative") utils.SendAlert("xp/events.go - Calculating time spent in vocal", "the time is negative")
return return
} }
if timeInVocal > MaxTimeInVocal { if timeInVocal > MaxTimeInVocal {