diff options
Diffstat (limited to 'user')
| -rw-r--r-- | user/level.go | 5 | ||||
| -rw-r--r-- | user/member.go | 15 | ||||
| -rw-r--r-- | user/state.go | 8 |
3 files changed, 13 insertions, 15 deletions
diff --git a/user/level.go b/user/level.go index 98b9329..012f253 100644 --- a/user/level.go +++ b/user/level.go @@ -6,7 +6,6 @@ import ( "sync" "time" - "git.anhgelus.world/anhgelus/les-copaings-bot/common" "git.anhgelus.world/anhgelus/les-copaings-bot/config" "git.anhgelus.world/anhgelus/les-copaings-bot/exp" "github.com/nyttikord/gokord/bot" @@ -60,7 +59,7 @@ func PeriodicReducer(ctx context.Context, dg bot.Session) { n := 0 var wg sync.WaitGroup for _, g := range dg.GuildState().ListGuilds() { - cfg := config.GetGuildConfig(ctx, g) + /*cfg := config.GetGuildConfig(ctx, g) res := common.GetDB(ctx). Model(&CopaingXP{}). Where("guild_id = ? and created_at < ?", g, exp.TimeStampNDaysBefore(ctx, cfg.DaysXPRemains)). @@ -70,7 +69,7 @@ func PeriodicReducer(ctx context.Context, dg bot.Session) { continue } n++ - log.Debug("guild cleaned", "guild", g, "rows affected", res.RowsAffected) + log.Debug("guild cleaned", "guild", g, "rows affected", res.RowsAffected)*/ wg.Go(func() { syncCopaings(ctx, dg, state.Copaings(g)) diff --git a/user/member.go b/user/member.go index db39911..e22e00c 100644 --- a/user/member.go +++ b/user/member.go @@ -3,8 +3,6 @@ package user import ( "context" "time" - - "git.anhgelus.world/anhgelus/les-copaings-bot/common" ) type Copaing struct { @@ -41,7 +39,8 @@ func GetCopaing(ctx context.Context, discordID, guildID uint64) *CopaingCached { } func (c *Copaing) load(ctx context.Context) error { - err := common.GetDB(ctx). + return nil + /*err := common.GetDB(ctx). Where("discord_id = ? and guild_id = ?", c.DiscordID, c.GuildID). Preload("CopaingXPs"). FirstOrCreate(c). @@ -49,21 +48,21 @@ func (c *Copaing) load(ctx context.Context) error { if err != nil { return err } - return err + return err*/ } func (c *Copaing) Save(ctx context.Context) error { - return common.GetDB(ctx).Save(c).Error + return nil //common.GetDB(ctx).Save(c).Error } func (c *Copaing) Delete(ctx context.Context) error { - db := common.GetDB(ctx) + /*db := common.GetDB(ctx) err := db. Where("copaing_id = ? and guild_id = ?", c.ID, c.GuildID). Delete(&CopaingXP{}). Error if err != nil { return err - } - return db.Where("guild_id = ? AND discord_id = ?", c.GuildID, c.DiscordID).Delete(c).Error + }*/ + return nil // db.Where("guild_id = ? AND discord_id = ?", c.GuildID, c.DiscordID).Delete(c).Error } diff --git a/user/state.go b/user/state.go index 9f1c90e..f2bfa5c 100644 --- a/user/state.go +++ b/user/state.go @@ -2,6 +2,7 @@ package user import ( "context" + "database/sql" "errors" "fmt" "math" @@ -11,7 +12,6 @@ import ( "git.anhgelus.world/anhgelus/les-copaings-bot/common" "github.com/nyttikord/avl" "github.com/nyttikord/gokord/state" - "gorm.io/gorm" ) var ErrSyncingUnsavedData = errors.New("trying to sync unsaved data") @@ -141,15 +141,15 @@ type State struct { storage *state.AVLStorage[string, CopaingCached] } -func NewState(db *gorm.DB) *State { +func NewState(db *sql.DB) *State { state := &State{ storage: state.WrapAVLAsStorage(avl.NewKeyString[CopaingCached]()), } var cs []*Copaing - err := db.Find(&cs).Error + /*err := db.Find(&cs).Error if err != nil { panic(err) - } + }*/ for _, v := range cs { FromCopaing(v).Save(SetState(context.Background(), state)) } |