aboutsummaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
Diffstat (limited to 'user')
-rw-r--r--user/level.go9
-rw-r--r--user/xp.go4
2 files changed, 8 insertions, 5 deletions
diff --git a/user/level.go b/user/level.go
index e11ac03..88971e6 100644
--- a/user/level.go
+++ b/user/level.go
@@ -9,10 +9,11 @@ import (
"git.anhgelus.world/anhgelus/les-copaings-bot/exp"
"github.com/anhgelus/gokord"
discordgo "github.com/nyttikord/gokord"
+ "github.com/nyttikord/gokord/bot"
"github.com/nyttikord/gokord/user"
)
-func onNewLevel(s *discordgo.Session, m *user.Member, level uint) {
+func onNewLevel(s bot.Session, m *user.Member, level uint) {
cfg := config.GetGuildConfig(m.GuildID)
xpForLevel := exp.LevelXP(level)
for _, role := range cfg.XpRoles {
@@ -68,7 +69,9 @@ func PeriodicReducer(s *discordgo.Session) {
}()
}
wg.Wait()
- for _, g := range s.State.Guilds {
+ i := 0
+ for g := range s.GuildAPI().State.Guilds() {
+ i++
wg.Add(1)
go func() {
defer wg.Done()
@@ -99,5 +102,5 @@ func PeriodicReducer(s *discordgo.Session) {
c.OnNewLevel(s, exp.Level(xp))
}
}
- s.LogDebug("Periodic reduce finished for %d guilds", len(s.State.Guilds))
+ s.LogDebug("Periodic reduce finished for %d guilds", i)
}
diff --git a/user/xp.go b/user/xp.go
index 96a8a27..16ba0ad 100644
--- a/user/xp.go
+++ b/user/xp.go
@@ -7,7 +7,7 @@ import (
"git.anhgelus.world/anhgelus/les-copaings-bot/config"
"git.anhgelus.world/anhgelus/les-copaings-bot/exp"
"github.com/anhgelus/gokord"
- discordgo "github.com/nyttikord/gokord"
+ "github.com/nyttikord/gokord/bot"
"github.com/nyttikord/gokord/logger"
"github.com/nyttikord/gokord/user"
)
@@ -25,7 +25,7 @@ func (c *cXP) GetXP() uint {
return c.Cxp
}
-func (c *Copaing) AddXP(s *discordgo.Session, m *user.Member, xp uint, fn func(uint, uint)) {
+func (c *Copaing) AddXP(s bot.Session, m *user.Member, xp uint, fn func(uint, uint)) {
old, err := c.GetXP()
if err != nil {
s.LogError(err, "getting xp for %s in %s", m.DisplayName(), c.GuildID)