fix: (database) indexes

tyzbit · May 3, 2023 · e26a117 · e26a117
1 parent ebe18b2
commit e26a117
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ Otherwise, it will save stats to a local sqlite database at `/var/go-discord-arc
 | Variable          | Value(s)                                                                               |
 | :---------------- | :------------------------------------------------------------------------------------- |
 | ADMINISTRATOR_IDS | Comma separated IDs of users allowed to use administrator commands                     |
-| DB_DATABASE       | Database name for database                                                             |
+| DB_NAME           | Database name for database                                                             |
 | DB_HOST           | Hostname for database                                                                  |
 | DB_PASSWORD       | Password for database user                                                             |
 | DB_USER           | Username for database user                                                             |

diff --git a/bot/events.go b/bot/events.go
@@ -10,7 +10,7 @@ import (
 // requires our attention
 type MessageEvent struct {
 	CreatedAt          time.Time
-	UUID               string `gorm:"primaryKey,uniqueIndex"`
+	UUID               string `gorm:"primaryKey" gorm:"uniqueIndex"`
 	AuthorId           string `gorm:"index"`
 	AuthorUsername     string
 	MessageId          string
@@ -23,7 +23,7 @@ type MessageEvent struct {
 // A InteractionEvent when a user interacts with an Embed
 type InteractionEvent struct {
 	CreatedAt          time.Time
-	UUID               string `gorm:"primaryKey,uniqueIndex"`
+	UUID               string `gorm:"primaryKey" gorm:"uniqueIndex"`
 	UserID             string `gorm:"index"`
 	Username           string
 	InteractionId      string
@@ -36,7 +36,7 @@ type InteractionEvent struct {
 // Every successful ArchiveEventEvent will come from a message
 type ArchiveEventEvent struct {
 	CreatedAt      time.Time
-	UUID           string `gorm:"primaryKey,uniqueIndex"`
+	UUID           string `gorm:"primaryKey;uniqueIndex"`
 	AuthorId       string
 	AuthorUsername string
 	ChannelId      string
@@ -50,13 +50,13 @@ type ArchiveEventEvent struct {
 // the Archiver API
 type ArchiveEvent struct {
 	CreatedAt             time.Time
-	UUID                  string `gorm:"primaryKey,uniqueIndex"`
+	UUID                  string `gorm:"primaryKey;uniqueIndex"`
 	ArchiveEventEventUUID string
 	ServerID              string `gorm:"index"`
 	ServerName            string
-	RequestURL            string `gorm:"index"`
+	RequestURL            string
 	RequestDomainName     string `gorm:"index"`
-	ResponseURL           string `gorm:"index"`
+	ResponseURL           string
 	ResponseDomainName    string `gorm:"index"`
 	Cached                bool
 }

diff --git a/bot/servers.go b/bot/servers.go
@@ -10,7 +10,7 @@ import (
 )
 
 type ServerRegistration struct {
-	DiscordId string `gorm:"primaryKey,uniqueIndex"`
+	DiscordId string `gorm:"primaryKey;uniqueIndex"`
 	Name      string
 	UpdatedAt time.Time
 	JoinedAt  time.Time
@@ -19,7 +19,7 @@ type ServerRegistration struct {
 }
 
 type ServerConfig struct {
-	DiscordId          string         `gorm:"primaryKey,uniqueIndex" pretty:"Server ID"`
+	DiscordId          string         `gorm:"primaryKey;uniqueIndex" pretty:"Server ID"`
 	Name               string         `pretty:"Server Name" gorm:"default:default"`
 	ArchiveEnabled     sql.NullBool   `pretty:"Bot enabled" gorm:"default:true"`
 	AlwaysArchiveFirst sql.NullBool   `pretty:"Archive the page first (slower)" gorm:"default:false"`
@@ -83,7 +83,7 @@ func (bot *ArchiverBot) registerOrUpdateServer(g *discordgo.Guild, delete bool)
 // updates the DB as to whether or not it's active
 func (bot *ArchiverBot) updateInactiveRegistrations(activeGuilds []*discordgo.Guild) {
 	var sr []ServerRegistration
-	bot.DB.Find(&sr)
+	bot.DB.Model([]ServerRegistration{}).Find(&sr)
 
 	// Check all registrations for whether or not the server is active
 	for _, reg := range sr {