From 5223f886b20d64a72c242b191a9dcb6be2f62f43 Mon Sep 17 00:00:00 2001
From: Luke Mathew-Byrne <11181703+LMByrne@users.noreply.github.com>
Date: Thu, 30 May 2019 19:54:59 +0100
Subject: [PATCH] Discord Nitro Boosting support + rich presence chat embeds
 (#140)

* anticipated nitro server boosting

* documentation changes + Message Rich Presence support

* str to int

* 2
---
 disco/types/guild.py   | 19 +++++++++++---
 disco/types/message.py | 56 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/disco/types/guild.py b/disco/types/guild.py
index af4524e..f49576a 100644
--- a/disco/types/guild.py
+++ b/disco/types/guild.py
@@ -153,6 +153,8 @@ class GuildMember(SlottedModel):
         When this user joined the guild.
     roles : list(snowflake)
         Roles this member is part of.
+    premium_since : datetime
+        When this user set their nitro boost to this server.
     """
     user = Field(User)
     guild_id = Field(snowflake)
@@ -161,6 +163,7 @@ class GuildMember(SlottedModel):
     deaf = Field(bool)
     joined_at = Field(datetime)
     roles = ListField(snowflake)
+    premium_since = Field(datetime)
 
     def __str__(self):
         return self.user.__str__()
@@ -306,6 +309,10 @@ class Guild(SlottedModel, Permissible):
         All of the guild's emojis.
     voice_states : dict(str, :class:`disco.types.voice.VoiceState`)
         All of the guild's voice states.
+    premium_tier : int
+        Guild's premium tier.
+    premium_subscription_count: int
+        The amount of users using their nitro boost on this guild.
     """
     id = Field(snowflake)
     owner_id = Field(snowflake)
@@ -330,6 +337,8 @@ class Guild(SlottedModel, Permissible):
     emojis = AutoDictField(GuildEmoji, 'id')
     voice_states = AutoDictField(VoiceState, 'session_id')
     member_count = Field(int)
+    premium_tier = Field(int)
+    premium_subscription_count = Field(int)
 
     def __init__(self, *args, **kwargs):
         super(Guild, self).__init__(*args, **kwargs)
@@ -513,11 +522,15 @@ class Guild(SlottedModel, Permissible):
     def get_emoji(self, emoji):
         return self.client.api.guilds_emojis_get(self.id, emoji)
 
-    def get_icon_url(self, fmt='webp', size=1024):
+    def get_icon_url(self, fmt=None, size=1024):
         if not self.icon:
             return ''
-
-        return 'https://cdn.discordapp.com/icons/{}/{}.{}?size={}'.format(self.id, self.icon, fmt, size)
+        if fmt is not None:
+            return 'https://cdn.discordapp.com/icons/{}/{}.{}?size={}'.format(self.id, self.icon, fmt, size)
+        if self.icon.startswith('a_'):
+            return 'https://cdn.discordapp.com/avatars/{}/{}.gif?size={}'.format(self.id, self.icon, size)
+        else:
+            return 'https://cdn.discordapp.com/avatars/{}/{}.webp?size={}'.format(self.id, self.icon, size)
 
     def get_splash_url(self, fmt='webp', size=1024):
         if not self.splash:
diff --git a/disco/types/message.py b/disco/types/message.py
index 01b020c..ae03e5d 100644
--- a/disco/types/message.py
+++ b/disco/types/message.py
@@ -22,6 +22,17 @@ class MessageType(object):
     CHANNEL_ICON_CHANGE = 5
     PINS_ADD = 6
     GUILD_MEMBER_JOIN = 7
+    USER_PREMIUM_GUILD_SUBSCRIPTION = 8
+    USER_PREMIUM_GUILD_SUBSCRIPTION_TIER_1 = 9
+    USER_PREMIUM_GUILD_SUBSCRIPTION_TIER_2 = 10
+    USER_PREMIUM_GUILD_SUBSCRIPTION_TIER_3 = 11
+
+
+class MessageActivityType(object):
+    JOIN = 1
+    SPECTATE = 2
+    LISTEN = 3
+    JOIN_REQUEST = 5
 
 
 class Emoji(SlottedModel):
@@ -81,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 = Field(text)
+
+
 class MessageEmbedFooter(SlottedModel):
     """
     A footer for the `MessageEmbed`.
@@ -347,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)
@@ -365,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)