From ddd6306752186c149f8ad3bf2f59b5428cf01296 Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Sun, 8 Mar 2026 13:38:10 +0100 Subject: feat(db): run migrations --- rolereact/events.go | 18 ++++++++---------- rolereact/manager.go | 14 +++++++------- 2 files changed, 15 insertions(+), 17 deletions(-) (limited to 'rolereact') diff --git a/rolereact/events.go b/rolereact/events.go index ac5ad60..c341df7 100644 --- a/rolereact/events.go +++ b/rolereact/events.go @@ -3,8 +3,6 @@ package rolereact import ( "context" - "git.anhgelus.world/anhgelus/les-copaings-bot/common" - "git.anhgelus.world/anhgelus/les-copaings-bot/config" "github.com/nyttikord/gokord/bot" "github.com/nyttikord/gokord/event" "github.com/nyttikord/gokord/guild" @@ -16,10 +14,10 @@ type RoleReact struct { func HandleReactionAdd(ctx context.Context, dg bot.Session, e *event.MessageReactionAdd) { results := []RoleReact{} - common.GetDB(ctx).Model(&config.RoleReact{}). - Joins("JOIN role_react_messages ON role_reacts.role_react_message_id = role_react_messages.id"). - Where("role_react_messages.message_id = ? AND role_reacts.reaction = ?", e.MessageID, e.MessageReaction.Emoji.APIName()). - Scan(&results) + /*common.GetDB(ctx).Model(&config.RoleReact{}). + Joins("JOIN role_react_messages ON role_reacts.role_react_message_id = role_react_messages.id"). + Where("role_react_messages.message_id = ? AND role_reacts.reaction = ?", e.MessageID, e.MessageReaction.Emoji.APIName()). + Scan(&results)*/ for _, role := range results { err := guild.AddMemberRole(e.GuildID, e.UserID, role.RoleID).Do(ctx) if err != nil { @@ -30,10 +28,10 @@ func HandleReactionAdd(ctx context.Context, dg bot.Session, e *event.MessageReac func HandleReactionRemove(ctx context.Context, dg bot.Session, e *event.MessageReactionRemove) { results := []RoleReact{} - common.GetDB(ctx).Model(&config.RoleReact{}). - Joins("JOIN role_react_messages ON role_reacts.role_react_message_id = role_react_messages.id"). - Where("role_react_messages.message_id = ? AND role_reacts.reaction = ?", e.MessageID, e.MessageReaction.Emoji.APIName()). - Scan(&results) + /*common.GetDB(ctx).Model(&config.RoleReact{}). + Joins("JOIN role_react_messages ON role_reacts.role_react_message_id = role_react_messages.id"). + Where("role_react_messages.message_id = ? AND role_reacts.reaction = ?", e.MessageID, e.MessageReaction.Emoji.APIName()). + Scan(&results)*/ for _, role := range results { err := guild.RemoveMemberRole(e.GuildID, e.UserID, role.RoleID).Do(ctx) if err != nil { diff --git a/rolereact/manager.go b/rolereact/manager.go index 91e1bcd..6455b97 100644 --- a/rolereact/manager.go +++ b/rolereact/manager.go @@ -7,7 +7,6 @@ import ( "strings" "time" - "git.anhgelus.world/anhgelus/les-copaings-bot/common" "git.anhgelus.world/anhgelus/les-copaings-bot/config" "github.com/nyttikord/gokord/bot" "github.com/nyttikord/gokord/channel" @@ -64,11 +63,11 @@ func ApplyMessageChange(ctx context.Context, dg bot.Session, i *interaction.Inte for _, role := range message.Roles { roles[role.ID] = *role } - db := common.GetDB(ctx) + //db := common.GetDB(ctx) for _, role := range oldMessage.Roles { _, ok := roles[role.ID] if !ok { - err := db.Delete(role).Error + err = nil //db.Delete(role).Error if err != nil { bot.Logger(ctx).Error("unable to delete reaction role from database", "error", err) return "Impossible de sauvegarder le message de rôle. Merci de contacter l'administrateur du bot." @@ -76,13 +75,14 @@ func ApplyMessageChange(ctx context.Context, dg bot.Session, i *interaction.Inte } } cfg.RrMessages[messageIndex] = *message - err = db.Save(cfg.RrMessages[messageIndex]).Error + err = nil //db.Save(cfg.RrMessages[messageIndex]).Error if err != nil { bot.Logger(ctx).Error("unable to save rolereaction message in database", "error", err) return "Impossible de sauvegarder le message de rôle. Merci de contacter l'administrateur du bot." } for _, role := range cfg.RrMessages[messageIndex].Roles { - err = db.Save(role).Error + println(role.ID) + err = nil //db.Save(role).Error if err != nil { bot.Logger(ctx).Error("unable to save rolereaction role in database", "error", err) return "Impossible de sauvegarder le message de rôle. Merci de contacter l'administrateur du bot." @@ -125,10 +125,10 @@ func GetMessageFromEditID(ctx context.Context, i *interaction.Interaction, editI func GetGuildConfigPreloaded(ctx context.Context, guildID uint64) *config.Guild { cfg := config.Guild{GuildID: guildID} // err := oldGokord.DB.Where("guild_id = ?", cfg.GuildID).Preload("XpRoles").Preload("RrMessages.Roles").FirstOrCreate(cfg).Error - err := common.GetDB(ctx).Where("guild_id = ?", cfg.GuildID).Preload("RrMessages.Roles").FirstOrCreate(&cfg).Error + /*err := common.GetDB(ctx).Where("guild_id = ?", cfg.GuildID).Preload("RrMessages.Roles").FirstOrCreate(&cfg).Error if err != nil { panic(err) - } + }*/ return &cfg } -- cgit v1.2.3