From ddc830a0714984b15e90ed2eb04ad9fd1589007a Mon Sep 17 00:00:00 2001
From: Chris Rhodes <iopred@gmail.com>
Date: Sat, 13 Feb 2016 10:28:34 -0800
Subject: [PATCH] Add new guild endpoints.

---
 endpoints.go |  1 +
 restapi.go   | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/endpoints.go b/endpoints.go
index e366b39..1523eef 100644
--- a/endpoints.go
+++ b/endpoints.go
@@ -57,6 +57,7 @@ var (
 	GUILD              = func(gID string) string { return GUILDS + gID }
 	GUILD_INIVTES      = func(gID string) string { return GUILDS + gID + "/invites" }
 	GUILD_CHANNELS     = func(gID string) string { return GUILDS + gID + "/channels" }
+	GUILD_MEMBERS      = func(gID string) string { return GUILDS + gID + "/members" }
 	GUILD_MEMBER       = func(gID, uID string) string { return GUILDS + gID + "/members/" + uID }
 	GUILD_BANS         = func(gID string) string { return GUILDS + gID + "/bans" }
 	GUILD_BAN          = func(gID, uID string) string { return GUILDS + gID + "/bans/" + uID }
diff --git a/restapi.go b/restapi.go
index ffb5587..4c7655d 100644
--- a/restapi.go
+++ b/restapi.go
@@ -443,6 +443,33 @@ func (s *Session) GuildBanDelete(guildID, userID string) (err error) {
 	return
 }
 
+// GuildMembers returns a list of members for a guild.
+// guildID   : The ID of a Guild.
+func (s *Session) GuildMembers(guildID string) (st []*Member, err error) {
+
+	body, err := s.Request("GET", GUILD_MEMBERS(guildID), data)
+	if err != nil {
+		return
+	}
+
+	err = unmarshal(body, &st)
+	return
+}
+
+// GuildMember returns a members of a guild.
+// guildID   : The ID of a Guild.
+// userID    : The ID of a User
+func (s *Session) GuildMember(guildID, userID string) (st *Member, err error) {
+
+	body, err := s.Request("GET", GUILD_MEMBER(guildID, userID), nil)
+	if err != nil {
+		return
+	}
+
+	err = unmarshal(body, &st)
+	return
+}
+
 // GuildMemberDelete removes the given user from the given guild.
 // guildID   : The ID of a Guild.
 // userID    : The ID of a User