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

Merge branch 'develop' of https://github.com/bwmarrin/Discordgo into develop

Browse source
This commit is contained in:
Bruce Marriner 2016-04-25 11:52:06 -05:00
commit 7f6d256dda
1 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
structs.go
View file

@ -252,14 +252,25 @@ type User struct {
// A Settings stores data for a specific users Discord client settings. // A Settings stores data for a specific users Discord client settings.
type Settings struct { type Settings struct {
RenderEmbeds bool `json:"render_embeds"` RenderEmbeds bool `json:"render_embeds"`
InlineEmbedMedia bool `json:"inline_embed_media"` InlineEmbedMedia bool `json:"inline_embed_media"`
EnableTtsCommand bool `json:"enable_tts_command"` InlineAttachmentMedia bool `json:"inline_attachment_media"`
MessageDisplayCompact bool `json:"message_display_compact"` EnableTtsCommand bool `json:"enable_tts_command"`
ShowCurrentGame bool `json:"show_current_game"` MessageDisplayCompact bool `json:"message_display_compact"`
Locale string `json:"locale"` ShowCurrentGame bool `json:"show_current_game"`
Theme string `json:"theme"` Locale string `json:"locale"`
MutedChannels []string `json:"muted_channels"` Theme string `json:"theme"`
RestrictedGuilds []string `json:"restricted_guilds"`
AllowEmailFriendRequest bool `json:"allow_email_friend_request"`
ConvertEmoticons bool `json:"convert_emoticons"`
FriendSourceFlags *FriendSourceFlags `json:"friend_source_flags"`
}
type FriendSourceFlags struct {
All bool `json:"all"`
MutualGuilds bool `json:"mutual_guilds"`
MutualFriends bool `json:"mutual_friends"`
} }
// An Event provides a basic initial struct for all websocket event. // An Event provides a basic initial struct for all websocket event.
@ -281,6 +292,19 @@ type Ready struct {
ReadState []*ReadState `json:"read_state"` ReadState []*ReadState `json:"read_state"`
PrivateChannels []*Channel `json:"private_channels"` PrivateChannels []*Channel `json:"private_channels"`
Guilds []*Guild `json:"guilds"` Guilds []*Guild `json:"guilds"`
// Undocumented fields
Settings *Settings `json:"user_settings"`
UserGuildSettings []*UserGuildSettings `json:"user_guild_settings"`
Relationships []*Relationship `json:"relationships"`
Presences []*Presence `json:"presences"`
}
// A Relationship between the logged in user and Relationship.User
type Relationship struct {
User *User `json:"user"`
Type int `json:"type"` // 1 = friend, 2 = blocked, 3 = incoming friend req, 4 = sent friend req
ID string `json:"id"`
} }
// A RateLimit struct holds information related to a specific rate limit. // A RateLimit struct holds information related to a specific rate limit.