fix moderation active checks & init settings table on guild join/ready & delete settings on delete

Author: topi314

cmd/dbot/main.go

@@ -80,6 +80,7 @@ func main() {
 		listeners.Metrics(b),
 		listeners.Moderation(b),
 		listeners.Music(b),
+		listeners.Settings(b),
 	); err != nil {
 		b.Logger.Fatal("Failed to setup discord dbot: ", err)
 	}

db/guild_settings.go

@@ -10,6 +10,7 @@ import (
 )
 
 type GuildSettingsDB interface {
+	CreateIfNotExist(guildID snowflake.ID) error
 	Get(guildID snowflake.ID) (GuildSetting, error)
 	UpdateModeration(guildID snowflake.ID, webhookID snowflake.ID, webhookToken string) error
 	Delete(guildID snowflake.ID) error
@@ -19,6 +20,14 @@ type guildSettingsDBImpl struct {
 	db *sql.DB
 }
 
+func (s *guildSettingsDBImpl) CreateIfNotExist(guildID snowflake.ID) error {
+	_, err := table.GuildSetting.INSERT(table.GuildSetting.AllColumns).
+		VALUES(String(guildID.String()), String("0"), String("")).
+		ON_CONFLICT(table.GuildSetting.ID).DO_NOTHING().
+		Exec(s.db)
+	return err
+}
+
 func (s *guildSettingsDBImpl) Get(guildID snowflake.ID) (GuildSetting, error) {
 	var model GuildSetting
 	return model, table.GuildSetting.SELECT(table.GuildSetting.AllColumns).WHERE(table.GuildSetting.ID.EQ(String(guildID.String()))).Query(s.db, &model)
@@ -34,5 +43,6 @@ func (s *guildSettingsDBImpl) UpdateModeration(guildID snowflake.ID, webhookID s
 }
 
 func (s *guildSettingsDBImpl) Delete(guildID snowflake.ID) error {
-	return nil
+	_, err := table.GuildSetting.DELETE().WHERE(table.GuildSetting.ID.EQ(String(guildID.String()))).Exec(s.db)
+	return err
 }

dbot/commands/report-user.go

@@ -46,7 +46,7 @@ func reportUserHandler(b *dbot.Bot, p *message.Printer, e *events.ApplicationCom
 			Flags:   discord.MessageFlagEphemeral,
 		})
 	}
-	if settings.ModerationLogWebhookID == "" {
+	if settings.ModerationLogWebhookID == "0" {
 		return e.CreateMessage(discord.MessageCreate{
 			Content: "Moderation is not enabled on this server, please reach to a moderator.",
 			Flags:   discord.MessageFlagEphemeral,

dbot/commands/report.go

@@ -56,7 +56,7 @@ func reportHandler(b *dbot.Bot, p *message.Printer, e *events.ApplicationCommand
 			Flags:   discord.MessageFlagEphemeral,
 		})
 	}
-	if settings.ModerationLogWebhookID == "" {
+	if settings.ModerationLogWebhookID == "0" {
 		return e.CreateMessage(discord.MessageCreate{
 			Content: "Moderation is not enabled on this server, please reach to a moderator.",
 			Flags:   discord.MessageFlagEphemeral,

dbot/commands/settings.go

@@ -74,7 +74,7 @@ func settingsModerationLogChannelHandler(b *dbot.Bot, p *message.Printer, e *eve
 		})
 	}
 
-	if settings.ModerationLogWebhookID == "" || settings.ModerationLogWebhookToken == "" {
+	if settings.ModerationLogWebhookID == "0" || settings.ModerationLogWebhookToken == "" {
 		incomingWebhook, err := b.Client.Rest().CreateWebhook(data.Snowflake("channel"), discord.WebhookCreate{
 			Name: "Automod",
 		})

dbot/listeners/moderation.go

@@ -20,7 +20,7 @@ func Moderation(b *dbot.Bot) bot.EventListener {
 			b.Logger.Errorf("Failed to get guild settings: %s", err)
 			return
 		}
-		if settings.ModerationLogWebhookID == "" {
+		if settings.ModerationLogWebhookID == "0" {
 			return
 		}
 

dbot/listeners/settings.go

@@ -0,0 +1,28 @@
+package listeners
+
+import (
+	"github.com/KittyBot-Org/KittyBotGo/dbot"
+	"github.com/disgoorg/disgo/bot"
+	"github.com/disgoorg/disgo/events"
+)
+
+func Settings(b *dbot.Bot) bot.EventListener {
+	return bot.NewListenerFunc(func(event bot.Event) {
+		switch e := event.(type) {
+		case *events.GuildJoin:
+			if err := b.DB.GuildSettings().CreateIfNotExist(e.Guild.ID); err != nil {
+				b.Logger.Error("Failed to create guild settings: ", err)
+			}
+
+		case *events.GuildLeave:
+			if err := b.DB.GuildSettings().Delete(e.Guild.ID); err != nil {
+				b.Logger.Error("Failed to delete guild settings: ", err)
+			}
+
+		case *events.GuildReady:
+			if err := b.DB.GuildSettings().CreateIfNotExist(e.Guild.ID); err != nil {
+				b.Logger.Error("Failed to create guild settings: ", err)
+			}
+		}
+	})
+}