nick12
/
hmn
forked from hmn/hmn
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed discord linking issue

This commit is contained in:
Asaf Gartner 2021-12-21 08:14:51 +02:00
parent 321089ea8e
commit f8e7779b7d
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/discord/rest.go
View File

@ -13,7 +13,6 @@ import (
"net/textproto" "net/textproto"
"net/url" "net/url"
"strconv" "strconv"
"strings"
"git.handmade.network/hmn/hmn/src/config" "git.handmade.network/hmn/hmn/src/config"
"git.handmade.network/hmn/hmn/src/hmnurl" "git.handmade.network/hmn/hmn/src/hmnurl"
@ -301,16 +300,7 @@ func ExchangeOAuthCode(ctx context.Context, code, redirectURI string) (*OAuthCod
bodyStr := body.Encode() bodyStr := body.Encode()
res, err := doWithRateLimiting(ctx, name, func(ctx context.Context) *http.Request { res, err := doWithRateLimiting(ctx, name, func(ctx context.Context) *http.Request {
req, err := http.NewRequestWithContext( req := makeRequest(ctx, http.MethodPost, "/oauth2/token", []byte(bodyStr))
ctx,
http.MethodPost,
"https://discord.com/api/oauth2/token",
strings.NewReader(bodyStr),
)
if err != nil {
panic(err)
}
req.Header.Add("User-Agent", UserAgent)
req.Header.Add("Content-Type", "application/x-www-form-urlencoded") req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
return req return req
@ -613,7 +603,7 @@ func GetAuthorizeUrl(state string) string {
params.Set("scope", "identify") params.Set("scope", "identify")
params.Set("state", state) params.Set("state", state)
params.Set("redirect_uri", hmnurl.BuildDiscordOAuthCallback()) params.Set("redirect_uri", hmnurl.BuildDiscordOAuthCallback())
return fmt.Sprintf("https://discord.com/api/oauth2/authorize?%s", params.Encode()) return fmt.Sprintf("%s?%s", buildUrl("/oauth2/authorize"), params.Encode())
} }
type FileUpload struct { type FileUpload struct {