fix: 🐛 fix bug with guild letters

vidhanio · Jan 31, 2022 · b24eed5 · b24eed5
1 parent 39e596d
commit b24eed5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/command.go b/command.go
@@ -72,7 +72,7 @@ func (wb *WordleBot) handleWordle(s *discordgo.Session, i *discordgo.Interaction
 }
 
 func (wb *WordleBot) handleWordleStart(s *discordgo.Session, i *discordgo.InteractionCreate) {
-	_, ok := wb.getWordleGame(i)
+	_, ok := wb.wordleGame(i)
 	if ok {
 		warningRespond(s, i, "A wordle is already in progress. Use `/cancel` to cancel it.")
 
@@ -106,7 +106,7 @@ func (wb *WordleBot) handleWordleStart(s *discordgo.Session, i *discordgo.Intera
 }
 
 func (wb *WordleBot) handleWordleGuess(s *discordgo.Session, i *discordgo.InteractionCreate) {
-	wg, ok := wb.getWordleGame(i)
+	wg, ok := wb.wordleGame(i)
 	if !ok {
 		warningRespond(s, i, "No wordle in progress. Use `/start` to start a new game.")
 
@@ -142,7 +142,7 @@ func (wb *WordleBot) handleWordleGuess(s *discordgo.Session, i *discordgo.Intera
 }
 
 func (wb *WordleBot) handleWordleCancel(s *discordgo.Session, i *discordgo.InteractionCreate) {
-	wg, ok := wb.getWordleGame(i)
+	wg, ok := wb.wordleGame(i)
 	if !ok {
 		warningRespond(s, i, "No wordle in progress. Use `/start` to start a new game.")
 
@@ -166,7 +166,7 @@ func (wb *WordleBot) handleWordleCancel(s *discordgo.Session, i *discordgo.Inter
 }
 
 func (wb *WordleBot) handleWordleShow(s *discordgo.Session, i *discordgo.InteractionCreate) {
-	wg, ok := wb.getWordleGame(i)
+	wg, ok := wb.wordleGame(i)
 	if !ok {
 		warningRespond(s, i, "No wordle in progress. Use `/start` to start a new game.")
 
@@ -194,7 +194,7 @@ func (wb *WordleBot) handleWordleShow(s *discordgo.Session, i *discordgo.Interac
 }
 
 func (wb *WordleBot) handleWordleLetters(s *discordgo.Session, i *discordgo.InteractionCreate) {
-	wg, ok := wb.getWordleGame(i)
+	wg, ok := wb.wordleGame(i)
 	if !ok {
 		warningRespond(s, i, "No wordle in progress. Use `/start` to start a new game.")
 

diff --git a/command_guild.go b/command_guild.go
@@ -88,7 +88,7 @@ func (wb *WordleBot) handleGuildWordle(s *discordgo.Session, i *discordgo.Intera
 }
 
 func (wb *WordleBot) handleGuildWordleStart(s *discordgo.Session, i *discordgo.InteractionCreate) {
-	_, ok := wb.getGuildWordleGame(i)
+	_, ok := wb.guildWordleGame(i)
 	if ok {
 		warningRespond(s, i, "A guild wordle is already in progress. Use `/guild cancel` to vote to cancel it.")
 
@@ -124,7 +124,7 @@ func (wb *WordleBot) handleGuildWordleStart(s *discordgo.Session, i *discordgo.I
 }
 
 func (wb *WordleBot) handleGuildWordleGuess(s *discordgo.Session, i *discordgo.InteractionCreate) {
-	wg, ok := wb.getGuildWordleGame(i)
+	wg, ok := wb.guildWordleGame(i)
 	if !ok {
 		warningRespond(s, i, "No guild wordle in progress. Use `/guild start` to start a new game.")
 
@@ -160,7 +160,7 @@ func (wb *WordleBot) handleGuildWordleGuess(s *discordgo.Session, i *discordgo.I
 }
 
 func (wb *WordleBot) handleGuildWordleCancel(s *discordgo.Session, i *discordgo.InteractionCreate) {
-	wg, ok := wb.getGuildWordleGame(i)
+	wg, ok := wb.guildWordleGame(i)
 	if !ok {
 		warningRespond(s, i, "No guild wordle in progress. Use `/guild start` to start a new game.")
 
@@ -191,7 +191,7 @@ func (wb *WordleBot) handleGuildWordleCancel(s *discordgo.Session, i *discordgo.
 }
 
 func (wb *WordleBot) handleGuildWordleShow(s *discordgo.Session, i *discordgo.InteractionCreate) {
-	wg, ok := wb.getGuildWordleGame(i)
+	wg, ok := wb.guildWordleGame(i)
 	if !ok {
 		warningRespond(s, i, "No wordle in progress. Use `/guild start` to start a new game.")
 
@@ -221,7 +221,7 @@ func (wb *WordleBot) handleGuildWordleShow(s *discordgo.Session, i *discordgo.In
 }
 
 func (wb *WordleBot) handleGuildWordleVotes(s *discordgo.Session, i *discordgo.InteractionCreate) {
-	wg, ok := wb.getGuildWordleGame(i)
+	wg, ok := wb.guildWordleGame(i)
 	if !ok {
 		warningRespond(s, i, "No guild wordle in progress. Use `/guild start` to start a new game.")
 
@@ -232,7 +232,7 @@ func (wb *WordleBot) handleGuildWordleVotes(s *discordgo.Session, i *discordgo.I
 }
 
 func (wb *WordleBot) handleGuildWordleLetters(s *discordgo.Session, i *discordgo.InteractionCreate) {
-	wg, ok := wb.getWordleGame(i)
+	wg, ok := wb.guildWordleGame(i)
 	if !ok {
 		warningRespond(s, i, "No wordle in progress. Use `/start` to start a new game.")
 

diff --git a/game.go b/game.go
@@ -18,7 +18,7 @@ type wordleGame struct {
 	emptyEmoji *discordgo.Emoji
 }
 
-func (wb *WordleBot) getWordleGame(i *discordgo.InteractionCreate) (*wordleGame, bool) {
+func (wb *WordleBot) wordleGame(i *discordgo.InteractionCreate) (*wordleGame, bool) {
 	g, ok := wb.wordles[i.GuildID]
 	if !ok {
 		g = make(map[string]*wordleGame)
@@ -31,7 +31,7 @@ func (wb *WordleBot) getWordleGame(i *discordgo.InteractionCreate) (*wordleGame,
 }
 
 func (wb *WordleBot) newWordleGame(i *discordgo.InteractionCreate, wordLength int) (*wordleGame, error) {
-	wg, ok := wb.getWordleGame(i)
+	wg, ok := wb.wordleGame(i)
 	if ok {
 		return wg, nil
 	}

diff --git a/game_guild.go b/game_guild.go
@@ -22,14 +22,14 @@ type guildWordleGame struct {
 	cancelVotes map[string]bool
 }
 
-func (wb *WordleBot) getGuildWordleGame(i *discordgo.InteractionCreate) (*guildWordleGame, bool) {
+func (wb *WordleBot) guildWordleGame(i *discordgo.InteractionCreate) (*guildWordleGame, bool) {
 	wg, ok := wb.guildWordles[i.GuildID]
 
 	return wg, ok
 }
 
 func (wb *WordleBot) newGuildWordleGame(i *discordgo.InteractionCreate, wordLength int) (*guildWordleGame, error) {
-	wg, ok := wb.getGuildWordleGame(i)
+	wg, ok := wb.guildWordleGame(i)
 	if ok {
 		return wg, nil
 	}