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

Merge pull request #212 from iopred/cases

Browse source 
Support many more idioms.
This commit is contained in:
Bruce 2016-06-04 08:58:27 -05:00
commit dfccc82030
3 changed files with 136 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

136
endpoints.go
View file

@ -13,84 +13,84 @@ package discordgo
// Known Discord API Endpoints. // Known Discord API Endpoints.
var ( var (
STATUS = "https://status.discordapp.com/api/v2/" EndpointStatus = "https://status.discordapp.com/api/v2/"
SM = STATUS + "scheduled-maintenances/" EndpointSm = EndpointStatus + "scheduled-maintenances/"
SM_ACTIVE = SM + "active.json" EndpointSmActive = EndpointSm + "active.json"
SM_UPCOMING = SM + "upcoming.json" EndpointSmUpcoming = EndpointSm + "upcoming.json"
DISCORD = "https://discordapp.com" // TODO consider removing EndpointDiscord = "https://discordapp.com/"
API = DISCORD + "/api/" EndpointAPI = EndpointDiscord + "api/"
GUILDS = API + "guilds/" EndpointGuilds = EndpointAPI + "guilds/"
CHANNELS = API + "channels/" EndpointChannels = EndpointAPI + "channels/"
USERS = API + "users/" EndpointUsers = EndpointAPI + "users/"
GATEWAY = API + "gateway" EndpointGateway = EndpointAPI + "gateway"
AUTH = API + "auth/" EndpointAuth = EndpointAPI + "auth/"
LOGIN = AUTH + "login" EndpointLogin = EndpointAuth + "login"
LOGOUT = AUTH + "logout" EndpointLogout = EndpointAuth + "logout"
VERIFY = AUTH + "verify" EndpointVerify = EndpointAuth + "verify"
VERIFY_RESEND = AUTH + "verify/resend" EndpointVerifyResend = EndpointAuth + "verify/resend"
FORGOT_PASSWORD = AUTH + "forgot" EndpointForgotPassword = EndpointAuth + "forgot"
RESET_PASSWORD = AUTH + "reset" EndpointResetPassword = EndpointAuth + "reset"
REGISTER = AUTH + "register" EndpointRegister = EndpointAuth + "register"
VOICE = API + "/voice/" EndpointVoice = EndpointAPI + "/voice/"
VOICE_REGIONS = VOICE + "regions" EndpointVoiceRegions = EndpointVoice + "regions"
VOICE_ICE = VOICE + "ice" EndpointVoiceIce = EndpointVoice + "ice"
TUTORIAL = API + "tutorial/" EndpointTutorial = EndpointAPI + "tutorial/"
TUTORIAL_INDICATORS = TUTORIAL + "indicators" EndpointTutorialIndicators = EndpointTutorial + "indicators"
TRACK = API + "track" EndpointTrack = EndpointAPI + "track"
SSO = API + "sso" EndpointSso = EndpointAPI + "sso"
REPORT = API + "report" EndpointReport = EndpointAPI + "report"
INTEGRATIONS = API + "integrations" EndpointIntegrations = EndpointAPI + "integrations"
USER = func(uID string) string { return USERS + uID } EndpointUser = func(uID string) string { return EndpointUsers + uID }
USER_AVATAR = func(uID, aID string) string { return USERS + uID + "/avatars/" + aID + ".jpg" } EndpointUserAvatar = func(uID, aID string) string { return EndpointUsers + uID + "/avatars/" + aID + ".jpg" }
USER_SETTINGS = func(uID string) string { return USERS + uID + "/settings" } EndpointUserSettings = func(uID string) string { return EndpointUsers + uID + "/settings" }
USER_GUILDS = func(uID string) string { return USERS + uID + "/guilds" } EndpointUserGuilds = func(uID string) string { return EndpointUsers + uID + "/guilds" }
USER_GUILD = func(uID, gID string) string { return USERS + uID + "/guilds/" + gID } EndpointUserGuild = func(uID, gID string) string { return EndpointUsers + uID + "/guilds/" + gID }
USER_CHANNELS = func(uID string) string { return USERS + uID + "/channels" } EndpointUserChannels = func(uID string) string { return EndpointUsers + uID + "/channels" }
USER_DEVICES = func(uID string) string { return USERS + uID + "/devices" } EndpointUserDevices = func(uID string) string { return EndpointUsers + uID + "/devices" }
USER_CONNECTIONS = func(uID string) string { return USERS + uID + "/connections" } EndpointUserConnections = func(uID string) string { return EndpointUsers + uID + "/connections" }
GUILD = func(gID string) string { return GUILDS + gID } EndpointGuild = func(gID string) string { return EndpointGuilds + gID }
GUILD_INIVTES = func(gID string) string { return GUILDS + gID + "/invites" } EndpointGuildInivtes = func(gID string) string { return EndpointGuilds + gID + "/invites" }
GUILD_CHANNELS = func(gID string) string { return GUILDS + gID + "/channels" } EndpointGuildChannels = func(gID string) string { return EndpointGuilds + gID + "/channels" }
GUILD_MEMBERS = func(gID string) string { return GUILDS + gID + "/members" } EndpointGuildMembers = func(gID string) string { return EndpointGuilds + gID + "/members" }
GUILD_MEMBER = func(gID, uID string) string { return GUILDS + gID + "/members/" + uID } EndpointGuildMember = func(gID, uID string) string { return EndpointGuilds + gID + "/members/" + uID }
GUILD_BANS = func(gID string) string { return GUILDS + gID + "/bans" } EndpointGuildBans = func(gID string) string { return EndpointGuilds + gID + "/bans" }
GUILD_BAN = func(gID, uID string) string { return GUILDS + gID + "/bans/" + uID } EndpointGuildBan = func(gID, uID string) string { return EndpointGuilds + gID + "/bans/" + uID }
GUILD_INTEGRATIONS = func(gID string) string { return GUILDS + gID + "/integrations" } EndpointGuildIntegrations = func(gID string) string { return EndpointGuilds + gID + "/integrations" }
GUILD_INTEGRATION = func(gID, iID string) string { return GUILDS + gID + "/integrations/" + iID } EndpointGuildIntegration = func(gID, iID string) string { return EndpointGuilds + gID + "/integrations/" + iID }
GUILD_INTEGRATION_SYNC = func(gID, iID string) string { return GUILDS + gID + "/integrations/" + iID + "/sync" } EndpointGuildIntegrationSync = func(gID, iID string) string { return EndpointGuilds + gID + "/integrations/" + iID + "/sync" }
GUILD_ROLES = func(gID string) string { return GUILDS + gID + "/roles" } EndpointGuildRoles = func(gID string) string { return EndpointGuilds + gID + "/roles" }
GUILD_ROLE = func(gID, rID string) string { return GUILDS + gID + "/roles/" + rID } EndpointGuildRole = func(gID, rID string) string { return EndpointGuilds + gID + "/roles/" + rID }
GUILD_INVITES = func(gID string) string { return GUILDS + gID + "/invites" } EndpointGuildInvites = func(gID string) string { return EndpointGuilds + gID + "/invites" }
GUILD_EMBED = func(gID string) string { return GUILDS + gID + "/embed" } EndpointGuildEmbed = func(gID string) string { return EndpointGuilds + gID + "/embed" }
GUILD_PRUNE = func(gID string) string { return GUILDS + gID + "/prune" } EndpointGuildPrune = func(gID string) string { return EndpointGuilds + gID + "/prune" }
GUILD_ICON = func(gID, hash string) string { return GUILDS + gID + "/icons/" + hash + ".jpg" } EndpointGuildIcon = func(gID, hash string) string { return EndpointGuilds + gID + "/icons/" + hash + ".jpg" }
GUILD_SPLASH = func(gID, hash string) string { return GUILDS + gID + "/splashes/" + hash + ".jpg" } EndpointGuildSplash = func(gID, hash string) string { return EndpointGuilds + gID + "/splashes/" + hash + ".jpg" }
CHANNEL = func(cID string) string { return CHANNELS + cID } EndpointChannel = func(cID string) string { return EndpointChannels + cID }
CHANNEL_PERMISSIONS = func(cID string) string { return CHANNELS + cID + "/permissions" } EndpointChannelPermissions = func(cID string) string { return EndpointChannels + cID + "/permissions" }
CHANNEL_PERMISSION = func(cID, tID string) string { return CHANNELS + cID + "/permissions/" + tID } EndpointChannelPermission = func(cID, tID string) string { return EndpointChannels + cID + "/permissions/" + tID }
CHANNEL_INVITES = func(cID string) string { return CHANNELS + cID + "/invites" } EndpointChannelInvites = func(cID string) string { return EndpointChannels + cID + "/invites" }
CHANNEL_TYPING = func(cID string) string { return CHANNELS + cID + "/typing" } EndpointChannelTyping = func(cID string) string { return EndpointChannels + cID + "/typing" }
CHANNEL_MESSAGES = func(cID string) string { return CHANNELS + cID + "/messages" } EndpointChannelMessages = func(cID string) string { return EndpointChannels + cID + "/messages" }
CHANNEL_MESSAGE = func(cID, mID string) string { return CHANNELS + cID + "/messages/" + mID } EndpointChannelMessage = func(cID, mID string) string { return EndpointChannels + cID + "/messages/" + mID }
CHANNEL_MESSAGE_ACK = func(cID, mID string) string { return CHANNELS + cID + "/messages/" + mID + "/ack" } EndpointChannelMessageAck = func(cID, mID string) string { return EndpointChannels + cID + "/messages/" + mID + "/ack" }
CHANNEL_MESSAGES_BULK_DELETE = func(cID string) string { return CHANNEL(cID) + "/messages/bulk_delete" } EndpointChannelMessagesBulkDelete = func(cID string) string { return EndpointChannel(cID) + "/messages/bulk_delete" }
INVITE = func(iID string) string { return API + "invite/" + iID } EndpointInvite = func(iID string) string { return EndpointAPI + "invite/" + iID }
INTEGRATIONS_JOIN = func(iID string) string { return API + "integrations/" + iID + "/join" } EndpointIntegrationsJoin = func(iID string) string { return EndpointAPI + "integrations/" + iID + "/join" }
EMOJI = func(eID string) string { return API + "emojis/" + eID + ".png" } EndpointEmoji = func(eID string) string { return EndpointAPI + "emojis/" + eID + ".png" }
OAUTH2 = API + "oauth2/" EndpointOauth2 = EndpointAPI + "oauth2/"
APPLICATIONS = OAUTH2 + "applications" EndpointApplications = EndpointOauth2 + "applications"
APPLICATION = func(aID string) string { return APPLICATIONS + "/" + aID } EndpointApplication = func(aID string) string { return EndpointApplications + "/" + aID }
APPLICATIONS_BOT = func(aID string) string { return APPLICATIONS + "/" + aID + "/bot" } EndpointApplicationsBot = func(aID string) string { return EndpointApplications + "/" + aID + "/bot" }
) )

