Fix greeting bots

chilipizdrick · Apr 5, 2024 · bacadb9 · bacadb9
1 parent 37dceb0
commit bacadb9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/commands/switch_dm_on_mention.go b/commands/switch_dm_on_mention.go
@@ -10,7 +10,7 @@ import (
 var SwitchDMOnMentionCommand = utl.SlashCommand{
 	CommandData: &discord.ApplicationCommand{
 		Name:        "switch-dm-on-mention",
-		Description: "Switch DM on mention functionality on this server.",
+		Description: "[NOT CURRNETLY WORKING] Switch DM on mention functionality on this server.",
 	},
 	CommandHandler: func(s *discord.Session, i *discord.InteractionCreate) {
 		guildData, err := utl.LoadGuildFromDBByID(i.GuildID)

diff --git a/events/voice_state_update.go b/events/voice_state_update.go
@@ -53,6 +53,11 @@ func greetingHandler(s *discord.Session, e *discord.VoiceStateUpdate) error {
 		return nil
 	}
 
+	// Return if user is a bot
+	if e.Member.User.Bot {
+		return nil
+	}
+
 	sqliteDatabaseFilepath := os.Getenv("SQLITE_DATABASE_FILEPATH")
 	if sqliteDatabaseFilepath == "" {
 		sqliteDatabaseFilepath = "./userdata/userdata.sqlite3.db"

diff --git a/utils/database.go b/utils/database.go
@@ -13,25 +13,13 @@ import (
 type User struct {
 	ID                       uint
 	DiscordUserID            string
+	DiscordGuildID           string
 	GreetingEnabled          bool
 	GreetingUnixTimestamp    int64
 	BirthdayDate             string // In MM/DD format
 	LastBirthdayGreetingYear int
 }
 
-// type BirthdayUser struct {
-// 	ID               uint
-// 	DiscordUserId    string
-// 	BirthdayDate     string // In MM/DD format
-// 	LastGreetingYear int
-// }
-
-// type GreetedUser struct {
-// 	ID                    uint
-// 	DiscordUserId         string
-// 	GreetingUnixTimestamp int64
-// }
-
 type Guild struct {
 	ID             uint
 	DiscordGuildID string