Merge remote-tracking branch 'upstream/staging/v1.0.0' into staging/v1.0.0

disco/bot/bot.py

@@ -189,7 +189,8 @@ class Bot(LoggingClass):
         # Convert our configured mapping of entities to levels into something
         #  we can actually use. This ensures IDs are converted properly, and maps
         #  any level names (e.g. `role_id: admin`) map to their numerical values.
-        for entity_id, level in six.iteritems(self.config.levels):
+        for entity_id, level in list(six.iteritems(self.config.levels)):
+            del self.config.levels[entity_id]
             entity_id = int(entity_id) if str(entity_id).isdigit() else entity_id
             level = int(level) if str(level).isdigit() else get_enum_value_by_name(CommandLevels, level)
             self.config.levels[entity_id] = level

disco/gateway/packets.py

@@ -15,4 +15,3 @@ class OPCode(object):
     INVALID_SESSION = 9
     HELLO = 10
     HEARTBEAT_ACK = 11
-    GUILD_SYNC = 12

disco/types/channel.py

@@ -20,6 +20,7 @@ class ChannelType(object):
     GROUP_DM = 3
     GUILD_CATEGORY = 4
     GUILD_NEWS = 5
+    GUILD_STORE = 6
 
 
 class PermissionOverwriteType(object):