From fe1b5b294182f9416788db5aca2181c094f52a83 Mon Sep 17 00:00:00 2001
From: Rapptz <rapptz@gmail.com>
Date: Fri, 20 May 2016 17:55:58 -0400
Subject: [PATCH] Add support for voice channel user limits.

---
 discord/channel.py |  3 +++
 discord/client.py  | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/discord/channel.py b/discord/channel.py
index 08631a6c3..a1c6b774f 100644
--- a/discord/channel.py
+++ b/discord/channel.py
@@ -80,6 +80,8 @@ class Channel(Hashable):
     voice_members
         A list of :class:`Members` that are currently inside this voice channel.
         If :attr:`type` is not :attr:`ChannelType.voice` then this is always an empty array.
+    user_limit : int
+        The channel's limit for number of members that can be in a voice channel.
     """
 
     def __init__(self, **kwargs):
@@ -98,6 +100,7 @@ class Channel(Hashable):
         self.position = kwargs.get('position')
         self.bitrate = kwargs.get('bitrate')
         self.type = kwargs.get('type')
+        self.user_limit = kwargs.get('user_limit')
         try:
             self.type = ChannelType(self.type)
         except:
diff --git a/discord/client.py b/discord/client.py
index 8f7a64160..ed01351f2 100644
--- a/discord/client.py
+++ b/discord/client.py
@@ -1614,6 +1614,10 @@ class Client:
             The new channel's position in the GUI.
         topic : str
             The new channel's topic.
+        bitrate : int
+            The new channel's bitrate. Voice only.
+        user_limit : int
+            The new channel's user limit. Voice only.
 
         Raises
         ------
@@ -1627,9 +1631,17 @@ class Client:
         payload = {
             'name': options.get('name', channel.name),
             'topic': options.get('topic', channel.topic),
-            'position': options.get('position', channel.position)
+            'position': options.get('position', channel.position),
         }
 
+        user_limit = options.get('user_limit')
+        if user_limit is not None:
+            payload['user_limit'] = user_limit
+
+        bitrate = options.get('bitrate')
+        if bitrate is not None:
+            payload['bitrate'] = bitrate
+
         r = yield from self.session.patch(url, data=utils.to_json(payload), headers=self.headers)
         log.debug(request_logging_format.format(method='PATCH', response=r))
         yield from utils._verify_successful_response(r)