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

Make User commands accessible only to @me

Browse source
This commit is contained in:
Chris Rhodes 2016-01-10 21:20:19 -08:00
parent 00cd5cb178
commit 918ee4205d
1 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
restapi.go
View file

@ -180,8 +180,7 @@ func (s *Session) User(userID string) (st *User, err error) {
} }
// UserUpdate updates a users settings. // UserUpdate updates a users settings.
// userID : A user ID or "@me" which is a shortcut of current user ID func (s *Session) UserUpdate(email, password, username, avatar, newPassword string) (st *User, err error) {
func (s *Session) UserUpdate(userID, email, password, username, avatar, newPassword string) (st *User, err error) {
// NOTE: Avatar must be either the hash/id of existing Avatar or // NOTE: Avatar must be either the hash/id of existing Avatar or
// data:image/png;base64,BASE64_STRING_OF_NEW_AVATAR_PNG // data:image/png;base64,BASE64_STRING_OF_NEW_AVATAR_PNG
@ -196,7 +195,7 @@ func (s *Session) UserUpdate(userID, email, password, username, avatar, newPassw
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(userID), data) body, err := s.Request("PATCH", USER("@me"), data)
err = json.Unmarshal(body, &st) err = json.Unmarshal(body, &st)
return return
} }
@ -218,45 +217,37 @@ func (s *Session) UserAvatar(userID string) (img image.Image, err error) {
} }
// UserSettings returns the settings for a given user // UserSettings returns the settings for a given user
// userID : A user ID or "@me" which is a shortcut of current user ID
// This seems to only return a result for "@me"
func (s *Session) UserSettings(userID string) (st *Settings, err error) { func (s *Session) UserSettings(userID string) (st *Settings, err error) {
body, err := s.Request("GET", USER_SETTINGS(userID), nil) body, err := s.Request("GET", USER_SETTINGS("@me"), nil)
err = json.Unmarshal(body, &st) err = json.Unmarshal(body, &st)
return return
} }
// UserChannels returns an array of Channel structures for all private // UserChannels returns an array of Channel structures for all private
// channels for a user // channels.
// userID : A user ID or "@me" which is a shortcut of current user ID func (s *Session) UserChannels() (st []*Channel, err error) {
func (s *Session) UserChannels(userID string) (st []*Channel, err error) {
body, err := s.Request("GET", USER_CHANNELS(userID), nil) body, err := s.Request("GET", USER_CHANNELS("@me"), nil)
err = json.Unmarshal(body, &st) err = json.Unmarshal(body, &st)
return return
} }
// UserChannelCreate creates a new User (Private) Channel with another User // UserChannelCreate creates a new User (Private) Channel with another User
// userID : A user ID or "@me" which is a shortcut of current user ID
// recipientID : A user ID for the user to which this channel is opened with. // recipientID : A user ID for the user to which this channel is opened with.
func (s *Session) UserChannelCreate(userID, recipientID string) (st *Channel, err error) { func (s *Session) UserChannelCreate(recipientID string) (st *Channel, err error) {
data := struct { data := struct {
RecipientID string `json:"recipient_id"` RecipientID string `json:"recipient_id"`
}{recipientID} }{recipientID}
body, err := s.Request( body, err := s.Request("POST", USER_CHANNELS("@me"), data)
"POST",
USER_CHANNELS(userID),
data)
err = json.Unmarshal(body, &st) err = json.Unmarshal(body, &st)
return return
} }
// UserGuilds returns an array of Guild structures for all guilds for a given user // UserGuilds returns an array of Guild structures for all guilds.
// userID : A user ID or "@me" which is a shortcut of current user ID
func (s *Session) UserGuilds(userID string) (st []*Guild, err error) { func (s *Session) UserGuilds(userID string) (st []*Guild, err error) {
body, err := s.Request("GET", USER_GUILDS(userID), nil) body, err := s.Request("GET", USER_GUILDS(userID), nil)