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

structs.go

@@ -254,12 +254,23 @@ type User struct {
 type Settings struct {
 	RenderEmbeds          bool   `json:"render_embeds"`
 	InlineEmbedMedia      bool   `json:"inline_embed_media"`
+	InlineAttachmentMedia bool   `json:"inline_attachment_media"`
 	EnableTtsCommand      bool   `json:"enable_tts_command"`
 	MessageDisplayCompact bool   `json:"message_display_compact"`
 	ShowCurrentGame       bool   `json:"show_current_game"`
 	Locale                string `json:"locale"`
 	Theme                 string `json:"theme"`
-	MutedChannels         []string `json:"muted_channels"`
+
+	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.
@@ -281,6 +292,19 @@ type Ready struct {
 	ReadState         []*ReadState  `json:"read_state"`
 	PrivateChannels   []*Channel    `json:"private_channels"`
 	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.