Merge pull request #60 from adavila0703/devyrole-bug

Author: adavila0703

internal/devhubbot/commands.go

@@ -14,8 +14,6 @@ import (
 var (
 	channelFromStateF      = channelFromState
 	channelMessageSendF    = channelMessageSend
-	guildFromStateF        = guildFromState
-	memberFromStateF       = memberFromState
 	guildMemberRoleRemoveF = guildMemberRoleRemove
 	guildMemberRoleAddF    = guildMemberRoleAdd
 )
@@ -28,14 +26,6 @@ func channelMessageSend(s *discordgo.Session, channelID, message string) (*disco
 	return s.ChannelMessageSend(channelID, message)
 }
 
-func guildFromState(s *discordgo.State, guildID string) (*discordgo.Guild, error) {
-	return s.Guild(guildID)
-}
-
-func memberFromState(s *discordgo.State, guildID, userID string) (*discordgo.Member, error) {
-	return s.Member(guildID, userID)
-}
-
 func guildMemberRoleAdd(s *discordgo.Session, guildID, userID, roleID string) error {
 	return s.GuildMemberRoleAdd(guildID, userID, roleID)
 }
@@ -233,15 +223,6 @@ func lastUpdatedRepoCommandHandler(session *discordgo.Session, message *discordg
 }
 
 func devyDeveloperCommandHandler(session *discordgo.Session, message *discordgo.MessageCreate, channel *discordgo.Channel, bot *Bot) {
-	guild, err := guildFromStateF(session.State, message.GuildID)
-	if err != nil {
-		infra.Logger.Error().Err(err).Msg("guild from message.GuildID")
-
-		_, _ = channelMessageSendF(session, channel.ID, fmt.Sprintf("something went wrong toggle devy developer role for user %s", message.Author.Username))
-
-		return
-	}
-
 	devyDeveloperRoleID := env.GetString("DISCORD_DEVY_DEVELOPER_ROLE_ID", "")
 	if len(devyDeveloperRoleID) == 0 {
 		infra.Logger.Error().Msg("DISCORD_DEVY_DEVELOPER_ROLE_ID env not set")
@@ -251,25 +232,16 @@ func devyDeveloperCommandHandler(session *discordgo.Session, message *discordgo.
 		return
 	}
 
-	member, err := memberFromStateF(session.State, guild.ID, message.Author.ID)
-	if err != nil {
-		infra.Logger.Error().Err(err).Msg("member from state")
-
-		_, _ = channelMessageSendF(session, channel.ID, fmt.Sprintf("something went wrong toggle devy developer role for user %s", message.Author.Username))
-
-		return
-	}
-
 	currentlyHasRole := false
-	for _, roleID := range member.Roles {
+	for _, roleID := range message.Member.Roles {
 		if roleID == devyDeveloperRoleID {
 			currentlyHasRole = true
 		}
 	}
 
 	var action string
 	if currentlyHasRole {
-		err = guildMemberRoleRemoveF(session, guild.ID, message.Author.ID, devyDeveloperRoleID)
+		err := guildMemberRoleRemoveF(session, message.GuildID, message.Author.ID, devyDeveloperRoleID)
 		if err != nil {
 			infra.Logger.Error().Err(err).Msg("guild member role remove")
 
@@ -280,7 +252,7 @@ func devyDeveloperCommandHandler(session *discordgo.Session, message *discordgo.
 
 		action = "removed"
 	} else {
-		err = guildMemberRoleAddF(session, guild.ID, message.Author.ID, devyDeveloperRoleID)
+		err := guildMemberRoleAddF(session, message.GuildID, message.Author.ID, devyDeveloperRoleID)
 		if err != nil {
 			infra.Logger.Error().Err(err).Msg("guild member role add")