From 6f4d982acac4412ffdd963b3a3e2fc49d60115ab Mon Sep 17 00:00:00 2001
From: Justin <14909116+ThatGuyJustin@users.noreply.github.com>
Date: Sun, 6 Oct 2019 19:04:12 -0400
Subject: [PATCH 1/9] Local Fixes & Client UserUpdate Gateway Event (#147)

* Local Fixes & Client UserUpdate Gateway Event

- Changed 'READ_MESSAGES' to 'VIEW_CHANNEL' to keep with Discord's API Docs
- Defaulted Guild.premium_subscription_count to 0 to stop error
- max_presences to 5,000 as Discord's API Suggest
- Added UserUpdate event for when the Client user is updated.

* Flake8 Spacing

* Update state.py
---
 disco/gateway/events.py    | 12 ++++++++++++
 disco/state.py             |  3 +++
 disco/types/guild.py       |  2 +-
 disco/types/permissions.py |  2 +-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/disco/gateway/events.py b/disco/gateway/events.py
index ab45662..e187502 100644
--- a/disco/gateway/events.py
+++ b/disco/gateway/events.py
@@ -714,3 +714,15 @@ class MessageReactionRemoveAll(GatewayEvent):
     @property
     def guild(self):
         return self.channel.guild
+
+
+@wraps_model(User)
+class UserUpdate(GatewayEvent):
+    """
+    Sent when the client user is updated.
+
+    Attributes
+    -----
+    user : :class:`disco.types.user.User`
+        The updated user object.
+    """
diff --git a/disco/state.py b/disco/state.py
index b78e2ef..28a54ff 100644
--- a/disco/state.py
+++ b/disco/state.py
@@ -153,6 +153,9 @@ class State(object):
             self.dms[dm.id] = dm
             self.channels[dm.id] = dm
 
+    def on_user_update(self, event):
+        self.me.inplace_update(event.user)
+
     def on_message_create(self, event):
         if self.config.track_messages:
             self.messages[event.message.channel_id].append(
diff --git a/disco/types/guild.py b/disco/types/guild.py
index db49430..55efdb5 100644
--- a/disco/types/guild.py
+++ b/disco/types/guild.py
@@ -340,7 +340,7 @@ class Guild(SlottedModel, Permissible):
     premium_tier = Field(int)
     premium_subscription_count = Field(int, default=0)
     vanity_url_code = Field(text)
-    max_presences = Field(int)
+    max_presences = Field(int, default=5000)
     max_members = Field(int)
     description = Field(text)
 
diff --git a/disco/types/permissions.py b/disco/types/permissions.py
index e60c120..f6ebe0f 100644
--- a/disco/types/permissions.py
+++ b/disco/types/permissions.py
@@ -11,7 +11,7 @@ class Permissions(object):
     ADD_REACTIONS = 1 << 6
     VIEW_AUDIT_LOG = 1 << 7
     PRIORITY_SPEAKER = 1 << 8
-    READ_MESSAGES = 1 << 10
+    VIEW_CHANNEL = 1 << 10
     SEND_MESSAGES = 1 << 11
     SEND_TSS_MESSAGES = 1 << 12
     MANAGE_MESSAGES = 1 << 13

From 7a1c1a193d3b57e2c2a27624d9fe679959cd6000 Mon Sep 17 00:00:00 2001
From: tristanatfarkas <15787558+trilleplay@users.noreply.github.com>
Date: Mon, 7 Oct 2019 21:05:33 +0200
Subject: [PATCH 2/9] Use actual OS for IDENTIFYs. (#154)

* Use actual OS.

* This should work on linux aswell.

* Move to the system namespace.

Co-Authored-By: Andrei Zbikowski <b1naryth1ef@users.noreply.github.com>
---
 disco/gateway/client.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/disco/gateway/client.py b/disco/gateway/client.py
index a951145..e997a98 100644
--- a/disco/gateway/client.py
+++ b/disco/gateway/client.py
@@ -3,6 +3,7 @@ import zlib
 import six
 import ssl
 
+import platform
 from websocket import ABNF
 
 from disco.gateway.packets import OPCode, RECV, SEND
@@ -219,7 +220,7 @@ class GatewayClient(LoggingClass):
                     int(self.client.config.shard_count),
                 ],
                 'properties': {
-                    '$os': 'linux',
+                    '$os': platform.system(),
                     '$browser': 'disco',
                     '$device': 'disco',
                     '$referrer': '',

From 58641601391cff3c66826d0d0e487ed66b9ce967 Mon Sep 17 00:00:00 2001
From: Faster Speeding <luke@lmbyrne.dev>
Date: Tue, 8 Oct 2019 18:26:19 +0000
Subject: [PATCH 3/9] Switch to requests session persistant headers, add api
 bits, vanity_url property to guild and fix some event & embed behaviours.
 (#153)

* guild_subscriptions

* Replace get_vanity_url function with vanity_url property on guild object.

* Add voice regions + conform guild.vanity_url to standard seen for other url properties on guild.

* style change.

* Add guild prune and prune count.

* Switch to requests session persistent headers

* add Stream permission

* guild.preferred_locale

* Fix logic on GuildCreate and GuildDelete shotcut properties.

* preferred_locale already added in another pr.

* Convert embed datetime timestamp to iso8610 format for api calls.

* Update disco/types/voice.py

Co-Authored-By: Andrei Zbikowski <b1naryth1ef@users.noreply.github.com>

* remove botch isoformat on embed method

* Apply suggestions from code review

Co-Authored-By: Andrei Zbikowski <b1naryth1ef@users.noreply.github.com>

* More suggestions from code review
---
 disco/api/client.py        | 22 +++++++++++++++++++++-
 disco/api/http.py          | 24 +++++++++++-------------
 disco/client.py            |  3 +++
 disco/gateway/client.py    |  1 +
 disco/gateway/events.py    | 10 +++++-----
 disco/types/guild.py       | 26 +++++++++++++++++++++++---
 disco/types/permissions.py |  1 +
 disco/types/voice.py       | 17 ++++++++++++++++-
 8 files changed, 81 insertions(+), 23 deletions(-)

diff --git a/disco/api/client.py b/disco/api/client.py
index a319bd8..e1ca1f7 100644
--- a/disco/api/client.py
+++ b/disco/api/client.py
@@ -11,9 +11,10 @@ from disco.util.logging import LoggingClass
 from disco.util.sanitize import S
 from disco.types.user import User
 from disco.types.message import Message
-from disco.types.guild import Guild, GuildMember, GuildBan, Role, GuildEmoji, AuditLogEntry
+from disco.types.guild import Guild, GuildMember, GuildBan, PruneCount, Role, GuildEmoji, AuditLogEntry
 from disco.types.channel import Channel
 from disco.types.invite import Invite
+from disco.types.voice import VoiceRegion
 from disco.types.webhook import Webhook
 
 
@@ -432,6 +433,17 @@ class APIClient(LoggingClass):
             dict(guild=guild, user=user),
             headers=_reason_header(reason))
 
+    def guilds_prune_count_get(self, guild, days=None):
+        r = self.http(Routes.GUILDS_PRUNE_COUNT, dict(guild=guild), params=optional(days=days))
+        return PruneCount.create(self.client, r.json())
+
+    def guilds_prune_create(self, guild, days=None, compute_prune_count=None):
+        r = self.http(Routes.GUILDS_PRUNE_CREATE, dict(guild=guild), params=optional(
+            days=days,
+            compute_prune_count=compute_prune_count,
+        ))
+        return PruneCount.create(self.client, r.json())
+
     def guilds_roles_list(self, guild):
         r = self.http(Routes.GUILDS_ROLES_LIST, dict(guild=guild))
         return Role.create_map(self.client, r.json(), guild_id=guild)
@@ -492,6 +504,10 @@ class APIClient(LoggingClass):
     def guilds_roles_delete(self, guild, role, reason=None):
         self.http(Routes.GUILDS_ROLES_DELETE, dict(guild=guild, role=role), headers=_reason_header(reason))
 
+    def guilds_voice_regions_list(self, guild):
+        r = self.http(Routes.GUILDS_VOICE_REGIONS_LIST, dict(guild=guild))
+        return VoiceRegion.create_hash(self.client, 'id', r.json())
+
     def guilds_invites_list(self, guild):
         r = self.http(Routes.GUILDS_INVITES_LIST, dict(guild=guild))
         return Invite.create_map(self.client, r.json())
@@ -576,6 +592,10 @@ class APIClient(LoggingClass):
         r = self.http(Routes.INVITES_DELETE, dict(invite=invite), headers=_reason_header(reason))
         return Invite.create(self.client, r.json())
 
+    def voice_regions_list(self):
+        r = self.http(Routes.VOICE_REGIONS_LIST)
+        return VoiceRegion.create_hash(self.client, 'id', r.json())
+
     def webhooks_get(self, webhook):
         r = self.http(Routes.WEBHOOKS_GET, dict(webhook=webhook))
         return Webhook.create(self.client, r.json())
diff --git a/disco/api/http.py b/disco/api/http.py
index fb2c1a4..a035ccf 100644
--- a/disco/api/http.py
+++ b/disco/api/http.py
@@ -89,7 +89,7 @@ class Routes(object):
     GUILDS_ROLES_MODIFY = (HTTPMethod.PATCH, GUILDS + '/roles/{role}')
     GUILDS_ROLES_DELETE = (HTTPMethod.DELETE, GUILDS + '/roles/{role}')
     GUILDS_PRUNE_COUNT = (HTTPMethod.GET, GUILDS + '/prune')
-    GUILDS_PRUNE_BEGIN = (HTTPMethod.POST, GUILDS + '/prune')
+    GUILDS_PRUNE_CREATE = (HTTPMethod.POST, GUILDS + '/prune')
     GUILDS_VOICE_REGIONS_LIST = (HTTPMethod.GET, GUILDS + '/regions')
     GUILDS_VANITY_URL_GET = (HTTPMethod.GET, GUILDS + '/vanity-url')
     GUILDS_INVITES_LIST = (HTTPMethod.GET, GUILDS + '/invites')
@@ -124,6 +124,10 @@ class Routes(object):
     INVITES_GET = (HTTPMethod.GET, INVITES + '/{invite}')
     INVITES_DELETE = (HTTPMethod.DELETE, INVITES + '/{invite}')
 
+    # Voice
+    VOICE = '/voice'
+    VOICE_REGIONS_LIST = (HTTPMethod.GET, VOICE + '/regions')
+
     # Webhooks
     WEBHOOKS = '/webhooks/{webhook}'
     WEBHOOKS_GET = (HTTPMethod.GET, WEBHOOKS)
@@ -202,18 +206,18 @@ class HTTPClient(LoggingClass):
             sys.version_info.micro)
 
         self.limiter = RateLimiter()
-        self.headers = {
+        self.after_request = after_request
+
+        self.session = requests.Session()
+        self.session.headers.update({
             'User-Agent': 'DiscordBot (https://github.com/b1naryth1ef/disco {}) Python/{} requests/{}'.format(
                 disco_version,
                 py_version,
                 requests_version),
-        }
+        })
 
         if token:
-            self.headers['Authorization'] = 'Bot ' + token
-
-        self.after_request = after_request
-        self.session = requests.Session()
+            self.session.headers['Authorization'] = 'Bot ' + token
 
     def __call__(self, route, args=None, **kwargs):
         return self.call(route, args, **kwargs)
@@ -251,12 +255,6 @@ class HTTPClient(LoggingClass):
         args = args or {}
         retry = kwargs.pop('retry_number', 0)
 
-        # Merge or set headers
-        if 'headers' in kwargs:
-            kwargs['headers'].update(self.headers)
-        else:
-            kwargs['headers'] = self.headers
-
         # Build the bucket URL
         args = {k: to_bytes(v) for k, v in six.iteritems(args)}
         filtered = {k: (v if k in ('guild', 'channel') else '') for k, v in six.iteritems(args)}
diff --git a/disco/client.py b/disco/client.py
index c480af9..6445bad 100644
--- a/disco/client.py
+++ b/disco/client.py
@@ -25,6 +25,8 @@ class ClientConfig(Config):
         The shard ID for the current client instance.
     shard_count : int
         The total count of shards running.
+    guild_subscriptions : bool
+        Whether to enable subscription events (e.g. presence and typing).
     max_reconnects : int
         The maximum number of connection retries to make before giving up (0 = never give up).
     log_level: str
@@ -42,6 +44,7 @@ class ClientConfig(Config):
     token = ''
     shard_id = 0
     shard_count = 1
+    guild_subscriptions = True
     max_reconnects = 5
     log_level = 'info'
 
diff --git a/disco/gateway/client.py b/disco/gateway/client.py
index e997a98..2876f48 100644
--- a/disco/gateway/client.py
+++ b/disco/gateway/client.py
@@ -215,6 +215,7 @@ class GatewayClient(LoggingClass):
                 'token': self.client.config.token,
                 'compress': True,
                 'large_threshold': 250,
+                'guild_subscriptions': self.client.config.guild_subscriptions,
                 'shard': [
                     int(self.client.config.shard_id),
                     int(self.client.config.shard_count),
diff --git a/disco/gateway/events.py b/disco/gateway/events.py
index e187502..c5abd28 100644
--- a/disco/gateway/events.py
+++ b/disco/gateway/events.py
@@ -7,7 +7,7 @@ from disco.types.channel import Channel, PermissionOverwrite
 from disco.types.message import Message, MessageReactionEmoji
 from disco.types.voice import VoiceState
 from disco.types.guild import Guild, GuildMember, Role, GuildEmoji
-from disco.types.base import Model, ModelMeta, Field, ListField, AutoDictField, snowflake, datetime
+from disco.types.base import Model, ModelMeta, Field, ListField, AutoDictField, UNSET, snowflake, datetime
 from disco.util.string import underscore
 
 # Mapping of discords event name to our event classes
@@ -163,7 +163,7 @@ class GuildCreate(GatewayEvent):
         The guild being created (e.g. joined)
     unavailable : bool
         If false, this guild is coming online from a previously unavailable state,
-        and if None, this is a normal guild join event.
+        and if UNSET, this is a normal guild join event.
     """
     unavailable = Field(bool)
     presences = ListField(Presence)
@@ -173,7 +173,7 @@ class GuildCreate(GatewayEvent):
         """
         Shortcut property which is true when we actually joined the guild.
         """
-        return self.unavailable is None
+        return self.unavailable is UNSET
 
 
 @wraps_model(Guild)
@@ -197,7 +197,7 @@ class GuildDelete(GatewayEvent):
     id : snowflake
         The ID of the guild being deleted.
     unavailable : bool
-        If true, this guild is becoming unavailable, if None this is a normal
+        If true, this guild is becoming unavailable, if UNSET this is a normal
         guild leave event.
     """
     id = Field(snowflake)
@@ -208,7 +208,7 @@ class GuildDelete(GatewayEvent):
         """
         Shortcut property which is true when we actually have left the guild.
         """
-        return self.unavailable is None
+        return self.unavailable is UNSET
 
 
 @wraps_model(Channel)
diff --git a/disco/types/guild.py b/disco/types/guild.py
index 55efdb5..e7c16a7 100644
--- a/disco/types/guild.py
+++ b/disco/types/guild.py
@@ -79,6 +79,10 @@ class GuildEmoji(Emoji):
         return self.client.state.guilds.get(self.guild_id)
 
 
+class PruneCount(SlottedModel):
+    pruned = Field(int, default=None)
+
+
 class Role(SlottedModel):
     """
     A role object.
@@ -417,6 +421,12 @@ class Guild(SlottedModel, Permissible):
 
         return self.members.get(user)
 
+    def get_prune_count(self, days=None):
+        return self.client.api.guilds_prune_count_get(self.id, days=days)
+
+    def prune(self, days=None, compute_prune_count=None):
+        return self.client.api.guilds_prune_create(self.id, days=days, compute_prune_count=compute_prune_count)
+
     def create_role(self, **kwargs):
         """
         Create a new role.
@@ -517,15 +527,15 @@ class Guild(SlottedModel, Permissible):
     def get_invites(self):
         return self.client.api.guilds_invites_list(self.id)
 
-    def get_vanity_url(self):
-        return self.client.api.guilds_vanity_url_get(self.id)
-
     def get_emojis(self):
         return self.client.api.guilds_emojis_list(self.id)
 
     def get_emoji(self, emoji):
         return self.client.api.guilds_emojis_get(self.id, emoji)
 
+    def get_voice_regions(self):
+        return self.client.api.guilds_voice_regions_list(self.id)
+
     def get_icon_url(self, still_format='webp', animated_format='gif', size=1024):
         if not self.icon:
             return ''
@@ -539,6 +549,12 @@ class Guild(SlottedModel, Permissible):
                 self.id, self.icon, still_format, size
             )
 
+    def get_vanity_url(self):
+        if not self.vanity_url_code:
+            return ''
+
+        return 'https://discord.gg/' + self.vanity_url_code
+
     def get_splash_url(self, fmt='webp', size=1024):
         if not self.splash:
             return ''
@@ -555,6 +571,10 @@ class Guild(SlottedModel, Permissible):
     def icon_url(self):
         return self.get_icon_url()
 
+    @property
+    def vanity_url(self):
+        return self.get_vanity_url()
+
     @property
     def splash_url(self):
         return self.get_splash_url()
diff --git a/disco/types/permissions.py b/disco/types/permissions.py
index f6ebe0f..b4f5f7d 100644
--- a/disco/types/permissions.py
+++ b/disco/types/permissions.py
@@ -11,6 +11,7 @@ class Permissions(object):
     ADD_REACTIONS = 1 << 6
     VIEW_AUDIT_LOG = 1 << 7
     PRIORITY_SPEAKER = 1 << 8
+    STREAM = 1 << 9
     VIEW_CHANNEL = 1 << 10
     SEND_MESSAGES = 1 << 11
     SEND_TSS_MESSAGES = 1 << 12
diff --git a/disco/types/voice.py b/disco/types/voice.py
index bb7c055..fc00087 100644
--- a/disco/types/voice.py
+++ b/disco/types/voice.py
@@ -1,4 +1,4 @@
-from disco.types.base import SlottedModel, Field, snowflake, cached_property
+from disco.types.base import SlottedModel, text, Field, snowflake, cached_property
 
 
 class VoiceState(SlottedModel):
@@ -23,3 +23,18 @@ class VoiceState(SlottedModel):
     @cached_property
     def user(self):
         return self.client.state.users.get(self.user_id)
+
+
+class VoiceRegion(SlottedModel):
+    id = Field(text)
+    name = Field(text)
+    vip = Field(bool)
+    optimal = Field(bool)
+    deprecated = Field(bool)
+    custom = Field(bool)
+
+    def __str__(self):
+        return self.id
+
+    def __repr__(self):
+        return u'<VoiceRegion {}>'.format(self.name)

From af03a114d0fe5e60bcd266dd2b4230c47d049d25 Mon Sep 17 00:00:00 2001
From: Nadir Chowdhury <chowdhurynadir0@outlook.com>
Date: Sun, 13 Oct 2019 08:14:01 +0100
Subject: [PATCH 4/9] Typo Fixes (#122)

* Typo Fixes

* Typo Fixes 2.0

* Typo Fixes 2.1

(Realised a forgot the format for args)
---
 disco/api/client.py                           |  4 +-
 disco/api/http.py                             |  6 +-
 disco/api/ratelimit.py                        | 12 ++--
 disco/bot/bot.py                              | 29 ++++-----
 disco/bot/command.py                          |  8 +--
 disco/bot/parser.py                           |  2 +-
 disco/bot/plugin.py                           |  8 +--
 disco/cli.py                                  |  8 +--
 disco/client.py                               | 10 +--
 disco/gateway/events.py                       | 64 +++++++++----------
 disco/state.py                                | 34 +++++-----
 disco/types/base.py                           |  2 +-
 disco/types/channel.py                        | 28 ++++----
 disco/types/guild.py                          | 14 ++--
 disco/types/message.py                        |  8 +--
 disco/util/emitter.py                         |  4 +-
 disco/util/functional.py                      |  8 +--
 disco/util/logging.py                         |  2 +-
 disco/util/snowflake.py                       |  2 +-
 disco/voice.py                                |  2 +-
 docs/bot_tutorial/building_block_commands.md  |  4 +-
 docs/bot_tutorial/building_block_listeners.md |  2 +-
 docs/bot_tutorial/message_embeds.md           |  2 +-
 23 files changed, 131 insertions(+), 132 deletions(-)

diff --git a/disco/api/client.py b/disco/api/client.py
index e1ca1f7..df4f69b 100644
--- a/disco/api/client.py
+++ b/disco/api/client.py
@@ -48,8 +48,8 @@ class APIClient(LoggingClass):
     is the only path to the API used within models/other interfaces, and it's
     the recommended path for all third-party users/implementations.
 
-    Args
-    ----
+    Parameters
+    ----------
     token : str
         The Discord authentication token (without prefixes) to be used for all
         HTTP requests.
diff --git a/disco/api/http.py b/disco/api/http.py
index a035ccf..16f2e16 100644
--- a/disco/api/http.py
+++ b/disco/api/http.py
@@ -239,7 +239,7 @@ class HTTPClient(LoggingClass):
             to create the requestable route. The HTTPClient uses this to track
             rate limits as well.
         kwargs : dict
-            Keyword arguments that will be passed along to the requests library
+            Keyword arguments that will be passed along to the requests library.
 
         Raises
         ------
@@ -250,7 +250,7 @@ class HTTPClient(LoggingClass):
         Returns
         -------
         :class:`requests.Response`
-            The response object for the request
+            The response object for the request.
         """
         args = args or {}
         retry = kwargs.pop('retry_number', 0)
@@ -313,7 +313,7 @@ class HTTPClient(LoggingClass):
         client suspects is transient. Will always return a value between 500 and
         5000 milliseconds.
 
-        :returns: a random backoff in milliseconds
+        :returns: a random backoff in milliseconds.
         :rtype: float
         """
         return random.randint(500, 5000) / 1000.0
diff --git a/disco/api/ratelimit.py b/disco/api/ratelimit.py
index ab50488..4dca346 100644
--- a/disco/api/ratelimit.py
+++ b/disco/api/ratelimit.py
@@ -26,7 +26,7 @@ class RouteState(LoggingClass):
         The number of remaining requests to the route before the rate limit will
         be hit, triggering a 429 response.
     reset_time : int
-        A unix epoch timestamp (in seconds) after which this rate limit is reset
+        A UNIX epoch timestamp (in seconds) after which this rate limit is reset.
     event : :class:`gevent.event.Event`
         An event that is used to block all requests while a route is in the
         cooldown stage.
@@ -45,7 +45,7 @@ class RouteState(LoggingClass):
     @property
     def chilled(self):
         """
-        Whether this route is currently being cooldown (aka waiting until reset_time).
+        Whether this route is currently being cooled-down (aka waiting until reset_time).
         """
         return self.event is not None
 
@@ -63,8 +63,8 @@ class RouteState(LoggingClass):
 
     def update(self, response):
         """
-        Updates this route with a given Requests response object. Its expected
-        the response has the required headers, however in the case it doesn't
+        Updates this route with a given Requests response object. It's expected
+        the response has the required headers, however in the case that it doesn't
         this function has no effect.
         """
         if 'X-RateLimit-Remaining' not in response.headers:
@@ -108,7 +108,7 @@ class RouteState(LoggingClass):
 
 class RateLimiter(LoggingClass):
     """
-    A in-memory store of ratelimit states for all routes we've ever called.
+    An in-memory store of ratelimit states for all routes we've ever called.
 
     Attributes
     ----------
@@ -124,7 +124,7 @@ class RateLimiter(LoggingClass):
         Checks whether a given route can be called. This function will return
         immediately if no rate-limit cooldown is being imposed for the given
         route, or will wait indefinitely until the route is finished being
-        cooled down. This function should be called before making a request to
+        cooled-down. This function should be called before making a request to
         the specified route.
 
         Parameters
diff --git a/disco/bot/bot.py b/disco/bot/bot.py
index b4010c2..cba656b 100644
--- a/disco/bot/bot.py
+++ b/disco/bot/bot.py
@@ -27,7 +27,7 @@ class BotConfig(Config):
     Attributes
     ----------
     levels : dict(snowflake, str)
-        Mapping of user IDs/role IDs to :class:`disco.bot.commands.CommandLevesls`
+        Mapping of user IDs/role IDs to :class:`disco.bot.commands.CommandLevels`
         which is used for the default commands_level_getter.
     plugins : list[string]
         List of plugin modules to load.
@@ -41,15 +41,15 @@ class BotConfig(Config):
         A dictionary describing what mention types can be considered a mention
         of the bot when using :attr:`commands_require_mention`. This dictionary
         can contain the following keys: `here`, `everyone`, `role`, `user`. When
-        a keys value is set to true, the mention type will be considered for
+        a key's value is set to true, the mention type will be considered for
         command parsing.
     commands_prefix : str
         A string prefix that is required for a message to be considered for
         command parsing.
     commands_allow_edit : bool
-        If true, the bot will reparse an edited message if it was the last sent
+        If true, the bot will re-parse an edited message if it was the last sent
         message in a channel, and did not previously trigger a command. This is
-        helpful for allowing edits to typod commands.
+        helpful for allowing edits to typed commands.
     commands_level_getter : function
         If set, a function which when given a GuildMember or User, returns the
         relevant :class:`disco.bot.commands.CommandLevels`.
@@ -70,9 +70,9 @@ class BotConfig(Config):
         Whether to enable the built-in Flask server which allows plugins to handle
         and route HTTP requests.
     http_host : str
-        The host string for the HTTP Flask server (if enabled)
+        The host string for the HTTP Flask server (if enabled).
     http_port : int
-        The port for the HTTP Flask server (if enabled)
+        The port for the HTTP Flask server (if enabled).
     """
     levels = {}
     plugins = []
@@ -109,7 +109,7 @@ class BotConfig(Config):
 class Bot(LoggingClass):
     """
     Disco's implementation of a simple but extendable Discord bot. Bots consist
-    of a set of plugins, and a Disco client.
+    of a set of plugins, and a Disco Client.
 
     Parameters
     ----------
@@ -126,7 +126,7 @@ class Bot(LoggingClass):
     config : `BotConfig`
         The bot configuration instance for this bot.
     plugins : dict(str, :class:`disco.bot.plugin.Plugin`)
-        Any plugins this bot has loaded
+        Any plugins this bot has loaded.
     """
     def __init__(self, client, config=None):
         self.client = client
@@ -205,8 +205,7 @@ class Bot(LoggingClass):
         Parameters
         ---------
         plugins : Optional[list(:class:`disco.bot.plugin.Plugin`)]
-            Any plugins to load after creating the new bot instance
-
+            Any plugins to load after creating the new bot instance.
         """
         from disco.cli import disco_main
         inst = cls(disco_main())
@@ -250,7 +249,7 @@ class Bot(LoggingClass):
                 else:
                     possible[current] = group
 
-        # Now, we want to compute the actual shortest abbreivation out of the
+        # Now, we want to compute the actual shortest abbreviation out of the
         #  possible ones
         result = {}
         for abbrev, group in six.iteritems(possible):
@@ -284,12 +283,12 @@ class Bot(LoggingClass):
         Parameters
         ---------
         msg : :class:`disco.types.message.Message`
-            The message object to parse and find matching commands for
+            The message object to parse and find matching commands for.
 
         Yields
         -------
         tuple(:class:`disco.bot.command.Command`, `re.MatchObject`)
-            All commands the message triggers
+            All commands the message triggers.
         """
         content = msg.content
 
@@ -382,7 +381,7 @@ class Bot(LoggingClass):
         Returns
         -------
         bool
-            whether any commands where successfully triggered by the message
+            Whether any commands where successfully triggered by the message.
         """
         commands = list(self.get_commands_for_message(
             self.config.commands_require_mention,
@@ -473,7 +472,7 @@ class Bot(LoggingClass):
             Plugin class to unload and remove.
         """
         if cls.__name__ not in self.plugins:
-            raise Exception('Cannot remove non-existant plugin: {}'.format(cls.__name__))
+            raise Exception('Cannot remove non-existent plugin: {}'.format(cls.__name__))
 
         ctx = {}
         self.plugins[cls.__name__].unload(ctx)
diff --git a/disco/bot/command.py b/disco/bot/command.py
index c302584..ab7238c 100644
--- a/disco/bot/command.py
+++ b/disco/bot/command.py
@@ -35,7 +35,7 @@ class CommandEvent(object):
     message information).
 
     Attributes
-    ---------
+    ----------
     command : :class:`Command`
         The command this event was created for (aka the triggered command).
     msg : :class:`disco.types.message.Message`
@@ -43,9 +43,9 @@ class CommandEvent(object):
     match : :class:`re.MatchObject`
         The regex match object for the command.
     name : str
-        The command name (or alias) which was triggered by the command
+        The command name (or alias) which was triggered by the command.
     args : list(str)
-        Arguments passed to the command
+        Arguments passed to the command.
     """
 
     def __init__(self, command, msg, match):
@@ -276,7 +276,7 @@ class Command(object):
         Returns
         -------
         bool
-            Whether this command was successful
+            Whether this command was successful.
         """
         parsed_kwargs = {}
 
diff --git a/disco/bot/parser.py b/disco/bot/parser.py
index 92ddc83..25c9138 100644
--- a/disco/bot/parser.py
+++ b/disco/bot/parser.py
@@ -226,6 +226,6 @@ class ArgumentSet(object):
     @property
     def required_length(self):
         """
-        The number of required arguments to compile this set/specificaiton.
+        The number of required arguments to compile this set/specification.
         """
         return sum(i.true_count for i in self.args if i.required)
diff --git a/disco/bot/plugin.py b/disco/bot/plugin.py
index 7103609..4b51fb9 100644
--- a/disco/bot/plugin.py
+++ b/disco/bot/plugin.py
@@ -436,8 +436,8 @@ class Plugin(LoggingClass, PluginDeco):
         Registers a function to be called repeatedly, waiting for an interval
         duration.
 
-        Args
-        ----
+        Parameters
+        ----------
         func : function
             The function to be registered.
         interval : int
@@ -447,8 +447,8 @@ class Plugin(LoggingClass, PluginDeco):
         init : bool
             Whether to run this schedule once immediately, or wait for the first
             scheduled iteration.
-        kwargs: dict
-            kwargs which will be passed to executed `func`
+        kwargs : dict
+            kwargs which will be passed to executed `func`.
         """
         if kwargs is None:
             kwargs = {}
diff --git a/disco/cli.py b/disco/cli.py
index c1e96fb..f5dafae 100644
--- a/disco/cli.py
+++ b/disco/cli.py
@@ -16,8 +16,8 @@ monkey.patch_all()
 parser = argparse.ArgumentParser()
 
 # Command line specific arguments
-parser.add_argument('--run-bot', help='run a disco bot on this client', action='store_true', default=False)
-parser.add_argument('--plugin', help='load plugins into the bot', nargs='*', default=[])
+parser.add_argument('--run-bot', help='Run a disco bot on this client', action='store_true', default=False)
+parser.add_argument('--plugin', help='Load plugins into the bot', nargs='*', default=[])
 parser.add_argument('--config', help='Configuration file', default=None)
 parser.add_argument('--shard-auto', help='Automatically run all shards', action='store_true', default=False)
 
@@ -29,7 +29,7 @@ parser.add_argument('--max-reconnects', help='Maximum reconnect attempts', defau
 parser.add_argument('--log-level', help='log level', default=None)
 parser.add_argument('--manhole', action='store_true', help='Enable the manhole', default=None)
 parser.add_argument('--manhole-bind', help='host:port for the manhole to bind too', default=None)
-parser.add_argument('--encoder', help='encoder for gateway data', default=None)
+parser.add_argument('--encoder', help='Encoder for gateway data', default=None)
 
 
 # Mapping of argument names to configuration overrides
@@ -53,7 +53,7 @@ def disco_main(run=False):
     Returns
     -------
     :class:`Client`
-        A new Client from the provided command line arguments
+        A new Client from the provided command line arguments.
     """
     from disco.client import Client, ClientConfig
     from disco.bot import Bot, BotConfig
diff --git a/disco/client.py b/disco/client.py
index 6445bad..227446c 100644
--- a/disco/client.py
+++ b/disco/client.py
@@ -29,12 +29,12 @@ class ClientConfig(Config):
         Whether to enable subscription events (e.g. presence and typing).
     max_reconnects : int
         The maximum number of connection retries to make before giving up (0 = never give up).
-    log_level: str
+    log_level : str
         The logging level to use.
     manhole_enable : bool
         Whether to enable the manhole (e.g. console backdoor server) utility.
     manhole_bind : tuple(str, int)
-        A (host, port) combination which the manhole server will bind to (if its
+        A (host, port) combination which the manhole server will bind to (if it's
         enabled using :attr:`manhole_enable`).
     encoder : str
         The type of encoding to use for encoding/decoding data from websockets,
@@ -114,12 +114,12 @@ class Client(LoggingClass):
         """
         Updates the current clients presence.
 
-        Params
-        ------
+        Parameters
+        ----------
         status : `user.Status`
             The clients current status.
         game : `user.Game`
-            If passed, the game object to set for the users presence.
+            If passed, the game object to set for the user's presence.
         afk : bool
             Whether the client is currently afk.
         since : float
diff --git a/disco/gateway/events.py b/disco/gateway/events.py
index c5abd28..61809fd 100644
--- a/disco/gateway/events.py
+++ b/disco/gateway/events.py
@@ -127,13 +127,13 @@ class Ready(GatewayEvent):
     for bootstrapping the client's states.
 
     Attributes
-    -----
+    ----------
     version : int
         The gateway version.
     session_id : str
         The session ID.
     user : :class:`disco.types.user.User`
-        The user object for the authed account.
+        The user object for the authenticated account.
     guilds : list[:class:`disco.types.guild.Guild`
         All guilds this account is a member of. These are shallow guild objects.
     private_channels list[:class:`disco.types.channel.Channel`]
@@ -158,9 +158,9 @@ class GuildCreate(GatewayEvent):
     Sent when a guild is joined, or becomes available.
 
     Attributes
-    -----
+    ----------
     guild : :class:`disco.types.guild.Guild`
-        The guild being created (e.g. joined)
+        The guild being created (e.g. joined).
     unavailable : bool
         If false, this guild is coming online from a previously unavailable state,
         and if UNSET, this is a normal guild join event.
@@ -182,7 +182,7 @@ class GuildUpdate(GatewayEvent):
     Sent when a guild is updated.
 
     Attributes
-    -----
+    ----------
     guild : :class:`disco.types.guild.Guild`
         The updated guild object.
     """
@@ -193,7 +193,7 @@ class GuildDelete(GatewayEvent):
     Sent when a guild is deleted, left, or becomes unavailable.
 
     Attributes
-    -----
+    ----------
     id : snowflake
         The ID of the guild being deleted.
     unavailable : bool
@@ -217,7 +217,7 @@ class ChannelCreate(GatewayEvent):
     Sent when a channel is created.
 
     Attributes
-    -----
+    ----------
     channel : :class:`disco.types.channel.Channel`
         The channel which was created.
     """
@@ -229,7 +229,7 @@ class ChannelUpdate(ChannelCreate):
     Sent when a channel is updated.
 
     Attributes
-    -----
+    ----------
     channel : :class:`disco.types.channel.Channel`
         The channel which was updated.
     """
@@ -242,7 +242,7 @@ class ChannelDelete(ChannelCreate):
     Sent when a channel is deleted.
 
     Attributes
-    -----
+    ----------
     channel : :class:`disco.types.channel.Channel`
         The channel being deleted.
     """
@@ -253,10 +253,10 @@ class ChannelPinsUpdate(GatewayEvent):
     Sent when a channel's pins are updated.
 
     Attributes
-    -----
+    ----------
     channel_id : snowflake
         ID of the channel where pins where updated.
-    last_pin_timestap : datetime
+    last_pin_timestamp : datetime
         The time the last message was pinned.
     """
     channel_id = Field(snowflake)
@@ -269,7 +269,7 @@ class GuildBanAdd(GatewayEvent):
     Sent when a user is banned from a guild.
 
     Attributes
-    -----
+    ----------
     guild_id : snowflake
         The ID of the guild the user is being banned from.
     user : :class:`disco.types.user.User`
@@ -289,7 +289,7 @@ class GuildBanRemove(GuildBanAdd):
     Sent when a user is unbanned from a guild.
 
     Attributes
-    -----
+    ----------
     guild_id : snowflake
         The ID of the guild the user is being unbanned from.
     user : :class:`disco.types.user.User`
@@ -306,11 +306,11 @@ class GuildEmojisUpdate(GatewayEvent):
     Sent when a guild's emojis are updated.
 
     Attributes
-    -----
+    ----------
     guild_id : snowflake
         The ID of the guild the emojis are being updated in.
     emojis : list[:class:`disco.types.guild.Emoji`]
-        The new set of emojis for the guild
+        The new set of emojis for the guild.
     """
     guild_id = Field(snowflake)
     emojis = ListField(GuildEmoji)
@@ -321,7 +321,7 @@ class GuildIntegrationsUpdate(GatewayEvent):
     Sent when a guild's integrations are updated.
 
     Attributes
-    -----
+    ----------
     guild_id : snowflake
         The ID of the guild integrations where updated in.
     """
@@ -333,7 +333,7 @@ class GuildMembersChunk(GatewayEvent):
     Sent in response to a member's chunk request.
 
     Attributes
-    -----
+    ----------
     guild_id : snowflake
         The ID of the guild this member chunk is for.
     members : list[:class:`disco.types.guild.GuildMember`]
@@ -353,7 +353,7 @@ class GuildMemberAdd(GatewayEvent):
     Sent when a user joins a guild.
 
     Attributes
-    -----
+    ----------
     member : :class:`disco.types.guild.GuildMember`
         The member that has joined the guild.
     """
@@ -365,7 +365,7 @@ class GuildMemberRemove(GatewayEvent):
     Sent when a user leaves a guild (via leaving, kicking, or banning).
 
     Attributes
-    -----
+    ----------
     guild_id : snowflake
         The ID of the guild the member left from.
     user : :class:`disco.types.user.User`
@@ -385,7 +385,7 @@ class GuildMemberUpdate(GatewayEvent):
     Sent when a guilds member is updated.
 
     Attributes
-    -----
+    ----------
     member : :class:`disco.types.guild.GuildMember`
         The member being updated
     """
@@ -398,7 +398,7 @@ class GuildRoleCreate(GatewayEvent):
     Sent when a role is created.
 
     Attributes
-    -----
+    ----------
     guild_id : snowflake
         The ID of the guild where the role was created.
     role : :class:`disco.types.guild.Role`
@@ -417,7 +417,7 @@ class GuildRoleUpdate(GuildRoleCreate):
     Sent when a role is updated.
 
     Attributes
-    -----
+    ----------
     guild_id : snowflake
         The ID of the guild where the role was created.
     role : :class:`disco.types.guild.Role`
@@ -434,7 +434,7 @@ class GuildRoleDelete(GatewayEvent):
     Sent when a role is deleted.
 
     Attributes
-    -----
+    ----------
     guild_id : snowflake
         The ID of the guild where the role is being deleted.
     role_id : snowflake
@@ -454,7 +454,7 @@ class MessageCreate(GatewayEvent):
     Sent when a message is created.
 
     Attributes
-    -----
+    ----------
     message : :class:`disco.types.message.Message`
         The message being created.
     guild_id : snowflake
@@ -469,7 +469,7 @@ class MessageUpdate(MessageCreate):
     Sent when a message is updated/edited.
 
     Attributes
-    -----
+    ----------
     message : :class:`disco.types.message.Message`
         The message being updated.
     guild_id : snowflake
@@ -483,7 +483,7 @@ class MessageDelete(GatewayEvent):
     Sent when a message is deleted.
 
     Attributes
-    -----
+    ----------
     id : snowflake
         The ID of message being deleted.
     channel_id : snowflake
@@ -509,7 +509,7 @@ class MessageDeleteBulk(GatewayEvent):
     Sent when multiple messages are deleted from a channel.
 
     Attributes
-    -----
+    ----------
     guild_id : snowflake
         The guild the messages are being deleted in.
     channel_id : snowflake
@@ -536,7 +536,7 @@ class PresenceUpdate(GatewayEvent):
     Sent when a user's presence is updated.
 
     Attributes
-    -----
+    ----------
     presence : :class:`disco.types.user.Presence`
         The updated presence object.
     guild_id : snowflake
@@ -557,7 +557,7 @@ class TypingStart(GatewayEvent):
     Sent when a user begins typing in a channel.
 
     Attributes
-    -----
+    ----------
     guild_id : snowflake
         The ID of the guild where the user is typing.
     channel_id : snowflake
@@ -579,7 +579,7 @@ class VoiceStateUpdate(GatewayEvent):
     Sent when a users voice state changes.
 
     Attributes
-    -----
+    ----------
     state : :class:`disco.models.voice.VoiceState`
         The voice state which was updated.
     """
@@ -590,7 +590,7 @@ class VoiceServerUpdate(GatewayEvent):
     Sent when a voice server is updated.
 
     Attributes
-    -----
+    ----------
     token : str
         The token for the voice server.
     endpoint : str
@@ -608,7 +608,7 @@ class WebhooksUpdate(GatewayEvent):
     Sent when a channels webhooks are updated.
 
     Attributes
-    -----
+    ----------
     channel_id : snowflake
         The channel ID this webhooks update is for.
     guild_id : snowflake
diff --git a/disco/state.py b/disco/state.py
index 28a54ff..782e12c 100644
--- a/disco/state.py
+++ b/disco/state.py
@@ -19,11 +19,11 @@ class StackMessage(namedtuple('StackMessage', ['id', 'channel_id', 'author_id'])
     Attributes
     ---------
     id : snowflake
-        the id of the message
+        The id of the message.
     channel_id : snowflake
-        the id of the channel this message was sent in
+        The id of the channel this message was sent in.
     author_id : snowflake
-        the id of the author of this message
+        The id of the author of this message.
     """
 
 
@@ -40,8 +40,8 @@ class StateConfig(Config):
 
         Message tracking is implemented using a deque and a namedtuple, meaning
         it should generally not have a high impact on memory, however users who
-        find they do not need and may be experiencing memory pressure can disable
-        this feature entirely using this attribute.
+        find that they do not need and may be experiencing memory pressure can
+        disable this feature entirely using this attribute.
     track_messages_size : int
         The size of the messages deque for each channel. This value can be used
         to calculate the total number of possible `StackMessage` objects kept in
@@ -50,7 +50,7 @@ class StateConfig(Config):
     sync_guild_members : bool
         If true, guilds will be automatically synced when they are initially loaded
         or joined. Generally this setting is OK for smaller bots, however bots in over
-        50 guilds will notice this operation can take a while to complete and may want
+        50 guilds will notice this operation can take a while to complete, and may want
         to batch requests using the underlying `GatewayClient.request_guild_members`
         interface.
     """
@@ -69,27 +69,27 @@ class State(object):
     Attributes
     ----------
     EVENTS : list(str)
-        A list of all events the State object binds to
+        A list of all events the State object binds to.
     client : `disco.client.Client`
-        The Client instance this state is attached to
+        The Client instance this state is attached to.
     config : `StateConfig`
-        The configuration for this state instance
+        The configuration for this state instance.
     me : `User`
-        The currently logged in user
+        The currently logged in user.
     dms : dict(snowflake, `Channel`)
-        Mapping of all known DM Channels
+        Mapping of all known DM Channels.
     guilds : dict(snowflake, `Guild`)
-        Mapping of all known/loaded Guilds
+        Mapping of all known/loaded Guilds.
     channels : dict(snowflake, `Channel`)
-        Weak mapping of all known/loaded Channels
+        Weak mapping of all known/loaded Channels.
     users : dict(snowflake, `User`)
-        Weak mapping of all known/loaded Users
+        Weak mapping of all known/loaded Users.
     voice_clients : dict(str, 'VoiceClient')
-        Weak mapping of all known voice clients
+        Weak mapping of all known voice clients.
     voice_states : dict(str, `VoiceState`)
-        Weak mapping of all known/active Voice States
+        Weak mapping of all known/active Voice States.
     messages : Optional[dict(snowflake, deque)]
-        Mapping of channel ids to deques containing `StackMessage` objects
+        Mapping of channel ids to deques containing `StackMessage` objects.
     """
     EVENTS = [
         'Ready', 'GuildCreate', 'GuildUpdate', 'GuildDelete', 'GuildMemberAdd', 'GuildMemberRemove',
diff --git a/disco/types/base.py b/disco/types/base.py
index c876f9a..ea51246 100644
--- a/disco/types/base.py
+++ b/disco/types/base.py
@@ -220,7 +220,7 @@ def datetime(data):
         except (ValueError, TypeError):
             continue
 
-    raise ValueError('Failed to conver `{}` to datetime'.format(data))
+    raise ValueError('Failed to convert `{}` to datetime'.format(data))
 
 
 def text(obj):
diff --git a/disco/types/channel.py b/disco/types/channel.py
index 3d6837e..6dc2c83 100644
--- a/disco/types/channel.py
+++ b/disco/types/channel.py
@@ -43,13 +43,13 @@ class PermissionOverwrite(ChannelSubType):
     Attributes
     ----------
     id : snowflake
-        The overwrite ID
+        The overwrite ID.
     type : :const:`disco.types.channel.PermissionsOverwriteType`
-        The overwrite type
+        The overwrite type.
     allow : :class:`disco.types.permissions.PermissionValue`
-        All allowed permissions
+        All allowed permissions.
     deny : :class:`disco.types.permissions.PermissionValue`
-        All denied permissions
+        All denied permissions.
     """
     id = Field(snowflake)
     type = Field(enum(PermissionOverwriteType))
@@ -112,7 +112,7 @@ class Channel(SlottedModel, Permissible):
         The channel's bitrate.
     user_limit : int
         The channel's user limit.
-    recipients: list(:class:`disco.types.user.User`)
+    recipients : list(:class:`disco.types.user.User`)
         Members of this channel (if this is a DM channel).
     type : :const:`ChannelType`
         The type of this channel.
@@ -265,7 +265,7 @@ class Channel(SlottedModel, Permissible):
         Returns
         -------
         `Message`
-            The fetched message
+            The fetched message.
         """
         return self.client.api.channels_messages_get(self.id, to_snowflake(message))
 
@@ -304,8 +304,8 @@ class Channel(SlottedModel, Permissible):
         """
         Pins the given message to the channel.
 
-        Params
-        ------
+        Parameters
+        ----------
         message : `Message`|snowflake
             The message or message ID to pin.
         """
@@ -315,8 +315,8 @@ class Channel(SlottedModel, Permissible):
         """
         Unpins the given message from the channel.
 
-        Params
-        ------
+        Parameters
+        ----------
         message : `Message`|snowflake
             The message or message ID to pin.
         """
@@ -373,8 +373,8 @@ class Channel(SlottedModel, Permissible):
         """
         Deletes a single message from this channel.
 
-        Args
-        ----
+        Parameters
+        ----------
         message : snowflake|`Message`
             The message to delete.
         """
@@ -386,8 +386,8 @@ class Channel(SlottedModel, Permissible):
         Deletes a set of messages using the correct API route based on the number
         of messages passed.
 
-        Args
-        ----
+        Parameters
+        ----------
         messages : list(snowflake|`Message`)
             List of messages (or message ids) to delete. All messages must originate
             from this channel.
diff --git a/disco/types/guild.py b/disco/types/guild.py
index e7c16a7..baaac48 100644
--- a/disco/types/guild.py
+++ b/disco/types/guild.py
@@ -158,7 +158,7 @@ class GuildMember(SlottedModel):
     roles : list(snowflake)
         Roles this member is part of.
     premium_since : datetime
-        When this user set their nitro boost to this server.
+        When this user set their Nitro boost to this server.
     """
     user = Field(User)
     guild_id = Field(snowflake)
@@ -199,8 +199,8 @@ class GuildMember(SlottedModel):
         """
         Bans the member from the guild.
 
-        Args
-        ----
+        Parameters
+        ----------
         delete_message_days : int
             The number of days to retroactively delete messages for.
         """
@@ -216,8 +216,8 @@ class GuildMember(SlottedModel):
         """
         Sets the member's nickname (or clears it if None).
 
-        Args
-        ----
+        Parameters
+        ----------
         nickname : Optional[str]
             The nickname (or none to reset) to set.
         """
@@ -315,8 +315,8 @@ class Guild(SlottedModel, Permissible):
         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.
+    premium_subscription_count : int
+        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 ae03e5d..1c3d68d 100644
--- a/disco/types/message.py
+++ b/disco/types/message.py
@@ -482,8 +482,8 @@ class Message(SlottedModel):
         """
         Edit this message.
 
-        Args
-        ----
+        Parameters
+        ----------
         content : str
             The new edited contents of the message.
 
@@ -621,8 +621,8 @@ class Message(SlottedModel):
         """
         Replaces user and role mentions with the result of a given lambda/function.
 
-        Args
-        ----
+        Parameters
+        ----------
         user_replace : function
             A function taking a single argument, the user object mentioned, and
             returning a valid string.
diff --git a/disco/util/emitter.py b/disco/util/emitter.py
index 35e7bb6..4382d4f 100644
--- a/disco/util/emitter.py
+++ b/disco/util/emitter.py
@@ -16,12 +16,12 @@ class Priority(object):
     #  with the one difference being it executes after all the BEFORE listeners.
     AFTER = 2
 
-    # SEQUENTIAL guarentees that all events your handler recieves will be ordered
+    # SEQUENTIAL guarantees that all events your handler receives will be ordered
     #  when looked at in isolation. SEQUENTIAL handlers will not block other handlers,
     #  but do use a queue internally and thus can fall behind.
     SEQUENTIAL = 3
 
-    # NONE provides no guarentees around the ordering or execution of events, sans
+    # NONE provides no guarantees around the ordering or execution of events, sans
     #  that BEFORE handlers will always complete before any NONE handlers are called.
     NONE = 4
 
diff --git a/disco/util/functional.py b/disco/util/functional.py
index 0a06048..c8f084d 100644
--- a/disco/util/functional.py
+++ b/disco/util/functional.py
@@ -7,8 +7,8 @@ def take(seq, count):
     """
     Take count many elements from a sequence or generator.
 
-    Args
-    ----
+    Parameters
+    ----------
     seq : sequence or generator
         The sequence to take elements from.
     count : int
@@ -25,8 +25,8 @@ def chunks(obj, size):
     """
     Splits a list into sized chunks.
 
-    Args
-    ----
+    Parameters
+    ----------
     obj : list
         List to split up.
     size : int
diff --git a/disco/util/logging.py b/disco/util/logging.py
index c4587d2..4f33167 100644
--- a/disco/util/logging.py
+++ b/disco/util/logging.py
@@ -21,7 +21,7 @@ def setup_logging(**kwargs):
     # Pass through our basic configuration
     logging.basicConfig(**kwargs)
 
-    # Override some noisey loggers
+    # Override some noisy loggers
     for logger, level in LEVEL_OVERRIDES.items():
         logging.getLogger(logger).setLevel(level)
 
diff --git a/disco/util/snowflake.py b/disco/util/snowflake.py
index c0d24bb..d569954 100644
--- a/disco/util/snowflake.py
+++ b/disco/util/snowflake.py
@@ -41,7 +41,7 @@ def to_snowflake(i):
     elif hasattr(i, 'id'):
         return i.id
 
-    raise Exception('{} ({}) is not convertable to a snowflake'.format(type(i), i))
+    raise Exception('{} ({}) is not convertible to a snowflake'.format(type(i), i))
 
 
 def calculate_shard(shard_count, guild_id):
diff --git a/disco/voice.py b/disco/voice.py
index 5497a13..7f723af 100644
--- a/disco/voice.py
+++ b/disco/voice.py
@@ -159,7 +159,7 @@ class VoiceConnection(object):
 
     def _event_reader(self, fd):
         if not make_nonblocking(fd):
-            raise Exception('failed to make event pipe nonblocking')
+            raise Exception('failed to make event pipe non-blocking')
 
         buff = ""
         while True:
diff --git a/docs/bot_tutorial/building_block_commands.md b/docs/bot_tutorial/building_block_commands.md
index 2ffeb02..785f672 100644
--- a/docs/bot_tutorial/building_block_commands.md
+++ b/docs/bot_tutorial/building_block_commands.md
@@ -6,7 +6,7 @@ In the case of these examples, when you send `!help` or `!info` the bot will rep
 
 ## Basic commands
 
-Creating commands in Disco is really easy because of the [Plugins](https://b1naryth1ef.github.io/disco/bot_tutorial/building_block_plugins.html) that are a core fundamential of Disco. For more info on them, read back in the [Plugins](https://b1naryth1ef.github.io/disco/bot_tutorial/building_block_plugins.html) section of this tutorial. Creating a basic command is done as follows:
+Creating commands in Disco is really easy because of the [Plugins](https://b1naryth1ef.github.io/disco/bot_tutorial/building_block_plugins.html) that are a core fundamental of Disco. For more info on them, read back in the [Plugins](https://b1naryth1ef.github.io/disco/bot_tutorial/building_block_plugins.html) section of this tutorial. Creating a basic command is done as follows:
 First, create a Plugin class:
 ```py
 class myPlugin(Plugin):
@@ -48,7 +48,7 @@ Here, we added multiple arguments to our command. Namely, number a and number b,
 Lets create a tag system, that can either store a tag if you'd use it like this: `!tag name value` or retrieve a tag if you'd use it like this: `!tag name`
 
 We'll need 2 arguments. A name argument that's required, and an optional value argument. Inside the command we'll check if a `value` is provided. If there is, we'll store the tag. Otherwise, we'll try to retrieve the previously set value for that tag and return it.
-For the sake of this example, we'll asume that the `tags` dict gets stored somewhere so it doesn't get removed after a restart.
+For the sake of this example, we'll assume that the `tags` dict gets stored somewhere so it doesn't get removed after a restart.
 ```py
 tags = {}
 
diff --git a/docs/bot_tutorial/building_block_listeners.md b/docs/bot_tutorial/building_block_listeners.md
index 981c715..6e82241 100644
--- a/docs/bot_tutorial/building_block_listeners.md
+++ b/docs/bot_tutorial/building_block_listeners.md
@@ -12,7 +12,7 @@ def on_message_create(self, event):
     self.log.debug('Got message: %s', event.message)
 ```
 
-Ok, but what if we want to make a listener which welcomes new users to our server? Well thats also easy:
+Ok, but what if we want to make a listener which welcomes new users to our server? Well that's also easy:
 
 ```py
 @Plugin.listen('GuildMemberAdd')
diff --git a/docs/bot_tutorial/message_embeds.md b/docs/bot_tutorial/message_embeds.md
index dbcca04..c8497e4 100644
--- a/docs/bot_tutorial/message_embeds.md
+++ b/docs/bot_tutorial/message_embeds.md
@@ -46,7 +46,7 @@ embed.set_footer(text='Disco Message Embeds tutorial')
 embed.color = '10038562' #This can be any color, but I chose a nice dark red tint
 ```
 
-Once your embed is finshed, you can send it using the `channel.send_message()` message or the `event.msg.reply()` function.
+Once your embed is finished, you can send it using the `channel.send_message()` message or the `event.msg.reply()` function.
 With `channel.send_message()`:
 ```py
 self.state.channels.get(<ChannelID>).send_message('[optional text]', embed=embed)

From 688f2d3378c501811ae7ed062e216573612790ee Mon Sep 17 00:00:00 2001
From: Faster Speeding <luke@lmbyrne.dev>
Date: Fri, 18 Oct 2019 20:22:35 +0000
Subject: [PATCH 5/9] Map UserUpdate event in state.EVENTS (#158)

---
 disco/state.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/disco/state.py b/disco/state.py
index 782e12c..bb6b60d 100644
--- a/disco/state.py
+++ b/disco/state.py
@@ -95,7 +95,7 @@ class State(object):
         'Ready', 'GuildCreate', 'GuildUpdate', 'GuildDelete', 'GuildMemberAdd', 'GuildMemberRemove',
         'GuildMemberUpdate', 'GuildMembersChunk', 'GuildRoleCreate', 'GuildRoleUpdate', 'GuildRoleDelete',
         'GuildEmojisUpdate', 'ChannelCreate', 'ChannelUpdate', 'ChannelDelete', 'VoiceServerUpdate', 'VoiceStateUpdate',
-        'MessageCreate', 'PresenceUpdate',
+        'MessageCreate', 'PresenceUpdate', 'UserUpdate',
     ]
 
     def __init__(self, client, config):

From 40d22921fa2735ece85fe83c9271fa8af98a9f22 Mon Sep 17 00:00:00 2001
From: Snabbare Hastighet <luke@lmbyrne.dev>
Date: Sun, 3 Nov 2019 20:19:11 +0000
Subject: [PATCH 6/9] Add Guild embed related endpoints. (#163)

* Guild Embed endpoints

* Fix failing test
---
 disco/api/client.py  | 14 +++++++++++++-
 disco/types/guild.py |  5 +++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/disco/api/client.py b/disco/api/client.py
index df4f69b..5446af4 100644
--- a/disco/api/client.py
+++ b/disco/api/client.py
@@ -11,7 +11,7 @@ from disco.util.logging import LoggingClass
 from disco.util.sanitize import S
 from disco.types.user import User
 from disco.types.message import Message
-from disco.types.guild import Guild, GuildMember, GuildBan, PruneCount, Role, GuildEmoji, AuditLogEntry
+from disco.types.guild import Guild, GuildMember, GuildBan, GuildEmbed, PruneCount, Role, GuildEmoji, AuditLogEntry
 from disco.types.channel import Channel
 from disco.types.invite import Invite
 from disco.types.voice import VoiceRegion
@@ -516,6 +516,18 @@ class APIClient(LoggingClass):
         r = self.http(Routes.GUILDS_VANITY_URL_GET, dict(guild=guild))
         return Invite.create(self.client, r.json())
 
+    def guilds_embed_get(self, guild):
+        r = self.http(Routes.GUILDS_EMBED_GET, dict(guild=guild))
+        return GuildEmbed.create(self.client, r.json())
+
+    def guilds_embed_modify(self, guild, reason=None, **kwargs):
+        r = self.http(
+            Routes.GUILDS_EMBED_MODIFY,
+            dict(guild=guild),
+            json=kwargs,
+            headers=_reason_header(reason))
+        return GuildEmbed.create(self.client, r.json())
+
     def guilds_webhooks_list(self, guild):
         r = self.http(Routes.GUILDS_WEBHOOKS_LIST, dict(guild=guild))
         return Webhook.create_map(self.client, r.json())
diff --git a/disco/types/guild.py b/disco/types/guild.py
index baaac48..7f599fa 100644
--- a/disco/types/guild.py
+++ b/disco/types/guild.py
@@ -137,6 +137,11 @@ class GuildBan(SlottedModel):
     reason = Field(text)
 
 
+class GuildEmbed(SlottedModel):
+    enabled = Field(bool)
+    channel_id = Field(snowflake)
+
+
 class GuildMember(SlottedModel):
     """
     A GuildMember object.

From 425a2f9bc438f4a00ac7017bddfaf7fff9731cfb Mon Sep 17 00:00:00 2001
From: Luke <luke@lmbyrne.dev>
Date: Fri, 8 Nov 2019 00:18:36 +0000
Subject: [PATCH 7/9] Add oauth2_application_me and guild integration related
 endpoints. (#161)

* Oauth and guild integrations.

* hash on USERS_ME_GUILDS_LIST and add owner check to Application.

* Fix failing tests

* Add code to oauth2 token get

* redirect_url => uri

* Consistency fix

* Update client.py

* Remove oauth specific endpoints from APIClient

* Remove access token for now

* Fix failing tests

* remove oversight

* Update oauth.py

* Remove secret from config
---
 disco/api/client.py  | 52 +++++++++++++++++++++++++--
 disco/api/http.py    | 10 +++++-
 disco/types/guild.py | 19 ++++++++++
 disco/types/oauth.py | 85 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 163 insertions(+), 3 deletions(-)
 create mode 100644 disco/types/oauth.py

diff --git a/disco/api/client.py b/disco/api/client.py
index 5446af4..ae75622 100644
--- a/disco/api/client.py
+++ b/disco/api/client.py
@@ -11,7 +11,11 @@ from disco.util.logging import LoggingClass
 from disco.util.sanitize import S
 from disco.types.user import User
 from disco.types.message import Message
-from disco.types.guild import Guild, GuildMember, GuildBan, GuildEmbed, PruneCount, Role, GuildEmoji, AuditLogEntry
+from disco.types.oauth import Application, Connection
+from disco.types.guild import (
+    Guild, GuildMember, GuildBan, GuildEmbed, PruneCount, Role, GuildEmoji,
+    AuditLogEntry, Integration,
+)
 from disco.types.channel import Channel
 from disco.types.invite import Invite
 from disco.types.voice import VoiceRegion
@@ -101,6 +105,10 @@ class APIClient(LoggingClass):
         data = self.http(Routes.GATEWAY_BOT_GET).json()
         return data
 
+    def oauth2_applications_me_get(self):
+        r = self.http(Routes.OAUTH2_APPLICATIONS_ME)
+        return Application.create(self.client, r.json())
+
     def channels_get(self, channel):
         r = self.http(Routes.CHANNELS_GET, dict(channel=channel))
         return Channel.create(self.client, r.json())
@@ -512,6 +520,37 @@ class APIClient(LoggingClass):
         r = self.http(Routes.GUILDS_INVITES_LIST, dict(guild=guild))
         return Invite.create_map(self.client, r.json())
 
+    def guilds_integrations_list(self, guild):
+        r = self.http(Routes.GUILDS_INTEGRATIONS_LIST, dict(guild=guild))
+        return Integration.create_map(self.client, r.json())
+
+    def guilds_integrations_create(self, guild, type, id):
+        r = self.http(Routes.GUILDS_INTEGRATIONS_CREATE, dict(guild=guild), json={"type": type, "id": id})
+        return Integration.create(r.json())
+
+    def guilds_integrations_modify(
+            self,
+            guild,
+            integration,
+            expire_behavior=None,
+            expire_grace_period=None,
+            enable_emoticons=None):
+
+        self.http(
+            Routes.GUILDS_INTEGRATIONS_MODIFY,
+            dict(guild=guild, integration=integration),
+            json=optional(
+                expire_behavior=expire_behavior,
+                expire_grace_period=expire_grace_period,
+                enable_emoticons=enable_emoticons,
+            ))
+
+    def guilds_integrations_delete(self, guild, integration):
+        self.http(Routes.GUILDS_INTEGRATIONS_DELETE, dict(guild=guild, integration=integration))
+
+    def guilds_integrations_sync(self, guild, integration):
+        self.http(Routes.GUILDS_INTEGRATIONS_SYNC, dict(guild=guild, integration=integration))
+
     def guilds_vanity_url_get(self, guild):
         r = self.http(Routes.GUILDS_VANITY_URL_GET, dict(guild=guild))
         return Invite.create(self.client, r.json())
@@ -581,12 +620,17 @@ class APIClient(LoggingClass):
         return User.create(self.client, r.json())
 
     def users_me_get(self):
-        return User.create(self.client, self.http(Routes.USERS_ME_GET).json())
+        r = self.http(Routes.USERS_ME_GET)
+        return User.create(self.client, r.json())
 
     def users_me_patch(self, payload):
         r = self.http(Routes.USERS_ME_PATCH, json=payload)
         return User.create(self.client, r.json())
 
+    def users_me_guilds_list(self):
+        r = self.http(Routes.USERS_ME_GUILDS_LIST)
+        return Guild.create_hash(self.client, 'id', r.json())
+
     def users_me_guilds_delete(self, guild):
         self.http(Routes.USERS_ME_GUILDS_DELETE, dict(guild=guild))
 
@@ -596,6 +640,10 @@ class APIClient(LoggingClass):
         })
         return Channel.create(self.client, r.json())
 
+    def users_me_connections_list(self):
+        r = self.http(Routes.USERS_ME_CONNECTIONS_LIST)
+        return Connection.create_map(self.client, r.json())
+
     def invites_get(self, invite):
         r = self.http(Routes.INVITES_GET, dict(invite=invite))
         return Invite.create(self.client, r.json())
diff --git a/disco/api/http.py b/disco/api/http.py
index 16f2e16..3f52b6e 100644
--- a/disco/api/http.py
+++ b/disco/api/http.py
@@ -34,6 +34,12 @@ class Routes(object):
     GATEWAY_GET = (HTTPMethod.GET, '/gateway')
     GATEWAY_BOT_GET = (HTTPMethod.GET, '/gateway/bot')
 
+    # OAUTH2
+    OAUTH2 = '/oauth2'
+    OAUTH2_TOKEN = (HTTPMethod.POST, OAUTH2 + '/token')
+    OAUTH2_TOKEN_REVOKE = (HTTPMethod.POST, OAUTH2 + '/token/revoke')
+    OAUTH2_APPLICATIONS_ME = (HTTPMethod.GET, OAUTH2 + '/applications/@me')
+
     # Channels
     CHANNELS = '/channels/{channel}'
     CHANNELS_GET = (HTTPMethod.GET, CHANNELS)
@@ -178,7 +184,9 @@ class APIException(Exception):
                 self.msg = '{} ({} - {})'.format(data['message'], self.code, self.errors)
             elif len(data) == 1:
                 key, value = list(data.items())[0]
-                self.msg = 'Request Failed: {}: {}'.format(key, ', '.join(value))
+                if not isinstance(value, str):
+                    value = ', '.join(value)
+                self.msg = 'Request Failed: {}: {}'.format(key, value)
         except ValueError:
             pass
 
diff --git a/disco/types/guild.py b/disco/types/guild.py
index 7f599fa..9a55e87 100644
--- a/disco/types/guild.py
+++ b/disco/types/guild.py
@@ -608,6 +608,25 @@ class Guild(SlottedModel, Permissible):
         return self.client.api.guilds_auditlogs_list(self.id, *args, **kwargs)
 
 
+class IntegrationAccount(SlottedModel):
+    id = Field(text)
+    name = Field(text)
+
+
+class Integration(SlottedModel):
+    id = Field(snowflake)
+    name = Field(text)
+    type = Field(text)
+    enabled = Field(bool)
+    syncing = Field(bool)
+    role_id = Field(snowflake)
+    expire_behavior = Field(int)
+    expire_grace_period = Field(int)
+    user = Field(User)
+    account = Field(IntegrationAccount)
+    synced_at = Field(datetime)
+
+
 class AuditLogActionTypes(object):
     GUILD_UPDATE = 1
     CHANNEL_CREATE = 10
diff --git a/disco/types/oauth.py b/disco/types/oauth.py
new file mode 100644
index 0000000..b0f1742
--- /dev/null
+++ b/disco/types/oauth.py
@@ -0,0 +1,85 @@
+from disco.types.base import SlottedModel, Field, ListField, snowflake, text, enum
+from disco.types.guild import Integration
+from disco.types.user import User
+from disco.util.snowflake import to_snowflake
+
+
+class TeamMembershipState(object):
+    INVITED = 1
+    ACCEPTED = 2
+
+
+class TeamMember(SlottedModel):
+    membership_state = Field(enum(TeamMembershipState))
+    permissions = Field(text)
+    team_id = Field(snowflake)
+    user = Field(User)
+
+
+class Team(SlottedModel):
+    icon = Field(text)
+    id = Field(snowflake)
+    members = ListField(TeamMember)
+    owner_user_id = Field(snowflake)
+
+
+class Application(SlottedModel):
+    id = Field(snowflake)
+    name = Field(text)
+    icon = Field(text)
+    description = Field(text)
+    rpc_origins = ListField(text)
+    bot_public = Field(bool)
+    bot_require_code_grant = Field(bool)
+    owner = Field(User)
+    summary = Field(text)
+    verify_key = Field(text)
+    team = Field(Team)
+    guild_id = Field(snowflake)
+    primary_sku_id = Field(snowflake)
+    slug = Field(text)
+    cover_image = Field(text)
+
+    def user_is_owner(self, user):
+        user_id = to_snowflake(user)
+        if user_id == self.owner.id:
+            return True
+
+        return any(user_id == member.user.id for member in self.team.members)
+
+    def get_icon_url(self, fmt='webp', size=1024):
+        if not self.icon:
+            return ''
+
+        return 'https://cdn.discordapp.com/app-icons/{}/{}.{}?size={}'.format(self.id, self.icon, fmt, size)
+
+    def get_cover_image_url(self, fmt='webp', size=1024):
+        if not self.cover_image:
+            return ''
+
+        return 'https://cdn.discordapp.com/app-icons/{}/{}.{}?size={}'.format(self.id, self.cover_image, fmt, size)
+
+    @property
+    def icon_url(self):
+        return self.get_icon_url()
+
+    @property
+    def cover_image_url(self):
+        return self.get_cover_image_url()
+
+
+class ConnectionVisibility(object):
+    NOBODY = 0
+    EVERYONE = 1
+
+
+class Connection(SlottedModel):
+    id = Field(text)
+    name = Field(text)
+    type = Field(text)
+    revoked = Field(bool)
+    integrations = ListField(Integration)
+    verified = Field(bool)
+    friend_sync = Field(bool)
+    show_activity = Field(bool)
+    visibility = Field(enum(ConnectionVisibility))

From d89562204fb584b60de1ac631e4cf32177a586c4 Mon Sep 17 00:00:00 2001
From: Luke <luke@lmbyrne.dev>
Date: Wed, 20 Nov 2019 19:39:16 +0000
Subject: [PATCH 8/9] Stop tests and examples from being published (#167)

* Exclude tests and examples from setup packages.

* Update setup.py

* Update setup.py

* Explicitly include rather than exclude
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 4978681..e80a54a 100644
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ setup(
     author='b1nzy',
     url='https://github.com/b1naryth1ef/disco',
     version=VERSION,
-    packages=find_packages(),
+    packages=find_packages(include=['disco*']),
     license='MIT',
     description='A Python library for Discord',
     long_description=readme,

From 9984edcbf3263cd7746f19d422786f16790b7b62 Mon Sep 17 00:00:00 2001
From: Justin <14909116+ThatGuyJustin@users.noreply.github.com>
Date: Fri, 22 Nov 2019 12:46:26 -0500
Subject: [PATCH 9/9] Adding "latency" var to GatewayClient (#168)

* Local Fixes & Client UserUpdate Gateway Event

- Changed 'READ_MESSAGES' to 'VIEW_CHANNEL' to keep with Discord's API Docs
- Defaulted Guild.premium_subscription_count to 0 to stop error
- max_presences to 5,000 as Discord's API Suggest
- Added UserUpdate event for when the Client user is updated.

* Flake8 Spacing

* Update state.py

* Adding latency checking

*Note: Latency is in seconds NOT ms*

* Update client.py
---
 disco/gateway/client.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/disco/gateway/client.py b/disco/gateway/client.py
index 2876f48..b778201 100644
--- a/disco/gateway/client.py
+++ b/disco/gateway/client.py
@@ -2,6 +2,7 @@ import gevent
 import zlib
 import six
 import ssl
+import time
 
 import platform
 from websocket import ABNF
@@ -71,6 +72,10 @@ class GatewayClient(LoggingClass):
         self._heartbeat_task = None
         self._heartbeat_acknowledged = True
 
+        # Latency
+        self._last_heartbeat = 0
+        self.latency = -1
+
     def send(self, op, data):
         self.limiter.check()
         return self._send(op, data)
@@ -90,6 +95,7 @@ class GatewayClient(LoggingClass):
                 self._heartbeat_acknowledged = True
                 self.ws.close(status=4000)
                 return
+            self._last_heartbeat = time.time()
 
             self._send(OPCode.HEARTBEAT, self.seq)
             self._heartbeat_acknowledged = False
@@ -108,6 +114,7 @@ class GatewayClient(LoggingClass):
     def handle_heartbeat_acknowledge(self, _):
         self.log.debug('Received HEARTBEAT_ACK')
         self._heartbeat_acknowledged = True
+        self.latency = int((time.time() - self._last_heartbeat) * 1000)
 
     def handle_reconnect(self, _):
         self.log.warning('Received RECONNECT request, forcing a fresh reconnect')