12
oauth2.go
View file

@ -27,7 +27,7 @@ type Application struct {
// appID : The ID of an Application // appID : The ID of an Application
func (s *Session) Application(appID string) (st *Application, err error) { func (s *Session) Application(appID string) (st *Application, err error) {
body, err := s.Request("GET", APPLICATION(appID), nil) body, err := s.Request("GET", EndpointApplication(appID), nil)
if err != nil { if err != nil {
return return
} }
@ -39,7 +39,7 @@ func (s *Session) Application(appID string) (st *Application, err error) {
// Applications returns all applications for the authenticated user // Applications returns all applications for the authenticated user
func (s *Session) Applications() (st []*Application, err error) { func (s *Session) Applications() (st []*Application, err error) {
body, err := s.Request("GET", APPLICATIONS, nil) body, err := s.Request("GET", EndpointApplications, nil)
if err != nil { if err != nil {
return return
} }
@ -59,7 +59,7 @@ func (s *Session) ApplicationCreate(ap *Application) (st *Application, err error
RedirectURIs *[]string `json:"redirect_uris,omitempty"` RedirectURIs *[]string `json:"redirect_uris,omitempty"`
}{ap.Name, ap.Description, ap.RedirectURIs} }{ap.Name, ap.Description, ap.RedirectURIs}
body, err := s.Request("POST", APPLICATIONS, data) body, err := s.Request("POST", EndpointApplications, data)
if err != nil { if err != nil {
return return
} }
@ -78,7 +78,7 @@ func (s *Session) ApplicationUpdate(appID string, ap *Application) (st *Applicat
RedirectURIs *[]string `json:"redirect_uris,omitempty"` RedirectURIs *[]string `json:"redirect_uris,omitempty"`
}{ap.Name, ap.Description, ap.RedirectURIs} }{ap.Name, ap.Description, ap.RedirectURIs}
body, err := s.Request("PUT", APPLICATION(appID), data) body, err := s.Request("PUT", EndpointApplication(appID), data)
if err != nil { if err != nil {
return return
} }
@ -91,7 +91,7 @@ func (s *Session) ApplicationUpdate(appID string, ap *Application) (st *Applicat
// appID : The ID of an Application // appID : The ID of an Application
func (s *Session) ApplicationDelete(appID string) (err error) { func (s *Session) ApplicationDelete(appID string) (err error) {
_, err = s.Request("DELETE", APPLICATION(appID), nil) _, err = s.Request("DELETE", EndpointApplication(appID), nil)
if err != nil { if err != nil {
return return
} }
@ -117,7 +117,7 @@ func (s *Session) ApplicationBotCreate(appID, token string) (st *User, err error
Token string `json:"token,omitempty"` Token string `json:"token,omitempty"`
}{token} }{token}
body, err := s.Request("POST", APPLICATIONS_BOT(appID), data) body, err := s.Request("POST", EndpointApplicationsBot(appID), data)
if err != nil { if err != nil {
return return
} }

124
restapi.go
View file

@ -184,7 +184,7 @@ func (s *Session) Login(email, password string) (err error) {
Password string `json:"password"` Password string `json:"password"`
}{email, password} }{email, password}
response, err := s.Request("POST", LOGIN, data) response, err := s.Request("POST", EndpointLogin, data)
if err != nil { if err != nil {
return return
} }
@ -211,7 +211,7 @@ func (s *Session) Register(username string) (token string, err error) {
Username string `json:"username"` Username string `json:"username"`
}{username} }{username}
response, err := s.Request("POST", REGISTER, data) response, err := s.Request("POST", EndpointRegister, data)
if err != nil { if err != nil {
return return
} }
@ -245,7 +245,7 @@ func (s *Session) Logout() (err error) {
Token string `json:"token"` Token string `json:"token"`
}{s.Token} }{s.Token}
_, err = s.Request("POST", LOGOUT, data) _, err = s.Request("POST", EndpointLogout, data)
return return
} }
@ -257,7 +257,7 @@ func (s *Session) Logout() (err error) {
// userID : A user ID or "@me" which is a shortcut of current user ID // userID : A user ID or "@me" which is a shortcut of current user ID
func (s *Session) User(userID string) (st *User, err error) { func (s *Session) User(userID string) (st *User, err error) {
body, err := s.Request("GET", USER(userID), nil) body, err := s.Request("GET", EndpointUser(userID), nil)
if err != nil { if err != nil {
return return
} }
@ -274,7 +274,7 @@ func (s *Session) UserAvatar(userID string) (img image.Image, err error) {
return return
} }
body, err := s.Request("GET", USER_AVATAR(userID, u.Avatar), nil) body, err := s.Request("GET", EndpointUserAvatar(userID, u.Avatar), nil)
if err != nil { if err != nil {
return return
} }
@ -299,7 +299,7 @@ func (s *Session) UserUpdate(email, password, username, avatar, newPassword stri
NewPassword string `json:"new_password,omitempty"` NewPassword string `json:"new_password,omitempty"`
}{email, password, username, avatar, newPassword} }{email, password, username, avatar, newPassword}
body, err := s.Request("PATCH", USER("@me"), data) body, err := s.Request("PATCH", EndpointUser("@me"), data)
if err != nil { if err != nil {
return return
} }
@ -311,7 +311,7 @@ func (s *Session) UserUpdate(email, password, username, avatar, newPassword stri
// UserSettings returns the settings for a given user // UserSettings returns the settings for a given user
func (s *Session) UserSettings() (st *Settings, err error) { func (s *Session) UserSettings() (st *Settings, err error) {
body, err := s.Request("GET", USER_SETTINGS("@me"), nil) body, err := s.Request("GET", EndpointUserSettings("@me"), nil)
if err != nil { if err != nil {
return return
} }
@ -324,7 +324,7 @@ func (s *Session) UserSettings() (st *Settings, err error) {
// channels. // channels.
func (s *Session) UserChannels() (st []*Channel, err error) { func (s *Session) UserChannels() (st []*Channel, err error) {
body, err := s.Request("GET", USER_CHANNELS("@me"), nil) body, err := s.Request("GET", EndpointUserChannels("@me"), nil)
if err != nil { if err != nil {
return return
} }
@ -341,7 +341,7 @@ func (s *Session) UserChannelCreate(recipientID string) (st *Channel, err error)
RecipientID string `json:"recipient_id"` RecipientID string `json:"recipient_id"`
}{recipientID} }{recipientID}
body, err := s.Request("POST", USER_CHANNELS("@me"), data) body, err := s.Request("POST", EndpointUserChannels("@me"), data)
if err != nil { if err != nil {
return return
} }
@ -353,7 +353,7 @@ func (s *Session) UserChannelCreate(recipientID string) (st *Channel, err error)
// UserGuilds returns an array of Guild structures for all guilds. // UserGuilds returns an array of Guild structures for all guilds.
func (s *Session) UserGuilds() (st []*Guild, err error) { func (s *Session) UserGuilds() (st []*Guild, err error) {
body, err := s.Request("GET", USER_GUILDS("@me"), nil) body, err := s.Request("GET", EndpointUserGuilds("@me"), nil)
if err != nil { if err != nil {
return return
} }
@ -441,7 +441,7 @@ func (s *Session) Guild(guildID string) (st *Guild, err error) {
} }
} }
body, err := s.Request("GET", GUILD(guildID), nil) body, err := s.Request("GET", EndpointGuild(guildID), nil)
if err != nil { if err != nil {
return return
} }
@ -458,7 +458,7 @@ func (s *Session) GuildCreate(name string) (st *Guild, err error) {
Name string `json:"name"` Name string `json:"name"`
}{name} }{name}
body, err := s.Request("POST", GUILDS, data) body, err := s.Request("POST", EndpointGuilds, data)
if err != nil { if err != nil {
return return
} }
@ -506,7 +506,7 @@ func (s *Session) GuildEdit(guildID string, g GuildParams) (st *Guild, err error
VerificationLevel *VerificationLevel `json:"verification_level,omitempty"` VerificationLevel *VerificationLevel `json:"verification_level,omitempty"`
}{g.Name, g.Region, g.VerificationLevel} }{g.Name, g.Region, g.VerificationLevel}
body, err := s.Request("PATCH", GUILD(guildID), data) body, err := s.Request("PATCH", EndpointGuild(guildID), data)
if err != nil { if err != nil {
return return
} }
@ -519,7 +519,7 @@ func (s *Session) GuildEdit(guildID string, g GuildParams) (st *Guild, err error
// guildID : The ID of a Guild // guildID : The ID of a Guild
func (s *Session) GuildDelete(guildID string) (st *Guild, err error) { func (s *Session) GuildDelete(guildID string) (st *Guild, err error) {
body, err := s.Request("DELETE", GUILD(guildID), nil) body, err := s.Request("DELETE", EndpointGuild(guildID), nil)
if err != nil { if err != nil {
return return
} }
@ -532,7 +532,7 @@ func (s *Session) GuildDelete(guildID string) (st *Guild, err error) {
// guildID : The ID of a Guild // guildID : The ID of a Guild
func (s *Session) GuildLeave(guildID string) (err error) { func (s *Session) GuildLeave(guildID string) (err error) {
_, err = s.Request("DELETE", USER_GUILD("@me", guildID), nil) _, err = s.Request("DELETE", EndpointUserGuild("@me", guildID), nil)
return return
} }
@ -541,7 +541,7 @@ func (s *Session) GuildLeave(guildID string) (err error) {
// guildID : The ID of a Guild. // guildID : The ID of a Guild.
func (s *Session) GuildBans(guildID string) (st []*User, err error) { func (s *Session) GuildBans(guildID string) (st []*User, err error) {
body, err := s.Request("GET", GUILD_BANS(guildID), nil) body, err := s.Request("GET", EndpointGuildBans(guildID), nil)
if err != nil { if err != nil {
return return
} }
@ -557,7 +557,7 @@ func (s *Session) GuildBans(guildID string) (st []*User, err error) {
// days : The number of days of previous comments to delete. // days : The number of days of previous comments to delete.
func (s *Session) GuildBanCreate(guildID, userID string, days int) (err error) { func (s *Session) GuildBanCreate(guildID, userID string, days int) (err error) {
uri := GUILD_BAN(guildID, userID) uri := EndpointGuildBan(guildID, userID)
if days > 0 { if days > 0 {
uri = fmt.Sprintf("%s?delete-message-days=%d", uri, days) uri = fmt.Sprintf("%s?delete-message-days=%d", uri, days)
@ -572,7 +572,7 @@ func (s *Session) GuildBanCreate(guildID, userID string, days int) (err error) {
// userID : The ID of a User // userID : The ID of a User
func (s *Session) GuildBanDelete(guildID, userID string) (err error) { func (s *Session) GuildBanDelete(guildID, userID string) (err error) {
_, err = s.Request("DELETE", GUILD_BAN(guildID, userID), nil) _, err = s.Request("DELETE", EndpointGuildBan(guildID, userID), nil)
return return
} }
@ -582,7 +582,7 @@ func (s *Session) GuildBanDelete(guildID, userID string) (err error) {
// limit : max number of members to return (max 1000) // limit : max number of members to return (max 1000)
func (s *Session) GuildMembers(guildID string, offset, limit int) (st []*Member, err error) { func (s *Session) GuildMembers(guildID string, offset, limit int) (st []*Member, err error) {
uri := GUILD_MEMBERS(guildID) uri := EndpointGuildMembers(guildID)
v := url.Values{} v := url.Values{}
@ -612,7 +612,7 @@ func (s *Session) GuildMembers(guildID string, offset, limit int) (st []*Member,
// userID : The ID of a User // userID : The ID of a User
func (s *Session) GuildMember(guildID, userID string) (st *Member, err error) { func (s *Session) GuildMember(guildID, userID string) (st *Member, err error) {
body, err := s.Request("GET", GUILD_MEMBER(guildID, userID), nil) body, err := s.Request("GET", EndpointGuildMember(guildID, userID), nil)
if err != nil { if err != nil {
return return
} }
@ -626,7 +626,7 @@ func (s *Session) GuildMember(guildID, userID string) (st *Member, err error) {
// userID : The ID of a User // userID : The ID of a User
func (s *Session) GuildMemberDelete(guildID, userID string) (err error) { func (s *Session) GuildMemberDelete(guildID, userID string) (err error) {
_, err = s.Request("DELETE", GUILD_MEMBER(guildID, userID), nil) _, err = s.Request("DELETE", EndpointGuildMember(guildID, userID), nil)
return return
} }
@ -640,7 +640,7 @@ func (s *Session) GuildMemberEdit(guildID, userID string, roles []string) (err e
Roles []string `json:"roles"` Roles []string `json:"roles"`
}{roles} }{roles}
_, err = s.Request("PATCH", GUILD_MEMBER(guildID, userID), data) _, err = s.Request("PATCH", EndpointGuildMember(guildID, userID), data)
if err != nil { if err != nil {
return return
} }
@ -660,7 +660,7 @@ func (s *Session) GuildMemberMove(guildID, userID, channelID string) (err error)
ChannelID string `json:"channel_id"` ChannelID string `json:"channel_id"`
}{channelID} }{channelID}
_, err = s.Request("PATCH", GUILD_MEMBER(guildID, userID), data) _, err = s.Request("PATCH", EndpointGuildMember(guildID, userID), data)
if err != nil { if err != nil {
return return
} }
@ -677,7 +677,7 @@ func (s *Session) GuildMemberNickname(guildID, userID, nickname string) (err err
Nick string `json:"nick"` Nick string `json:"nick"`
}{nickname} }{nickname}
_, err = s.Request("PATCH", GUILD_MEMBER(guildID, userID), data) _, err = s.Request("PATCH", EndpointGuildMember(guildID, userID), data)
return return
} }
@ -686,7 +686,7 @@ func (s *Session) GuildMemberNickname(guildID, userID, nickname string) (err err
// guildID : The ID of a Guild. // guildID : The ID of a Guild.
func (s *Session) GuildChannels(guildID string) (st []*Channel, err error) { func (s *Session) GuildChannels(guildID string) (st []*Channel, err error) {
body, err := s.request("GET", GUILD_CHANNELS(guildID), "", nil) body, err := s.request("GET", EndpointGuildChannels(guildID), "", nil)
if err != nil { if err != nil {
return return
} }
@ -707,7 +707,7 @@ func (s *Session) GuildChannelCreate(guildID, name, ctype string) (st *Channel,
Type string `json:"type"` Type string `json:"type"`
}{name, ctype} }{name, ctype}
body, err := s.Request("POST", GUILD_CHANNELS(guildID), data) body, err := s.Request("POST", EndpointGuildChannels(guildID), data)
if err != nil { if err != nil {
return return
} }
@ -719,7 +719,7 @@ func (s *Session) GuildChannelCreate(guildID, name, ctype string) (st *Channel,
// GuildInvites returns an array of Invite structures for the given guild // GuildInvites returns an array of Invite structures for the given guild
// guildID : The ID of a Guild. // guildID : The ID of a Guild.
func (s *Session) GuildInvites(guildID string) (st []*Invite, err error) { func (s *Session) GuildInvites(guildID string) (st []*Invite, err error) {
body, err := s.Request("GET", GUILD_INVITES(guildID), nil) body, err := s.Request("GET", EndpointGuildInvites(guildID), nil)
if err != nil { if err != nil {
return return
} }
@ -732,7 +732,7 @@ func (s *Session) GuildInvites(guildID string) (st []*Invite, err error) {
// guildID : The ID of a Guild. // guildID : The ID of a Guild.
func (s *Session) GuildRoles(guildID string) (st []*Role, err error) { func (s *Session) GuildRoles(guildID string) (st []*Role, err error) {
body, err := s.Request("GET", GUILD_ROLES(guildID), nil) body, err := s.Request("GET", EndpointGuildRoles(guildID), nil)
if err != nil { if err != nil {
return return
} }
@ -746,7 +746,7 @@ func (s *Session) GuildRoles(guildID string) (st []*Role, err error) {
// guildID: The ID of a Guild. // guildID: The ID of a Guild.
func (s *Session) GuildRoleCreate(guildID string) (st *Role, err error) { func (s *Session) GuildRoleCreate(guildID string) (st *Role, err error) {
body, err := s.Request("POST", GUILD_ROLES(guildID), nil) body, err := s.Request("POST", EndpointGuildRoles(guildID), nil)
if err != nil { if err != nil {
return return
} }
@ -777,7 +777,7 @@ func (s *Session) GuildRoleEdit(guildID, roleID, name string, color int, hoist b
Permissions int `json:"permissions"` // The overall permissions number of the role (overwrites existing) Permissions int `json:"permissions"` // The overall permissions number of the role (overwrites existing)
}{name, color, hoist, perm} }{name, color, hoist, perm}
body, err := s.Request("PATCH", GUILD_ROLE(guildID, roleID), data) body, err := s.Request("PATCH", EndpointGuildRole(guildID, roleID), data)
if err != nil { if err != nil {
return return
} }
@ -792,7 +792,7 @@ func (s *Session) GuildRoleEdit(guildID, roleID, name string, color int, hoist b
// roles : A list of ordered roles. // roles : A list of ordered roles.
func (s *Session) GuildRoleReorder(guildID string, roles []*Role) (st []*Role, err error) { func (s *Session) GuildRoleReorder(guildID string, roles []*Role) (st []*Role, err error) {
body, err := s.Request("PATCH", GUILD_ROLES(guildID), roles) body, err := s.Request("PATCH", EndpointGuildRoles(guildID), roles)
if err != nil { if err != nil {
return return
} }
@ -807,7 +807,7 @@ func (s *Session) GuildRoleReorder(guildID string, roles []*Role) (st []*Role, e
// roleID : The ID of a Role. // roleID : The ID of a Role.
func (s *Session) GuildRoleDelete(guildID, roleID string) (err error) { func (s *Session) GuildRoleDelete(guildID, roleID string) (err error) {
_, err = s.Request("DELETE", GUILD_ROLE(guildID, roleID), nil) _, err = s.Request("DELETE", EndpointGuildRole(guildID, roleID), nil)
return return
} }
@ -816,7 +816,7 @@ func (s *Session) GuildRoleDelete(guildID, roleID string) (err error) {
// guildID : The ID of a Guild. // guildID : The ID of a Guild.
func (s *Session) GuildIntegrations(guildID string) (st []*GuildIntegration, err error) { func (s *Session) GuildIntegrations(guildID string) (st []*GuildIntegration, err error) {
body, err := s.Request("GET", GUILD_INTEGRATIONS(guildID), nil) body, err := s.Request("GET", EndpointGuildIntegrations(guildID), nil)
if err != nil { if err != nil {
return return
} }
@ -837,7 +837,7 @@ func (s *Session) GuildIntegrationCreate(guildID, integrationType, integrationID
Id string `json:"id"` Id string `json:"id"`
}{integrationType, integrationID} }{integrationType, integrationID}
_, err = s.Request("POST", GUILD_INTEGRATIONS(guildID), data) _, err = s.Request("POST", EndpointGuildIntegrations(guildID), data)
return return
} }
@ -856,7 +856,7 @@ func (s *Session) GuildIntegrationEdit(guildID, integrationID string, expireBeha
EnableEmoticons bool `json:"enable_emoticons"` EnableEmoticons bool `json:"enable_emoticons"`
}{expireBehavior, expireGracePeriod, enableEmoticons} }{expireBehavior, expireGracePeriod, enableEmoticons}
_, err = s.Request("PATCH", GUILD_INTEGRATION(guildID, integrationID), data) _, err = s.Request("PATCH", EndpointGuildIntegration(guildID, integrationID), data)
return return
} }
@ -865,7 +865,7 @@ func (s *Session) GuildIntegrationEdit(guildID, integrationID string, expireBeha
// integrationID : The ID of an integration. // integrationID : The ID of an integration.
func (s *Session) GuildIntegrationDelete(guildID, integrationID string) (err error) { func (s *Session) GuildIntegrationDelete(guildID, integrationID string) (err error) {
_, err = s.Request("DELETE", GUILD_INTEGRATION(guildID, integrationID), nil) _, err = s.Request("DELETE", EndpointGuildIntegration(guildID, integrationID), nil)
return return
} }
@ -874,7 +874,7 @@ func (s *Session) GuildIntegrationDelete(guildID, integrationID string) (err err
// integrationID : The ID of an integration. // integrationID : The ID of an integration.
func (s *Session) GuildIntegrationSync(guildID, integrationID string) (err error) { func (s *Session) GuildIntegrationSync(guildID, integrationID string) (err error) {
_, err = s.Request("POST", GUILD_INTEGRATION_SYNC(guildID, integrationID), nil) _, err = s.Request("POST", EndpointGuildIntegrationSync(guildID, integrationID), nil)
return return
} }
@ -891,7 +891,7 @@ func (s *Session) GuildIcon(guildID string) (img image.Image, err error) {
return return
} }
body, err := s.Request("GET", GUILD_ICON(guildID, g.Icon), nil) body, err := s.Request("GET", EndpointGuildIcon(guildID, g.Icon), nil)
if err != nil { if err != nil {
return return
} }
@ -913,7 +913,7 @@ func (s *Session) GuildSplash(guildID string) (img image.Image, err error) {
return return
} }
body, err := s.Request("GET", GUILD_SPLASH(guildID, g.Splash), nil) body, err := s.Request("GET", EndpointGuildSplash(guildID, g.Splash), nil)
if err != nil { if err != nil {
return return
} }
@ -926,7 +926,7 @@ func (s *Session) GuildSplash(guildID string) (img image.Image, err error) {
// guildID : The ID of a Guild. // guildID : The ID of a Guild.
func (s *Session) GuildEmbed(guildID string) (st *GuildEmbed, err error) { func (s *Session) GuildEmbed(guildID string) (st *GuildEmbed, err error) {
body, err := s.Request("GET", GUILD_EMBED(guildID), nil) body, err := s.Request("GET", EndpointGuildEmbed(guildID), nil)
if err != nil { if err != nil {
return return
} }
@ -941,7 +941,7 @@ func (s *Session) GuildEmbedEdit(guildID string, enabled bool, channelID string)
data := GuildEmbed{enabled, channelID} data := GuildEmbed{enabled, channelID}
_, err = s.Request("PATCH", GUILD_EMBED(guildID), data) _, err = s.Request("PATCH", EndpointGuildEmbed(guildID), data)
return return
} }
@ -952,7 +952,7 @@ func (s *Session) GuildEmbedEdit(guildID string, enabled bool, channelID string)
// Channel returns a Channel strucutre of a specific Channel. // Channel returns a Channel strucutre of a specific Channel.
// channelID : The ID of the Channel you want returned. // channelID : The ID of the Channel you want returned.
func (s *Session) Channel(channelID string) (st *Channel, err error) { func (s *Session) Channel(channelID string) (st *Channel, err error) {
body, err := s.Request("GET", CHANNEL(channelID), nil) body, err := s.Request("GET", EndpointChannel(channelID), nil)
if err != nil { if err != nil {
return return
} }
@ -970,7 +970,7 @@ func (s *Session) ChannelEdit(channelID, name string) (st *Channel, err error) {
Name string `json:"name"` Name string `json:"name"`
}{name} }{name}
body, err := s.Request("PATCH", CHANNEL(channelID), data) body, err := s.Request("PATCH", EndpointChannel(channelID), data)
if err != nil { if err != nil {
return return
} }
@ -983,7 +983,7 @@ func (s *Session) ChannelEdit(channelID, name string) (st *Channel, err error) {
// channelID : The ID of a Channel // channelID : The ID of a Channel
func (s *Session) ChannelDelete(channelID string) (st *Channel, err error) { func (s *Session) ChannelDelete(channelID string) (st *Channel, err error) {
body, err := s.Request("DELETE", CHANNEL(channelID), nil) body, err := s.Request("DELETE", EndpointChannel(channelID), nil)
if err != nil { if err != nil {
return return
} }
@ -997,7 +997,7 @@ func (s *Session) ChannelDelete(channelID string) (st *Channel, err error) {
// channelID : The ID of a Channel // channelID : The ID of a Channel
func (s *Session) ChannelTyping(channelID string) (err error) { func (s *Session) ChannelTyping(channelID string) (err error) {
_, err = s.Request("POST", CHANNEL_TYPING(channelID), nil) _, err = s.Request("POST", EndpointChannelTyping(channelID), nil)
return return
} }
@ -1009,7 +1009,7 @@ func (s *Session) ChannelTyping(channelID string) (err error) {
// afterID : If provided all messages returned will be after given ID. // afterID : If provided all messages returned will be after given ID.
func (s *Session) ChannelMessages(channelID string, limit int, beforeID, afterID string) (st []*Message, err error) { func (s *Session) ChannelMessages(channelID string, limit int, beforeID, afterID string) (st []*Message, err error) {
uri := CHANNEL_MESSAGES(channelID) uri := EndpointChannelMessages(channelID)
v := url.Values{} v := url.Values{}
if limit > 0 { if limit > 0 {
@ -1039,7 +1039,7 @@ func (s *Session) ChannelMessages(channelID string, limit int, beforeID, afterID
// messageID : the ID of a Message // messageID : the ID of a Message
func (s *Session) ChannelMessageAck(channelID, messageID string) (err error) { func (s *Session) ChannelMessageAck(channelID, messageID string) (err error) {
_, err = s.request("POST", CHANNEL_MESSAGE_ACK(channelID, messageID), "", nil) _, err = s.request("POST", EndpointChannelMessageAck(channelID, messageID), "", nil)
return return
} }
@ -1056,7 +1056,7 @@ func (s *Session) channelMessageSend(channelID, content string, tts bool) (st *M
}{content, tts} }{content, tts}
// Send the message to the given channel // Send the message to the given channel
response, err := s.Request("POST", CHANNEL_MESSAGES(channelID), data) response, err := s.Request("POST", EndpointChannelMessages(channelID), data)
if err != nil { if err != nil {
return return
} }
@ -1091,7 +1091,7 @@ func (s *Session) ChannelMessageEdit(channelID, messageID, content string) (st *
Content string `json:"content"` Content string `json:"content"`
}{content} }{content}
response, err := s.Request("PATCH", CHANNEL_MESSAGE(channelID, messageID), data) response, err := s.Request("PATCH", EndpointChannelMessage(channelID, messageID), data)
if err != nil { if err != nil {
return return
} }
@ -1103,7 +1103,7 @@ func (s *Session) ChannelMessageEdit(channelID, messageID, content string) (st *
// ChannelMessageDelete deletes a message from the Channel. // ChannelMessageDelete deletes a message from the Channel.
func (s *Session) ChannelMessageDelete(channelID, messageID string) (err error) { func (s *Session) ChannelMessageDelete(channelID, messageID string) (err error) {
_, err = s.Request("DELETE", CHANNEL_MESSAGE(channelID, messageID), nil) _, err = s.Request("DELETE", EndpointChannelMessage(channelID, messageID), nil)
return return
} }
@ -1131,7 +1131,7 @@ func (s *Session) ChannelMessagesBulkDelete(channelID string, messages []string)
Messages []string `json:"messages"` Messages []string `json:"messages"`
}{messages} }{messages}
_, err = s.Request("POST", CHANNEL_MESSAGES_BULK_DELETE(channelID), data) _, err = s.Request("POST", EndpointChannelMessagesBulkDelete(channelID), data)
return return
} }
@ -1158,7 +1158,7 @@ func (s *Session) ChannelFileSend(channelID, name string, r io.Reader) (st *Mess
return return
} }
response, err := s.request("POST", CHANNEL_MESSAGES(channelID), bodywriter.FormDataContentType(), body.Bytes()) response, err := s.request("POST", EndpointChannelMessages(channelID), bodywriter.FormDataContentType(), body.Bytes())
if err != nil { if err != nil {
return return
} }
@ -1171,7 +1171,7 @@ func (s *Session) ChannelFileSend(channelID, name string, r io.Reader) (st *Mess
// channelID : The ID of a Channel // channelID : The ID of a Channel
func (s *Session) ChannelInvites(channelID string) (st []*Invite, err error) { func (s *Session) ChannelInvites(channelID string) (st []*Invite, err error) {
body, err := s.Request("GET", CHANNEL_INVITES(channelID), nil) body, err := s.Request("GET", EndpointChannelInvites(channelID), nil)
if err != nil { if err != nil {
return return
} }
@ -1193,7 +1193,7 @@ func (s *Session) ChannelInviteCreate(channelID string, i Invite) (st *Invite, e
XKCDPass string `json:"xkcdpass"` XKCDPass string `json:"xkcdpass"`
}{i.MaxAge, i.MaxUses, i.Temporary, i.XkcdPass} }{i.MaxAge, i.MaxUses, i.Temporary, i.XkcdPass}
body, err := s.Request("POST", CHANNEL_INVITES(channelID), data) body, err := s.Request("POST", EndpointChannelInvites(channelID), data)
if err != nil { if err != nil {
return return
} }
@ -1214,7 +1214,7 @@ func (s *Session) ChannelPermissionSet(channelID, targetID, targetType string, a
Deny int `json:"deny"` Deny int `json:"deny"`
}{targetID, targetType, allow, deny} }{targetID, targetType, allow, deny}
_, err = s.Request("PUT", CHANNEL_PERMISSION(channelID, targetID), data) _, err = s.Request("PUT", EndpointChannelPermission(channelID, targetID), data)
return return
} }
@ -1222,7 +1222,7 @@ func (s *Session) ChannelPermissionSet(channelID, targetID, targetType string, a
// NOTE: Name of this func may change. // NOTE: Name of this func may change.
func (s *Session) ChannelPermissionDelete(channelID, targetID string) (err error) { func (s *Session) ChannelPermissionDelete(channelID, targetID string) (err error) {
_, err = s.Request("DELETE", CHANNEL_PERMISSION(channelID, targetID), nil) _, err = s.Request("DELETE", EndpointChannelPermission(channelID, targetID), nil)
return return
} }
@ -1234,7 +1234,7 @@ func (s *Session) ChannelPermissionDelete(channelID, targetID string) (err error
// inviteID : The invite code (or maybe xkcdpass?) // inviteID : The invite code (or maybe xkcdpass?)
func (s *Session) Invite(inviteID string) (st *Invite, err error) { func (s *Session) Invite(inviteID string) (st *Invite, err error) {
body, err := s.Request("GET", INVITE(inviteID), nil) body, err := s.Request("GET", EndpointInvite(inviteID), nil)
if err != nil { if err != nil {
return return
} }
@ -1247,7 +1247,7 @@ func (s *Session) Invite(inviteID string) (st *Invite, err error) {
// inviteID : the code (or maybe xkcdpass?) of an invite // inviteID : the code (or maybe xkcdpass?) of an invite
func (s *Session) InviteDelete(inviteID string) (st *Invite, err error) { func (s *Session) InviteDelete(inviteID string) (st *Invite, err error) {
body, err := s.Request("DELETE", INVITE(inviteID), nil) body, err := s.Request("DELETE", EndpointInvite(inviteID), nil)
if err != nil { if err != nil {
return return
} }
@ -1260,7 +1260,7 @@ func (s *Session) InviteDelete(inviteID string) (st *Invite, err error) {
// inviteID : The invite code (or maybe xkcdpass?) // inviteID : The invite code (or maybe xkcdpass?)
func (s *Session) InviteAccept(inviteID string) (st *Invite, err error) { func (s *Session) InviteAccept(inviteID string) (st *Invite, err error) {
body, err := s.Request("POST", INVITE(inviteID), nil) body, err := s.Request("POST", EndpointInvite(inviteID), nil)
if err != nil { if err != nil {
return return
} }
@ -1276,7 +1276,7 @@ func (s *Session) InviteAccept(inviteID string) (st *Invite, err error) {
// VoiceRegions returns the voice server regions // VoiceRegions returns the voice server regions
func (s *Session) VoiceRegions() (st []*VoiceRegion, err error) { func (s *Session) VoiceRegions() (st []*VoiceRegion, err error) {
body, err := s.Request("GET", VOICE_REGIONS, nil) body, err := s.Request("GET", EndpointVoiceRegions, nil)
if err != nil { if err != nil {
return return
} }
@ -1288,7 +1288,7 @@ func (s *Session) VoiceRegions() (st []*VoiceRegion, err error) {
// VoiceICE returns the voice server ICE information // VoiceICE returns the voice server ICE information
func (s *Session) VoiceICE() (st *VoiceICE, err error) { func (s *Session) VoiceICE() (st *VoiceICE, err error) {
body, err := s.Request("GET", VOICE_ICE, nil) body, err := s.Request("GET", EndpointVoiceIce, nil)
if err != nil { if err != nil {
return return
} }
@ -1304,7 +1304,7 @@ func (s *Session) VoiceICE() (st *VoiceICE, err error) {
// Gateway returns the a websocket Gateway address // Gateway returns the a websocket Gateway address
func (s *Session) Gateway() (gateway string, err error) { func (s *Session) Gateway() (gateway string, err error) {
response, err := s.Request("GET", GATEWAY, nil) response, err := s.Request("GET", EndpointGateway, nil)
if err != nil { if err != nil {
return return
} }