build(gokord): upgrade to latest version
This commit is contained in:
parent
d72004ae14
commit
5a8da1eaeb
GPG key ID:
CAD341EFA92DDDE5
13 changed files with 136 additions and 146 deletions
|
|
@ -2,7 +2,7 @@ package user
|
|||
|
||||
import (
|
||||
"github.com/anhgelus/gokord"
|
||||
"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/bwmarrin/discordgo"
|
||||
|
|
@ -16,7 +16,7 @@ func onNewLevel(dg *discordgo.Session, m *discordgo.Member, level uint) {
|
|||
xpForLevel := exp.LevelXP(level)
|
||||
for _, role := range cfg.XpRoles {
|
||||
if role.XP <= xpForLevel && !slices.Contains(m.Roles, role.RoleID) {
|
||||
utils.SendDebug(
|
||||
logger.Debug(
|
||||
"Add role",
|
||||
"role_id", role.RoleID,
|
||||
"user_id", m.User.ID,
|
||||
|
|
@ -24,10 +24,10 @@ func onNewLevel(dg *discordgo.Session, m *discordgo.Member, level uint) {
|
|||
)
|
||||
err := dg.GuildMemberRoleAdd(m.GuildID, m.User.ID, role.RoleID)
|
||||
if err != nil {
|
||||
utils.SendAlert("user/level.go - Adding role", err.Error(), "role_id", role.RoleID)
|
||||
logger.Alert("user/level.go - Adding role", err.Error(), "role_id", role.RoleID)
|
||||
}
|
||||
} else if role.XP > xpForLevel && slices.Contains(m.Roles, role.RoleID) {
|
||||
utils.SendDebug(
|
||||
logger.Debug(
|
||||
"Remove role",
|
||||
"role_id", role.RoleID,
|
||||
"user_id", m.User.ID,
|
||||
|
|
@ -35,7 +35,7 @@ func onNewLevel(dg *discordgo.Session, m *discordgo.Member, level uint) {
|
|||
)
|
||||
err := dg.GuildMemberRoleRemove(m.GuildID, m.User.ID, role.RoleID)
|
||||
if err != nil {
|
||||
utils.SendAlert("user/level.go - Removing role", err.Error(), "role_id", role.RoleID)
|
||||
logger.Alert("user/level.go - Removing role", err.Error(), "role_id", role.RoleID)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -44,7 +44,7 @@ func onNewLevel(dg *discordgo.Session, m *discordgo.Member, level uint) {
|
|||
func (c *Copaing) OnNewLevel(dg *discordgo.Session, level uint) {
|
||||
m, err := dg.GuildMember(c.GuildID, c.DiscordID)
|
||||
if err != nil {
|
||||
utils.SendAlert(
|
||||
logger.Alert(
|
||||
"user/level.go - Getting member for new level", err.Error(),
|
||||
"discord_id", c.DiscordID,
|
||||
"guild_id", c.GuildID,
|
||||
|
|
@ -58,7 +58,7 @@ func PeriodicReducer(dg *discordgo.Session) {
|
|||
wg := &sync.WaitGroup{}
|
||||
var cs []*Copaing
|
||||
if err := gokord.DB.Find(&cs).Error; err != nil {
|
||||
utils.SendAlert("user/level.go - Fetching all copaings", err.Error())
|
||||
logger.Alert("user/level.go - Fetching all copaings", err.Error())
|
||||
return
|
||||
}
|
||||
cxps := make([]*cXP, len(cs))
|
||||
|
|
@ -71,7 +71,7 @@ func PeriodicReducer(dg *discordgo.Session) {
|
|||
defer wg.Done()
|
||||
xp, err := c.GetXP()
|
||||
if err != nil {
|
||||
utils.SendAlert("user/level.go - Getting XP", err.Error(), "copaing_id", c.ID, "guild_id", c.GuildID)
|
||||
logger.Alert("user/level.go - Getting XP", err.Error(), "copaing_id", c.ID, "guild_id", c.GuildID)
|
||||
xp = 0
|
||||
}
|
||||
cxps[i] = &cXP{
|
||||
|
|
@ -92,25 +92,25 @@ func PeriodicReducer(dg *discordgo.Session) {
|
|||
Delete(&CopaingXP{}).
|
||||
Error
|
||||
if err != nil {
|
||||
utils.SendAlert("user/level.go - Removing old XP", err.Error(), "guild_id", g.ID)
|
||||
logger.Alert("user/level.go - Removing old XP", err.Error(), "guild_id", g.ID)
|
||||
}
|
||||
}()
|
||||
}
|
||||
wg.Wait()
|
||||
for i, c := range cxps {
|
||||
if i%50 == 49 {
|
||||
utils.SendDebug("Sleeping...")
|
||||
logger.Debug("Sleeping...")
|
||||
time.Sleep(15 * time.Second) // prevents spamming the API
|
||||
}
|
||||
oldXp := c.GetXP()
|
||||
xp, err := c.ToCopaing().GetXP()
|
||||
if err != nil {
|
||||
utils.SendAlert("user/level.go - Getting XP", err.Error(), "guild_id", c.ID, "discord_id", c.DiscordID)
|
||||
logger.Alert("user/level.go - Getting XP", err.Error(), "guild_id", c.ID, "discord_id", c.DiscordID)
|
||||
continue
|
||||
}
|
||||
if exp.Level(oldXp) != exp.Level(xp) {
|
||||
c.OnNewLevel(dg, exp.Level(xp))
|
||||
}
|
||||
}
|
||||
utils.SendDebug("Periodic reduce finished", "len(guilds)", len(dg.State.Guilds))
|
||||
logger.Debug("Periodic reduce finished", "len(guilds)", len(dg.State.Guilds))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ package user
|
|||
|
||||
import (
|
||||
"github.com/anhgelus/gokord"
|
||||
"github.com/anhgelus/gokord/utils"
|
||||
"github.com/anhgelus/gokord/logger"
|
||||
"time"
|
||||
)
|
||||
|
||||
|
|
@ -34,7 +34,7 @@ const (
|
|||
func GetCopaing(discordID string, guildID string) *Copaing {
|
||||
c := Copaing{DiscordID: discordID, GuildID: guildID}
|
||||
if err := c.Load(); err != nil {
|
||||
utils.SendAlert(
|
||||
logger.Alert(
|
||||
"user/member.go - Loading user",
|
||||
err.Error(),
|
||||
"discord_id",
|
||||
|
|
|
|||
14
user/xp.go
14
user/xp.go
|
|
@ -2,7 +2,7 @@ package user
|
|||
|
||||
import (
|
||||
"github.com/anhgelus/gokord"
|
||||
"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/bwmarrin/discordgo"
|
||||
|
|
@ -26,14 +26,14 @@ func (c *cXP) GetXP() uint {
|
|||
func (c *Copaing) AddXP(s *discordgo.Session, m *discordgo.Member, xp uint, fn func(uint, uint)) {
|
||||
old, err := c.GetXP()
|
||||
if err != nil {
|
||||
utils.SendAlert("user/xp.go - Getting xp", err.Error(), "discord_id", c.DiscordID, "guild_id", c.GuildID)
|
||||
logger.Alert("user/xp.go - Getting xp", err.Error(), "discord_id", c.DiscordID, "guild_id", c.GuildID)
|
||||
return
|
||||
}
|
||||
pastLevel := exp.Level(old)
|
||||
utils.SendDebug("Adding xp", "member", m.DisplayName(), "old xp", old, "xp to add", xp, "old level", pastLevel)
|
||||
logger.Debug("Adding xp", "member", m.DisplayName(), "old xp", old, "xp to add", xp, "old level", pastLevel)
|
||||
c.CopaingXPs = append(c.CopaingXPs, CopaingXP{CopaingID: c.ID, XP: xp, GuildID: c.GuildID})
|
||||
if err = c.Save(); err != nil {
|
||||
utils.SendAlert(
|
||||
logger.Alert(
|
||||
"user/xp.go - Saving user",
|
||||
err.Error(),
|
||||
"xp",
|
||||
|
|
@ -76,7 +76,7 @@ func (c *Copaing) GetXPForDays(n uint) (uint, error) {
|
|||
var cxp CopaingXP
|
||||
err = gokord.DB.ScanRows(rows, &cxp)
|
||||
if err != nil {
|
||||
utils.SendAlert("user/xp.go - Scanning rows", err.Error(), "copaing_id", c.ID, "guild_id", c.GuildID)
|
||||
logger.Alert("user/xp.go - Scanning rows", err.Error(), "copaing_id", c.ID, "guild_id", c.GuildID)
|
||||
continue
|
||||
}
|
||||
xp += cxp.XP
|
||||
|
|
@ -103,7 +103,7 @@ func GetBestXP(guildId string, n uint, d int) ([]CopaingAccess, error) {
|
|||
var c Copaing
|
||||
err = gokord.DB.ScanRows(rows, &c)
|
||||
if err != nil {
|
||||
utils.SendAlert("user/xp.go - Scanning rows", err.Error(), "guild_id", guildId)
|
||||
logger.Alert("user/xp.go - Scanning rows", err.Error(), "guild_id", guildId)
|
||||
continue
|
||||
}
|
||||
wg.Add(1)
|
||||
|
|
@ -111,7 +111,7 @@ func GetBestXP(guildId string, n uint, d int) ([]CopaingAccess, error) {
|
|||
defer wg.Done()
|
||||
xp, err := c.GetXPForDays(uint(d))
|
||||
if err != nil {
|
||||
utils.SendAlert("user/xp.go - Fetching xp", err.Error(), "discord_id", c.DiscordID, "guild_id", guildId)
|
||||
logger.Alert("user/xp.go - Fetching xp", err.Error(), "discord_id", c.DiscordID, "guild_id", guildId)
|
||||
return
|
||||
}
|
||||
l = append(l, &cXP{Cxp: xp, Copaing: &c})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue