pothtonswer/discordmuffin
1
0
Fork 1
Code Issues 2 Pull requests 1 Projects 2 Releases Packages Wiki Activity Actions

Renamed Close to Logout. Removed unneeded sprintf calls.

Browse source
This commit is contained in:
Bruce Marriner 2015-11-03 09:28:15 -06:00
parent 302f4976a9
commit ec6f07259d
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
client.go
View file

@ -102,9 +102,8 @@ func Request(session *Session, urlStr string) (body []byte, err error) {
// user : A user Id or name // user : A user Id or name
func Users(session *Session, userId string) (user User, err error) { func Users(session *Session, userId string) (user User, err error) {
body, err := Request(session, fmt.Sprintf("%s/%s", discordApi, "users/%s", userId)) body, err := Request(session, fmt.Sprintf("%s/users/%s", discordApi, userId))
err = json.Unmarshal(body, &user) err = json.Unmarshal(body, &user)
return return
} }
@ -121,7 +120,7 @@ func PrivateChannels(session *Session, userId string) (channels []Channel, err e
// Servers returns an array of Server structures for all servers for a user // Servers returns an array of Server structures for all servers for a user
func Servers(session *Session, userId string) (servers []Server, err error) { func Servers(session *Session, userId string) (servers []Server, err error) {
body, err := Request(session, fmt.Sprintf("%s/%s", discordApi, fmt.Sprintf("users/%s/guilds", userId))) body, err := Request(session, fmt.Sprintf("%s/users/%s/guilds", discordApi, userId))
err = json.Unmarshal(body, &servers) err = json.Unmarshal(body, &servers)
return return
@ -131,14 +130,14 @@ func Servers(session *Session, userId string) (servers []Server, err error) {
// server. // server.
func Channels(session *Session, serverId int) (channels []Channel, err error) { func Channels(session *Session, serverId int) (channels []Channel, err error) {
body, err := Request(session, fmt.Sprintf("%s/%s", discordApi, fmt.Sprintf("guilds/%d/channels", serverId))) body, err := Request(session, fmt.Sprintf("%s/guilds/%d/channels", discordApi, serverId))
err = json.Unmarshal(body, &channels) err = json.Unmarshal(body, &channels)
return return
} }
// Close ends a session and logs out from the Discord REST API. // Close ends a session and logs out from the Discord REST API.
func Close(session *Session) (err error) { func Logout(session *Session) (err error) {
req, err := http.NewRequest("POST", fmt.Sprintf("%s/%s", discordApi, fmt.Sprintf("auth/logout")), bytes.NewBuffer([]byte(fmt.Sprintf(``)))) req, err := http.NewRequest("POST", fmt.Sprintf("%s/%s", discordApi, fmt.Sprintf("auth/logout")), bytes.NewBuffer([]byte(fmt.Sprintf(``))))
if err != nil { if err != nil {
return return

6
session.go
View file

@ -37,8 +37,8 @@ func (session *Session) Servers() (servers []Server, err error) {
return return
} }
// Close ends a session and logs out from the Discord REST API. // Logout ends a session and logs out from the Discord REST API.
func (session *Session) Close() (err error) { func (session *Session) Logout() (err error) {
err = Close(session) err = Logout(session)
return return
} }