From 7b806667cda6dc26b6a99d73473dcff5c2dd4044 Mon Sep 17 00:00:00 2001
From: Rapptz <rapptz@gmail.com>
Date: Mon, 19 Jun 2017 04:25:05 -0400
Subject: [PATCH] Fix afk_channel being None in Client.edit_server

---
 discord/client.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/discord/client.py b/discord/client.py
index c6d1e59dd..51e2332f1 100644
--- a/discord/client.py
+++ b/discord/client.py
@@ -2307,7 +2307,7 @@ class Client:
             ``INVITE_SPLASH`` feature.
         region: :class:`ServerRegion`
             The new region for the server's voice communication.
-        afk_channel: :class:`Channel`
+        afk_channel: Optional[:class:`Channel`]
             The new channel that is the AFK channel. Could be ``None`` for no AFK channel.
         afk_timeout: int
             The number of seconds until someone is moved to the AFK channel.
@@ -2353,8 +2353,16 @@ class Client:
 
         fields['icon'] = icon
         fields['splash'] = splash
-        if 'afk_channel' in fields:
-            fields['afk_channel_id'] = fields['afk_channel'].id
+
+        try:
+            afk_channel = fields.pop('afk_channel')
+        except KeyError:
+            pass
+        else:
+            if afk_channel is None:
+                fields['afk_channel_id'] = afk_channel
+            else:
+                fields['afk_channel_id'] = afk_channel.id
 
         if 'owner' in fields:
             if server.owner != server.me: