mirror/rogueserver
1
0
Fork 0
mirror of https://github.com/pagefaultgames/rogueserver.git synced 2025-04-02 02:57:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: Update variable name for Discord guild ID in account package

Browse Source
This commit is contained in:
Frederico Santos 2024-09-01 03:30:46 +01:00
parent f609ec5ee8
commit 715fe93440
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/account/discord.go
View File

@ -32,7 +32,7 @@ var (
DiscordCallbackURL string DiscordCallbackURL string
DiscordSession *discordgo.Session DiscordSession *discordgo.Session
DiscordGuildId string DiscordGuildID string
) )
func HandleDiscordCallback(w http.ResponseWriter, r *http.Request) (string, error) { func HandleDiscordCallback(w http.ResponseWriter, r *http.Request) (string, error) {
@ -111,15 +111,15 @@ func RetrieveDiscordId(code string) (string, error) {
return user.Id, nil 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 // fetch all roles from discord
roles, err := DiscordSession.GuildRoles(discordGuildId) roles, err := DiscordSession.GuildRoles(discordGuildID)
if err != nil { if err != nil {
return false, err return false, err
} }
// fetch all roles from user // fetch all roles from user
userRoles, err := DiscordSession.GuildMember(discordGuildId, discordId) userRoles, err := DiscordSession.GuildMember(discordGuildID, discordId)
if err != nil { if err != nil {
return false, err return false, err
} }

4
api/endpoints.go
View File

@ -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) response, err := account.Info(username, discordId, googleId, uuid, hasAdminRole)
if err != nil { if err != nil {
@ -683,7 +683,7 @@ func handleAdminDiscordLink(w http.ResponseWriter, r *http.Request) {
return return
} }
hasRole, err := account.IsUserDiscordAdmin(userDiscordId, account.DiscordGuildId) hasRole, err := account.IsUserDiscordAdmin(userDiscordId, account.DiscordGuildID)
if !hasRole || err != nil { if !hasRole || err != nil {
httpError(w, r, fmt.Errorf("user does not have the required role"), http.StatusForbidden) httpError(w, r, fmt.Errorf("user does not have the required role"), http.StatusForbidden)

2
rogueserver.go
View File

@ -71,7 +71,7 @@ func main() {
account.GoogleClientSecret = *googlesecretid account.GoogleClientSecret = *googlesecretid
account.GoogleCallbackURL = *callbackurl + "/auth/google/callback" account.GoogleCallbackURL = *callbackurl + "/auth/google/callback"
account.DiscordSession, _ = discordgo.New("Bot " + *discordbottoken) account.DiscordSession, _ = discordgo.New("Bot " + *discordbottoken)
account.DiscordGuildId = *discordguildid account.DiscordGuildID = *discordguildid
// register gob types // register gob types
gob.Register([]interface{}{}) gob.Register([]interface{}{})
gob.Register(map[string]interface{}{}) gob.Register(map[string]interface{}{})