Support many more idioms.

endpoints.go

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

oauth2.go

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

restapi.go

@@ -184,7 +184,7 @@ func (s *Session) Login(email, password string) (err error) {
 		Password string `json:"password"`
 	}{email, password}
 
-	response, err := s.Request("POST", LOGIN, data)
+	response, err := s.Request("POST", EndpointLogin, data)
 	if err != nil {
 		return
 	}
@@ -211,7 +211,7 @@ func (s *Session) Register(username string) (token string, err error) {
 		Username string `json:"username"`
 	}{username}
 
-	response, err := s.Request("POST", REGISTER, data)
+	response, err := s.Request("POST", EndpointRegister, data)
 	if err != nil {
 		return
 	}
@@ -245,7 +245,7 @@ func (s *Session) Logout() (err error) {
 		Token string `json:"token"`
 	}{s.Token}
 
-	_, err = s.Request("POST", LOGOUT, data)
+	_, err = s.Request("POST", EndpointLogout, data)
 	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
 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 {
 		return
 	}
@@ -274,7 +274,7 @@ func (s *Session) UserAvatar(userID string) (img image.Image, err error) {
 		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 {
 		return
 	}
@@ -299,7 +299,7 @@ func (s *Session) UserUpdate(email, password, username, avatar, newPassword stri
 		NewPassword string `json:"new_password,omitempty"`
 	}{email, password, username, avatar, newPassword}
 
-	body, err := s.Request("PATCH", USER("@me"), data)
+	body, err := s.Request("PATCH", EndpointUser("@me"), data)
 	if err != nil {
 		return
 	}
@@ -311,7 +311,7 @@ func (s *Session) UserUpdate(email, password, username, avatar, newPassword stri
 // UserSettings returns the settings for a given user
 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 {
 		return
 	}
@@ -324,7 +324,7 @@ func (s *Session) UserSettings() (st *Settings, err error) {
 // channels.
 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 {
 		return
 	}
@@ -341,7 +341,7 @@ func (s *Session) UserChannelCreate(recipientID string) (st *Channel, err error)
 		RecipientID string `json:"recipient_id"`
 	}{recipientID}
 
-	body, err := s.Request("POST", USER_CHANNELS("@me"), data)
+	body, err := s.Request("POST", EndpointUserChannels("@me"), data)
 	if err != nil {
 		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.
 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 {
 		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 {
 		return
 	}
@@ -458,7 +458,7 @@ func (s *Session) GuildCreate(name string) (st *Guild, err error) {
 		Name string `json:"name"`
 	}{name}
 
-	body, err := s.Request("POST", GUILDS, data)
+	body, err := s.Request("POST", EndpointGuilds, data)
 	if err != nil {
 		return
 	}
@@ -506,7 +506,7 @@ func (s *Session) GuildEdit(guildID string, g GuildParams) (st *Guild, err error
 		VerificationLevel *VerificationLevel `json:"verification_level,omitempty"`
 	}{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 {
 		return
 	}
@@ -519,7 +519,7 @@ func (s *Session) GuildEdit(guildID string, g GuildParams) (st *Guild, err error
 // guildID   : The ID of a Guild
 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 {
 		return
 	}
@@ -532,7 +532,7 @@ func (s *Session) GuildDelete(guildID string) (st *Guild, err error) {
 // guildID   : The ID of a Guild
 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
 }
 
@@ -541,7 +541,7 @@ func (s *Session) GuildLeave(guildID string) (err error) {
 // guildID   : The ID of a Guild.
 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 {
 		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.
 func (s *Session) GuildBanCreate(guildID, userID string, days int) (err error) {
 
-	uri := GUILD_BAN(guildID, userID)
+	uri := EndpointGuildBan(guildID, userID)
 
 	if days > 0 {
 		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
 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
 }
 
@@ -582,7 +582,7 @@ func (s *Session) GuildBanDelete(guildID, userID string) (err error) {
 //  limit    : max number of members to return (max 1000)
 func (s *Session) GuildMembers(guildID string, offset, limit int) (st []*Member, err error) {
 
-	uri := GUILD_MEMBERS(guildID)
+	uri := EndpointGuildMembers(guildID)
 
 	v := url.Values{}
 
@@ -612,7 +612,7 @@ func (s *Session) GuildMembers(guildID string, offset, limit int) (st []*Member,
 //  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)
+	body, err := s.Request("GET", EndpointGuildMember(guildID, userID), nil)
 	if err != nil {
 		return
 	}
@@ -626,7 +626,7 @@ func (s *Session) GuildMember(guildID, userID string) (st *Member, err error) {
 // userID    : The ID of a User
 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
 }
 
@@ -640,7 +640,7 @@ func (s *Session) GuildMemberEdit(guildID, userID string, roles []string) (err e
 		Roles []string `json:"roles"`
 	}{roles}
 
-	_, err = s.Request("PATCH", GUILD_MEMBER(guildID, userID), data)
+	_, err = s.Request("PATCH", EndpointGuildMember(guildID, userID), data)
 	if err != nil {
 		return
 	}
@@ -660,7 +660,7 @@ func (s *Session) GuildMemberMove(guildID, userID, channelID string) (err error)
 		ChannelID string `json:"channel_id"`
 	}{channelID}
 
-	_, err = s.Request("PATCH", GUILD_MEMBER(guildID, userID), data)
+	_, err = s.Request("PATCH", EndpointGuildMember(guildID, userID), data)
 	if err != nil {
 		return
 	}
@@ -677,7 +677,7 @@ func (s *Session) GuildMemberNickname(guildID, userID, nickname string) (err err
 		Nick string `json:"nick"`
 	}{nickname}
 
-	_, err = s.Request("PATCH", GUILD_MEMBER(guildID, userID), data)
+	_, err = s.Request("PATCH", EndpointGuildMember(guildID, userID), data)
 	return
 }
 
@@ -686,7 +686,7 @@ func (s *Session) GuildMemberNickname(guildID, userID, nickname string) (err err
 // guildID   : The ID of a Guild.
 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 {
 		return
 	}
@@ -707,7 +707,7 @@ func (s *Session) GuildChannelCreate(guildID, name, ctype string) (st *Channel,
 		Type string `json:"type"`
 	}{name, ctype}
 
-	body, err := s.Request("POST", GUILD_CHANNELS(guildID), data)
+	body, err := s.Request("POST", EndpointGuildChannels(guildID), data)
 	if err != nil {
 		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
 // guildID   : The ID of a Guild.
 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 {
 		return
 	}
@@ -732,7 +732,7 @@ func (s *Session) GuildInvites(guildID string) (st []*Invite, err error) {
 // guildID   : The ID of a Guild.
 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 {
 		return
 	}
@@ -746,7 +746,7 @@ func (s *Session) GuildRoles(guildID string) (st []*Role, err error) {
 // guildID: The ID of a Guild.
 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 {
 		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)
 	}{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 {
 		return
 	}
@@ -792,7 +792,7 @@ func (s *Session) GuildRoleEdit(guildID, roleID, name string, color int, hoist b
 // roles     : A list of ordered roles.
 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 {
 		return
 	}
@@ -807,7 +807,7 @@ func (s *Session) GuildRoleReorder(guildID string, roles []*Role) (st []*Role, e
 // roleID    : The ID of a Role.
 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
 }
@@ -816,7 +816,7 @@ func (s *Session) GuildRoleDelete(guildID, roleID string) (err error) {
 // guildID   : The ID of a Guild.
 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 {
 		return
 	}
@@ -837,7 +837,7 @@ func (s *Session) GuildIntegrationCreate(guildID, integrationType, integrationID
 		Id   string `json:"id"`
 	}{integrationType, integrationID}
 
-	_, err = s.Request("POST", GUILD_INTEGRATIONS(guildID), data)
+	_, err = s.Request("POST", EndpointGuildIntegrations(guildID), data)
 	return
 }
 
@@ -856,7 +856,7 @@ func (s *Session) GuildIntegrationEdit(guildID, integrationID string, expireBeha
 		EnableEmoticons   bool `json:"enable_emoticons"`
 	}{expireBehavior, expireGracePeriod, enableEmoticons}
 
-	_, err = s.Request("PATCH", GUILD_INTEGRATION(guildID, integrationID), data)
+	_, err = s.Request("PATCH", EndpointGuildIntegration(guildID, integrationID), data)
 	return
 }
 
@@ -865,7 +865,7 @@ func (s *Session) GuildIntegrationEdit(guildID, integrationID string, expireBeha
 // integrationID    : The ID of an integration.
 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
 }
 
@@ -874,7 +874,7 @@ func (s *Session) GuildIntegrationDelete(guildID, integrationID string) (err err
 // integrationID    : The ID of an integration.
 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
 }
 
@@ -891,7 +891,7 @@ func (s *Session) GuildIcon(guildID string) (img image.Image, err error) {
 		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 {
 		return
 	}
@@ -913,7 +913,7 @@ func (s *Session) GuildSplash(guildID string) (img image.Image, err error) {
 		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 {
 		return
 	}
@@ -926,7 +926,7 @@ func (s *Session) GuildSplash(guildID string) (img image.Image, err error) {
 // guildID   : The ID of a Guild.
 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 {
 		return
 	}
@@ -941,7 +941,7 @@ func (s *Session) GuildEmbedEdit(guildID string, enabled bool, channelID string)
 
 	data := GuildEmbed{enabled, channelID}
 
-	_, err = s.Request("PATCH", GUILD_EMBED(guildID), data)
+	_, err = s.Request("PATCH", EndpointGuildEmbed(guildID), data)
 	return
 }
 
@@ -952,7 +952,7 @@ func (s *Session) GuildEmbedEdit(guildID string, enabled bool, channelID string)
 // Channel returns a Channel strucutre of a specific Channel.
 // channelID  : The ID of the Channel you want returned.
 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 {
 		return
 	}
@@ -970,7 +970,7 @@ func (s *Session) ChannelEdit(channelID, name string) (st *Channel, err error) {
 		Name string `json:"name"`
 	}{name}
 
-	body, err := s.Request("PATCH", CHANNEL(channelID), data)
+	body, err := s.Request("PATCH", EndpointChannel(channelID), data)
 	if err != nil {
 		return
 	}
@@ -983,7 +983,7 @@ func (s *Session) ChannelEdit(channelID, name string) (st *Channel, err error) {
 // channelID  : The ID of a Channel
 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 {
 		return
 	}
@@ -997,7 +997,7 @@ func (s *Session) ChannelDelete(channelID string) (st *Channel, err error) {
 // channelID  : The ID of a Channel
 func (s *Session) ChannelTyping(channelID string) (err error) {
 
-	_, err = s.Request("POST", CHANNEL_TYPING(channelID), nil)
+	_, err = s.Request("POST", EndpointChannelTyping(channelID), nil)
 	return
 }
 
@@ -1009,7 +1009,7 @@ func (s *Session) ChannelTyping(channelID string) (err error) {
 // 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) {
 
-	uri := CHANNEL_MESSAGES(channelID)
+	uri := EndpointChannelMessages(channelID)
 
 	v := url.Values{}
 	if limit > 0 {
@@ -1039,7 +1039,7 @@ func (s *Session) ChannelMessages(channelID string, limit int, beforeID, afterID
 // messageID : the ID of a Message
 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
 }
 
@@ -1056,7 +1056,7 @@ func (s *Session) channelMessageSend(channelID, content string, tts bool) (st *M
 	}{content, tts}
 
 	// 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 {
 		return
 	}
@@ -1091,7 +1091,7 @@ func (s *Session) ChannelMessageEdit(channelID, messageID, content string) (st *
 		Content string `json:"content"`
 	}{content}
 
-	response, err := s.Request("PATCH", CHANNEL_MESSAGE(channelID, messageID), data)
+	response, err := s.Request("PATCH", EndpointChannelMessage(channelID, messageID), data)
 	if err != nil {
 		return
 	}
@@ -1103,7 +1103,7 @@ func (s *Session) ChannelMessageEdit(channelID, messageID, content string) (st *
 // ChannelMessageDelete deletes a message from the Channel.
 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
 }
 
@@ -1131,7 +1131,7 @@ func (s *Session) ChannelMessagesBulkDelete(channelID string, messages []string)
 		Messages []string `json:"messages"`
 	}{messages}
 
-	_, err = s.Request("POST", CHANNEL_MESSAGES_BULK_DELETE(channelID), data)
+	_, err = s.Request("POST", EndpointChannelMessagesBulkDelete(channelID), data)
 	return
 }
 
@@ -1158,7 +1158,7 @@ func (s *Session) ChannelFileSend(channelID, name string, r io.Reader) (st *Mess
 		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 {
 		return
 	}
@@ -1171,7 +1171,7 @@ func (s *Session) ChannelFileSend(channelID, name string, r io.Reader) (st *Mess
 // channelID   : The ID of a Channel
 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 {
 		return
 	}
@@ -1193,7 +1193,7 @@ func (s *Session) ChannelInviteCreate(channelID string, i Invite) (st *Invite, e
 		XKCDPass  string `json:"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 {
 		return
 	}
@@ -1214,7 +1214,7 @@ func (s *Session) ChannelPermissionSet(channelID, targetID, targetType string, a
 		Deny  int    `json:"deny"`
 	}{targetID, targetType, allow, deny}
 
-	_, err = s.Request("PUT", CHANNEL_PERMISSION(channelID, targetID), data)
+	_, err = s.Request("PUT", EndpointChannelPermission(channelID, targetID), data)
 	return
 }
 
@@ -1222,7 +1222,7 @@ func (s *Session) ChannelPermissionSet(channelID, targetID, targetType string, a
 // NOTE: Name of this func may change.
 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
 }
 
@@ -1234,7 +1234,7 @@ func (s *Session) ChannelPermissionDelete(channelID, targetID string) (err error
 // inviteID : The invite code (or maybe xkcdpass?)
 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 {
 		return
 	}
@@ -1247,7 +1247,7 @@ func (s *Session) Invite(inviteID string) (st *Invite, err error) {
 // inviteID   : the code (or maybe xkcdpass?) of an invite
 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 {
 		return
 	}
@@ -1260,7 +1260,7 @@ func (s *Session) InviteDelete(inviteID string) (st *Invite, err error) {
 // inviteID : The invite code (or maybe xkcdpass?)
 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 {
 		return
 	}
@@ -1276,7 +1276,7 @@ func (s *Session) InviteAccept(inviteID string) (st *Invite, err error) {
 // VoiceRegions returns the voice server regions
 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 {
 		return
 	}
@@ -1288,7 +1288,7 @@ func (s *Session) VoiceRegions() (st []*VoiceRegion, err error) {
 // VoiceICE returns the voice server ICE information
 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 {
 		return
 	}
@@ -1304,7 +1304,7 @@ func (s *Session) VoiceICE() (st *VoiceICE, err error) {
 // Gateway returns the a websocket Gateway address
 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 {
 		return
 	}