From 85cd1ef9dff3e490406f0b6b4f6991437ba0b0a5 Mon Sep 17 00:00:00 2001
From: Luke <LMByrne@users.noreply.github.com>
Date: Wed, 29 May 2019 02:12:36 +0100
Subject: [PATCH] documentation changes + Message Rich Presence support

---
 disco/types/guild.py   |  4 ++--
 disco/types/message.py | 52 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/disco/types/guild.py b/disco/types/guild.py
index f8853ee..5d48f7c 100644
--- a/disco/types/guild.py
+++ b/disco/types/guild.py
@@ -154,7 +154,7 @@ class GuildMember(SlottedModel):
     roles : list(snowflake)
         Roles this member is part of.
     premium_since : datetime
-        When this users subscribed to the guild's premium
+        When this user set their nitro boost to this server.
     """
     user = Field(User)
     guild_id = Field(snowflake)
@@ -306,7 +306,7 @@ class Guild(SlottedModel, Permissible):
     premium_tier : int
         Guild's premium tier.
     premium_subscription_count: int
-        The amount of users subscribed to the guild's premium.
+        The amount of users using their nitro boost on this guild.
     """
     id = Field(snowflake)
     owner_id = Field(snowflake)
diff --git a/disco/types/message.py b/disco/types/message.py
index 2b1aa35..d8434c5 100644
--- a/disco/types/message.py
+++ b/disco/types/message.py
@@ -28,6 +28,13 @@ class MessageType(object):
     USER_PREMIUM_GUILD_SUBSCRIPTION_TIER_3 = 11
 
 
+class MessageActivityType(object):
+    JOIN = 1
+    SPECTATE = 2
+    LISTEN = 3
+    JOIN_REQUEST = 5
+
+
 class Emoji(SlottedModel):
     """
     Represents either a standard or custom Discord emoji.
@@ -85,6 +92,45 @@ class MessageReaction(SlottedModel):
     me = Field(bool)
 
 
+class MessageApplication(SlottedModel):
+    """
+    The application of a Rich Presence-related chat embed.
+
+    Attributes
+    ----------
+    id : snowflake
+        The id of the application.
+    cover_image : str
+        The id of the embed's image asset.
+    description : str
+        The application's description.
+    icon : str
+        The id of the application's icon.
+    name : str
+        The name of the application.
+    """
+    id = Field(snowflake)
+    cover_image = Field(text)
+    description = Field(text)
+    icon = Field(text)
+    name = Field(text)
+
+
+class MessageActivity(SlottedModel):
+    """
+    The activity of a Rich Presence-related chat embed.
+
+    Attributes
+    ----------
+    type : `MessageActivityType`
+        The type of message activity.
+    party_id : str
+        The party id from a Rich Presence event.
+    """
+    type = Field(enum(MessageActivityType))
+    party_id = int(str)
+
+
 class MessageEmbedFooter(SlottedModel):
     """
     A footer for the `MessageEmbed`.
@@ -351,6 +397,10 @@ class Message(SlottedModel):
         Attachments for this message.
     reactions : list[`MessageReaction`]
         Reactions for this message.
+    activity : `MessageActivity`
+        The activity of a Rich Presence-related chat embed.
+    application : `MessageApplication`
+        The application of a Rich Presence-related chat embed.
     """
     id = Field(snowflake)
     channel_id = Field(snowflake)
@@ -369,6 +419,8 @@ class Message(SlottedModel):
     embeds = ListField(MessageEmbed)
     attachments = AutoDictField(MessageAttachment, 'id')
     reactions = ListField(MessageReaction)
+    activity = Field(MessageActivity)
+    application = Field(MessageApplication)
 
     def __str__(self):
         return '<Message {} ({})>'.format(self.id, self.channel_id)