Skip to content

Fixed devy role issue #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adavila0703 merged 2 commits into from
Dec 12, 2021
Merged

Fixed devy role issue #60

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddca3a6
fixed devy role issue
adavila0703 Dec 12, 2021
540d896
cleanup
adavila0703 Dec 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 3 additions & 31 deletions internal/devhubbot/commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ import (
var (
channelFromStateF = channelFromState
channelMessageSendF = channelMessageSend
guildFromStateF = guildFromState
memberFromStateF = memberFromState
guildMemberRoleRemoveF = guildMemberRoleRemove
guildMemberRoleAddF = guildMemberRoleAdd
)
Expand All @@ -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)
}
Expand Down Expand Up @@ -177,15 +167,6 @@ func contributionsTotalCommandHandler(session *discordgo.Session, message *disco
}

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")
Expand All @@ -195,25 +176,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 {
Comment thread
adavila0703 marked this conversation as resolved.
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")

Expand All @@ -224,7 +196,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")

Expand Down