From b85376be3262893aa2e527dbc2e73185ea97dbab Mon Sep 17 00:00:00 2001
From: Andrei <b1naryth1ef@gmail.com>
Date: Thu, 1 Dec 2016 14:26:06 -0600
Subject: [PATCH] Add MessageReactionRemoveAll, etc fixes

- Fix passing plugins on command line
- Fix shard count in AutoSharder
---
 disco/cli.py             |  5 ++++-
 disco/gateway/events.py  | 15 +++++++++++++++
 disco/gateway/sharder.py |  2 --
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/disco/cli.py b/disco/cli.py
index 4b9d95b..10aa9f3 100644
--- a/disco/cli.py
+++ b/disco/cli.py
@@ -69,7 +69,10 @@ def disco_main(run=False):
     bot = None
     if args.run_bot or hasattr(config, 'bot'):
         bot_config = BotConfig(config.bot) if hasattr(config, 'bot') else BotConfig()
-        bot_config.plugins += args.plugin
+        if not hasattr(bot_config, 'plugins'):
+            bot_config.plugins = args.plugin
+        else:
+            bot_config.plugins += args.plugin
         bot = Bot(client, bot_config)
 
     if run:
diff --git a/disco/gateway/events.py b/disco/gateway/events.py
index 48e62ef..958b7a9 100644
--- a/disco/gateway/events.py
+++ b/disco/gateway/events.py
@@ -633,3 +633,18 @@ class MessageReactionRemove(GatewayEvent):
     @property
     def guild(self):
         return self.channel.guild
+
+
+class MessageReactionRemoveAll(GatewayEvent):
+    """
+    Sent when all reactions are removed from a message.
+
+    Attributes
+    ----------
+    channel_id : snowflake
+        The channel ID the message is in.
+    message_id : snowflake
+        The ID of the message for which the reactions where removed from.
+    """
+    channel_id = Field(snowflake)
+    message_id = Field(snowflake)
diff --git a/disco/gateway/sharder.py b/disco/gateway/sharder.py
index 0321cee..99e8d1a 100644
--- a/disco/gateway/sharder.py
+++ b/disco/gateway/sharder.py
@@ -63,8 +63,6 @@ class AutoSharder(object):
         self.client = APIClient(config.token)
         self.shards = {}
         self.config.shard_count = self.client.gateway_bot_get()['shards']
-        if self.config.shard_count > 1:
-            self.config.shard_count = 10
 
     def run_on(self, sid, raw):
         func = load_function(raw)