Message reactions support (untested)

disco/api/client.py

@@ -98,6 +98,23 @@ class APIClient(LoggingClass):
     def channels_messages_delete_bulk(self, channel, messages):
         self.http(Routes.CHANNELS_MESSAGES_DELETE_BULK, dict(channel=channel), json={'messages': messages})
 
+    def channels_messages_reactions_get(self, channel, message, emoji):
+        r = self.http(Routes.CHANNELS_MESSAGES_REACTIONS_GET, dict(channel=channel, message=message, emoji=emoji))
+        return User.create_map(self.client, r.json())
+
+    def channels_messages_reactions_create(self, channel, message, emoji):
+        self.http(Routes.CHANNELS_MESSAGES_REACTIONS_CREATE, dict(channel=channel, message=message, emoji=emoji))
+
+    def channels_messages_reactions_delete(self, channel, message, emoji, user=None):
+        route = Routes.CHANNELS_MESSAGES_REACTIONS_DELETE_ME
+        obj = dict(channel=channel, message=message, emoji=emoji)
+
+        if user:
+            route = Routes.CHANNELS_MESSAGES_REACTIONS_DELETE_USER
+            obj['user'] = user
+
+        self.http(route, obj)
+
     def channels_permissions_modify(self, channel, permission, allow, deny, typ):
         self.http(Routes.CHANNELS_PERMISSIONS_MODIFY, dict(channel=channel, permission=permission), json={
             'allow': allow,

disco/api/http.py

@@ -39,6 +39,10 @@ class Routes(object):
     CHANNELS_MESSAGES_MODIFY = (HTTPMethod.PATCH, CHANNELS + '/messages/{message}')
     CHANNELS_MESSAGES_DELETE = (HTTPMethod.DELETE, CHANNELS + '/messages/{message}')
     CHANNELS_MESSAGES_DELETE_BULK = (HTTPMethod.POST, CHANNELS + '/messages/bulk_delete')
+    CHANNELS_MESSAGES_REACTIONS_GET = (HTTPMethod.GET, CHANNELS + '/messages/{message}/reactions/{emoji}')
+    CHANNELS_MESSAGES_REACTIONS_CREATE = (HTTPMethod.PUT, CHANNELS + '/messages/{message}/reactions/{emoji}/@me')
+    CHANNELS_MESSAGES_REACTIONS_DELETE_ME = (HTTPMethod.DELETE, CHANNELS + '/messages/{message}/reactions/{emoji}/@me')
+    CHANNELS_MESSAGES_REACTIONS_DELETE_USER = (HTTPMethod.DELETE, CHANNELS + '/messages/{message}/reactions/{emoji}/{user}')
     CHANNELS_PERMISSIONS_MODIFY = (HTTPMethod.PUT, CHANNELS + '/permissions/{permission}')
     CHANNELS_PERMISSIONS_DELETE = (HTTPMethod.DELETE, CHANNELS + '/permissions/{permission}')
     CHANNELS_INVITES_LIST = (HTTPMethod.GET, CHANNELS + '/invites')

disco/bot/providers/redis.py

@@ -11,31 +11,33 @@ from .base import BaseProvider, SEP_SENTINEL
 class RedisProvider(BaseProvider):
     def __init__(self, config):
         self.config = config
+        self.format = config.get('format', 'pickle')
 
     def load(self):
-        self.redis = redis.Redis(
+        self.conn = redis.Redis(
             host=self.config.get('host', 'localhost'),
             port=self.config.get('port', 6379),
             db=self.config.get('db', 0))
 
     def exists(self, key):
-        return self.db.exists(key)
+        return self.conn.exists(key)
 
     def keys(self, other):
         count = other.count(SEP_SENTINEL) + 1
-        for key in self.db.scan_iter(u'{}*'.format(other)):
+        for key in self.conn.scan_iter(u'{}*'.format(other)):
+            key = key.decode('utf-8')
             if key.count(SEP_SENTINEL) == count:
                 yield key
 
     def get_many(self, keys):
-        for key, value in izip(keys, self.db.mget(keys)):
+        for key, value in izip(keys, self.conn.mget(keys)):
             yield (key, Serializer.loads(self.format, value))
 
     def get(self, key):
-        return Serializer.loads(self.format, self.db.get(key))
+        return Serializer.loads(self.format, self.conn.get(key))
 
     def set(self, key, value):
-        self.db.set(key, Serializer.dumps(self.format, value))
+        self.conn.set(key, Serializer.dumps(self.format, value))
 
     def delete(self, key, value):
-        self.db.delete(key)
+        self.conn.delete(key)

disco/gateway/encoding/base.py

@@ -1,7 +1,9 @@
 from websocket import ABNF
 
+from holster.interface import Interface
 
-class BaseEncoder(object):
+
+class BaseEncoder(Interface):
     TYPE = None
     OPCODE = ABNF.OPCODE_TEXT
 

disco/gateway/events.py

@@ -5,7 +5,7 @@ import six
 
 from disco.types.user import User, Presence
 from disco.types.channel import Channel
-from disco.types.message import Message
+from disco.types.message import Message, MessageReactionEmoji
 from disco.types.voice import VoiceState
 from disco.types.guild import Guild, GuildMember, Role, Emoji
 
@@ -524,3 +524,45 @@ class WebhooksUpdate(GatewayEvent):
     """
     channel_id = Field(snowflake)
     guild_id = Field(snowflake)
+
+
+class MessageReactionAdd(GatewayEvent):
+    """
+    Sent when a reaction is added to a message.
+
+    Attributes
+    ----------
+    channel_id : snowflake
+        The channel ID the message is in.
+    messsage_id : snowflake
+        The ID of the message for which the reaction was added too.
+    user_id : snowflake
+        The ID of the user who added the reaction.
+    emoji : :class:`disco.types.message.MessageReactionEmoji`
+        The emoji which was added.
+    """
+    channel_id = Field(snowflake)
+    message_id = Field(snowflake)
+    user_id = Field(snowflake)
+    emoji = Field(MessageReactionEmoji)
+
+
+class MessageReactionRemove(GatewayEvent):
+    """
+    Sent when a reaction is removed from a message.
+
+    Attributes
+    ----------
+    channel_id : snowflake
+        The channel ID the message is in.
+    messsage_id : snowflake
+        The ID of the message for which the reaction was removed from.
+    user_id : snowflake
+        The ID of the user who originally added the reaction.
+    emoji : :class:`disco.types.message.MessageReactionEmoji`
+        The emoji which was removed.
+    """
+    channel_id = Field(snowflake)
+    message_id = Field(snowflake)
+    user_id = Field(snowflake)
+    emoji = Field(MessageReactionEmoji)

disco/types/message.py

@@ -19,6 +19,17 @@ MessageType = Enum(
 )
 
 
+class MessageReactionEmoji(SlottedModel):
+    id = Field(snowflake)
+    name = Field(text)
+
+
+class MessageReaction(SlottedModel):
+    emoji = Field(MessageReactionEmoji)
+    count = Field(int)
+    me = Field(bool)
+
+
 class MessageEmbedFooter(SlottedModel):
     text = Field(text)
     icon_url = Field(text)
@@ -170,6 +181,7 @@ class Message(SlottedModel):
     mention_roles = Field(listof(snowflake))
     embeds = Field(listof(MessageEmbed))
     attachments = Field(dictof(MessageAttachment, key='id'))
+    reactions = Field(listof(MessageReaction))
 
     def __str__(self):
         return '<Message {} ({})>'.format(self.id, self.channel_id)