From ec6f07259d9210cd1c3ac256c5b8295db9eb86ef Mon Sep 17 00:00:00 2001
From: Bruce Marriner <bruce@sqls.net>
Date: Tue, 3 Nov 2015 09:28:15 -0600
Subject: [PATCH] Renamed Close to Logout.  Removed unneeded sprintf calls.

---
 client.go  | 9 ++++-----
 session.go | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/client.go b/client.go
index 4324c0e..235177a 100644
--- a/client.go
+++ b/client.go
@@ -102,9 +102,8 @@ func Request(session *Session, urlStr string) (body []byte, err error) {
 // user    : A user Id or name
 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)
-
 	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
 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)
 
 	return
@@ -131,14 +130,14 @@ func Servers(session *Session, userId string) (servers []Server, err error) {
 // server.
 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)
 
 	return
 }
 
 // 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(``))))
 	if err != nil {
 		return
diff --git a/session.go b/session.go
index cb6ea40..ae04e7b 100644
--- a/session.go
+++ b/session.go
@@ -37,8 +37,8 @@ func (session *Session) Servers() (servers []Server, err error) {
 	return
 }
 
-// Close ends a session and logs out from the Discord REST API.
-func (session *Session) Close() (err error) {
-	err = Close(session)
+// Logout ends a session and logs out from the Discord REST API.
+func (session *Session) Logout() (err error) {
+	err = Logout(session)
 	return
 }