From 715fe9344039ea82b02fe277c84aeb483c366d41 Mon Sep 17 00:00:00 2001 From: Frederico Santos Date: Sun, 1 Sep 2024 03:30:46 +0100 Subject: [PATCH] chore: Update variable name for Discord guild ID in account package --- api/account/discord.go | 8 ++++---- api/endpoints.go | 4 ++-- rogueserver.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/account/discord.go b/api/account/discord.go index 29affb3..9e4ce8c 100644 --- a/api/account/discord.go +++ b/api/account/discord.go @@ -32,7 +32,7 @@ var ( DiscordCallbackURL string DiscordSession *discordgo.Session - DiscordGuildId string + DiscordGuildID string ) func HandleDiscordCallback(w http.ResponseWriter, r *http.Request) (string, error) { @@ -111,15 +111,15 @@ func RetrieveDiscordId(code string) (string, error) { return user.Id, nil } -func IsUserDiscordAdmin(discordId string, discordGuildId string) (bool, error) { +func IsUserDiscordAdmin(discordId string, discordGuildID string) (bool, error) { // fetch all roles from discord - roles, err := DiscordSession.GuildRoles(discordGuildId) + roles, err := DiscordSession.GuildRoles(discordGuildID) if err != nil { return false, err } // fetch all roles from user - userRoles, err := DiscordSession.GuildMember(discordGuildId, discordId) + userRoles, err := DiscordSession.GuildMember(discordGuildID, discordId) if err != nil { return false, err } diff --git a/api/endpoints.go b/api/endpoints.go index 0e7cb3a..3009041 100644 --- a/api/endpoints.go +++ b/api/endpoints.go @@ -69,7 +69,7 @@ func handleAccountInfo(w http.ResponseWriter, r *http.Request) { } } - hasAdminRole, _ := account.IsUserDiscordAdmin(discordId, account.DiscordGuildId) + hasAdminRole, _ := account.IsUserDiscordAdmin(discordId, account.DiscordGuildID) response, err := account.Info(username, discordId, googleId, uuid, hasAdminRole) if err != nil { @@ -683,7 +683,7 @@ func handleAdminDiscordLink(w http.ResponseWriter, r *http.Request) { return } - hasRole, err := account.IsUserDiscordAdmin(userDiscordId, account.DiscordGuildId) + hasRole, err := account.IsUserDiscordAdmin(userDiscordId, account.DiscordGuildID) if !hasRole || err != nil { httpError(w, r, fmt.Errorf("user does not have the required role"), http.StatusForbidden) diff --git a/rogueserver.go b/rogueserver.go index c64aea9..c02df26 100644 --- a/rogueserver.go +++ b/rogueserver.go @@ -71,7 +71,7 @@ func main() { account.GoogleClientSecret = *googlesecretid account.GoogleCallbackURL = *callbackurl + "/auth/google/callback" account.DiscordSession, _ = discordgo.New("Bot " + *discordbottoken) - account.DiscordGuildId = *discordguildid + account.DiscordGuildID = *discordguildid // register gob types gob.Register([]interface{}{}) gob.Register(map[string]interface{}{})