diamondburned/arikawa
1
0
Fork 0
mirror of https://github.com/diamondburned/arikawa.git synced 2025-12-03 19:07:11 +00:00
Code Issues Releases Activity

discord: Add per-guild avatars, ModifyMe -> ModifyCurrentUser (#278)

Browse source 
* v3: discord, api, gateway: add per-guild avatars

* api: rename ModifyMe to ModifyCurrentUser
This commit is contained in:
starshines 2021-09-28 20:46:36 +02:00 committed by GitHub
parent 95231f5772
commit ca70e0cca9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
api/user.go
View file

@ -26,7 +26,7 @@ func (c *Client) Me() (*discord.User, error) {
} }
// https://discord.com/developers/docs/resources/user#modify-current-user-json-params // https://discord.com/developers/docs/resources/user#modify-current-user-json-params
type ModifySelfData struct { type ModifyCurrentUserData struct {
// Username is the user's username, if changed may cause the user's // Username is the user's username, if changed may cause the user's
// discriminator to be randomized. // discriminator to be randomized.
Username option.String `json:"username,omitempty"` Username option.String `json:"username,omitempty"`
@ -36,8 +36,8 @@ type ModifySelfData struct {
AuditLogReason `json:"-"` AuditLogReason `json:"-"`
} }
// ModifyMe modifies the requester's user account settings. // ModifyCurrentUser modifies the requester's user account settings.
func (c *Client) ModifyMe(data ModifySelfData) (*discord.User, error) { func (c *Client) ModifyCurrentUser(data ModifyCurrentUserData) (*discord.User, error) {
var u *discord.User var u *discord.User
return u, c.RequestJSON( return u, c.RequestJSON(
&u, &u,
@ -46,10 +46,10 @@ func (c *Client) ModifyMe(data ModifySelfData) (*discord.User, error) {
) )
} }
// ChangeOwnNickname modifies the nickname of the current user in a guild. // ModifyCurrentMember modifies the nickname of the current user in a guild.
// //
// Fires a Guild Member Update Gateway event. // Fires a Guild Member Update Gateway event.
func (c *Client) ChangeOwnNickname( func (c *Client) ModifyCurrentMember(
guildID discord.GuildID, nick string) error { guildID discord.GuildID, nick string) error {
var param struct { var param struct {
@ -60,7 +60,7 @@ func (c *Client) ChangeOwnNickname(
return c.FastRequest( return c.FastRequest(
"PATCH", "PATCH",
EndpointGuilds+guildID.String()+"/members/@me/nick", EndpointGuilds+guildID.String()+"/members/@me",
httputil.WithJSONBody(param), httputil.WithJSONBody(param),
) )
} }

20
discord/guild.go
View file

@ -328,6 +328,8 @@ type Member struct {
Nick string `json:"nick,omitempty"` Nick string `json:"nick,omitempty"`
// RoleIDs is an array of role object ids. // RoleIDs is an array of role object ids.
RoleIDs []RoleID `json:"roles"` RoleIDs []RoleID `json:"roles"`
// Avatar is this member's guild avatar.
Avatar Hash `json:"avatar,omitempty"`
// Joined specifies when the user joined the guild. // Joined specifies when the user joined the guild.
Joined Timestamp `json:"joined_at"` Joined Timestamp `json:"joined_at"`
@ -348,6 +350,24 @@ func (m Member) Mention() string {
return "<@!" + m.User.ID.String() + ">" return "<@!" + m.User.ID.String() + ">"
} }
// AvatarURL returns the URL of the Avatar Image. It automatically detects a
// suitable type.
func (m Member) AvatarURL(guild GuildID) string {
return m.AvatarURLWithType(AutoImage, guild)
}
// AvatarURLWithType returns the URL of the Avatar Image using the passed type.
// If the member has no Avatar, an empty string will be returned.
//
// Supported Image Types: PNG, JPEG, WebP, GIF
func (m Member) AvatarURLWithType(t ImageType, guild GuildID) string {
if m.Avatar == "" {
return ""
}
return "https://cdn.discordapp.com/guilds/" + guild.String() + "/users/" + m.User.ID.String() + "/avatars/" + t.format(m.Avatar)
}
// https://discord.com/developers/docs/resources/guild#ban-object // https://discord.com/developers/docs/resources/guild#ban-object
type Ban struct { type Ban struct {
// Reason is the reason for the ban. // Reason is the reason for the ban.

2
gateway/events.go
View file

@ -166,6 +166,7 @@ type (
RoleIDs []discord.RoleID `json:"roles"` RoleIDs []discord.RoleID `json:"roles"`
User discord.User `json:"user"` User discord.User `json:"user"`
Nick string `json:"nick"` Nick string `json:"nick"`
Avatar discord.Hash `json:"avatar"`
} }
// GuildMembersChunkEvent is sent when Guild Request Members is called. // GuildMembersChunkEvent is sent when Guild Request Members is called.
@ -247,6 +248,7 @@ func (u GuildMemberUpdateEvent) Update(m *discord.Member) {
m.RoleIDs = u.RoleIDs m.RoleIDs = u.RoleIDs
m.User = u.User m.User = u.User
m.Nick = u.Nick m.Nick = u.Nick
m.Avatar = u.Avatar
} }
// https://discord.com/developers/docs/topics/gateway#invites // https://discord.com/developers/docs/topics/gateway#invites