Mocks out PSQL integration, removes old code

Author: denverquane

discord/commands.go

@@ -769,16 +769,6 @@ func (bot *Bot) HandleCommand(isAdmin, isPermissioned bool, sett *storage.GuildS
 
 		case ShowMe:
 			if m.Author != nil {
-				if settUser := bot.StorageInterface.GetUserSettings(m.Author.ID); settUser != nil {
-					embed := settUser.ToEmbed(sett)
-					sendMessageDM(s, m.Author.ID, embed)
-				} else {
-					s.ChannelMessageSend(m.ChannelID, sett.LocalizeMessage(&i18n.Message{
-						ID:    "commands.HandleCommand.ShowMe.emptySettings",
-						Other: "I don't have any settings stored for you!",
-					}))
-				}
-
 				cached := bot.RedisInterface.GetUsernameOrUserIDMappings(m.GuildID, m.Author.ID)
 				if len(cached) == 0 {
 					s.ChannelMessageSend(m.ChannelID, sett.LocalizeMessage(&i18n.Message{
@@ -801,22 +791,17 @@ func (bot *Bot) HandleCommand(isAdmin, isPermissioned bool, sett *storage.GuildS
 			break
 		case ForgetMe:
 			if m.Author != nil {
-				err := bot.StorageInterface.DeleteUserSettings(m.Author.ID)
+				err := bot.RedisInterface.DeleteLinksByUserID(m.GuildID, m.Author.ID)
 				if err != nil {
 					log.Println(err)
 				} else {
-					err := bot.RedisInterface.DeleteLinksByUserID(m.GuildID, m.Author.ID)
-					if err != nil {
-						log.Println(err)
-					} else {
-						s.ChannelMessageSend(m.ChannelID, sett.LocalizeMessage(&i18n.Message{
-							ID:    "commands.HandleCommand.ForgetMe.Success",
-							Other: "Successfully deleted all player data for <@{{.AuthorID}}>",
-						},
-							map[string]interface{}{
-								"AuthorID": m.Author.ID,
-							}))
-					}
+					s.ChannelMessageSend(m.ChannelID, sett.LocalizeMessage(&i18n.Message{
+						ID:    "commands.HandleCommand.ForgetMe.Success",
+						Other: "Successfully deleted all player data for <@{{.AuthorID}}>",
+					},
+						map[string]interface{}{
+							"AuthorID": m.Author.ID,
+						}))
 				}
 			}
 			break

go.mod

@@ -12,6 +12,7 @@ require (
 	github.com/go-redis/redis/v8 v8.3.3
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/jackc/pgx/v4 v4.9.2
 	github.com/joho/godotenv v1.3.0
 	github.com/nicksnyder/go-i18n/v2 v2.1.1
 	golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 // indirect

go.sum

@@ -63,7 +63,6 @@
 "commands.HandleCommand.Help.notFound" = "I didn't recognize that command! View `help` for all available commands!"
 "commands.HandleCommand.ShowMe.cachedNames" = "Here's your cached in-game names:"
 "commands.HandleCommand.ShowMe.emptyCachedNames" = "I don't have any cached player names stored for you!"
-"commands.HandleCommand.ShowMe.emptySettings" = "I don't have any settings stored for you!"
 "commands.HandleCommand.default" = "Sorry, I didn't understand that command! Please see `{{.CommandPrefix}} help` for commands"
 "discordGameState.ToDescString.anyVoiceChannel" = "**no Voice Channel! Use `.au track`!**"
 "discordGameState.ToDescString.voiceChannelName" = "the **{{.channelName}}** voice channel!"
@@ -183,7 +182,4 @@
 "state.phase.DISCUSSION" = "DISCUSSION"
 "state.phase.LOBBY" = "LOBBY"
 "state.phase.MENU" = "MENU"
-"state.phase.TASKS" = "TASKS"
-"userSettings.ToEmbed.Description" = "Here's all the settings I have for you"
-"userSettings.ToEmbed.FielnName" = "Settings"
-"userSettings.ToEmbed.Title" = "Your Settings"
+"state.phase.TASKS" = "TASKS"

locales/active.en.toml

@@ -0,0 +1,35 @@
+package storage
+
+import (
+	"context"
+	"github.com/jackc/pgx/v4/pgxpool"
+)
+
+type PsqlInterface struct {
+	pool *pgxpool.Pool
+
+	//TODO does this require a lock? How should stuff be written/read from psql in an async way? Is this even a concern?
+	//https://brandur.org/postgres-connections
+}
+
+type PsqlParameters struct {
+	Addr     string
+	Username string
+	Password string
+}
+
+var psqlctx = context.Background()
+
+func (psqlInterface *PsqlInterface) Init(params interface{}) error {
+	newParams := params.(PsqlParameters)
+	dbpool, err := pgxpool.Connect(context.Background(), newParams.Addr)
+	if err != nil {
+		return err
+	}
+	psqlInterface.pool = dbpool
+	return nil
+}
+
+func (psqlInterface *PsqlInterface) Close() {
+	psqlInterface.pool.Close()
+}

storage/guildStats.go

@@ -31,55 +31,10 @@ func (storageInterface *StorageInterface) Init(params interface{}) error {
 	return nil
 }
 
-func userSettingsKey(id HashedID) string {
-	return "automuteus:settings:user:" + string(id)
-}
-
 func guildSettingsKey(id HashedID) string {
 	return "automuteus:settings:guild:" + string(id)
 }
 
-func userStatsKey(id HashedID) string {
-	return "automuteus:stats:user:" + string(id)
-}
-
-func (storageInterface *StorageInterface) GetUserSettings(userID string) *UserSettings {
-	key := userSettingsKey(HashUserID(userID))
-
-	j, err := storageInterface.client.Get(ctx, key).Result()
-	if err == redis.Nil {
-		return nil
-	} else if err != nil {
-		log.Println(err)
-		return nil
-	} else {
-		s := UserSettings{}
-		err := json.Unmarshal([]byte(j), &s)
-		if err != nil {
-			log.Println(err)
-			return nil
-		}
-		return &s
-	}
-}
-
-func (storageInterface *StorageInterface) SetUserSettings(userID string, userSettings *UserSettings) error {
-	key := userSettingsKey(HashUserID(userID))
-
-	jbytes, err := json.MarshalIndent(userSettings, "", "  ")
-	if err != nil {
-		return err
-	}
-	err = storageInterface.client.Set(ctx, key, jbytes, 0).Err()
-	return err
-}
-
-func (storageInterface *StorageInterface) DeleteUserSettings(userID string) error {
-	key := userSettingsKey(HashUserID(userID))
-
-	return storageInterface.client.Del(ctx, key).Err()
-}
-
 func (storageInterface *StorageInterface) GetGuildSettings(guildID string) *GuildSettings {
 	key := guildSettingsKey(HashGuildID(guildID))