From b079dd428ad78336030a2d58a5840433c13a6eae Mon Sep 17 00:00:00 2001
From: Luna <git@l4.pm>
Date: Tue, 5 Feb 2019 18:00:35 -0300
Subject: [PATCH] storage: handle webhook authors in messages

---
 litecord/pubsub/channel.py |  2 +-
 litecord/storage.py        | 24 +++++++++++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/litecord/pubsub/channel.py b/litecord/pubsub/channel.py
index decf340..ef23a6a 100644
--- a/litecord/pubsub/channel.py
+++ b/litecord/pubsub/channel.py
@@ -48,7 +48,7 @@ class ChannelDispatcher(DispatcherWithState):
             # if we are dispatching to a guild channel,
             # we should only dispatch to the states / shards
             # that are connected to the guild (via their shard id).
-            
+
             # if we aren't, we just get all states tied to the user.
             # TODO: make a fetch_states that fetches shards
             #        - with id 0 (count any) OR
diff --git a/litecord/storage.py b/litecord/storage.py
index c41f0b2..3f96058 100644
--- a/litecord/storage.py
+++ b/litecord/storage.py
@@ -677,16 +677,29 @@ class Storage:
             # i think proxy_url=url is valid.
             drow['proxy_url'] = drow['url']
 
-            # TODO: url, proxy_url
-
             res.append(drow)
 
         return res
 
+    async def _inject_author(self, res):
+        """Inject a pseudo-user object when the message is made by a webhook."""
+        author_id, webhook_id = res['author_id'], res['webhook_id']
+
+        if author_id is not None:
+            res['author'] = await self.get_user(res['author_id'])
+        elif webhook_id is not None:
+            res['author'] = {
+                'id': webhook_id,
+                'username': 'a',
+                'avatar': None
+            }
+
+        res.pop('author_id')
+
     async def get_message(self, message_id: int, user_id=None) -> Dict:
         """Get a single message's payload."""
         row = await self.fetchrow_with_json("""
-        SELECT id::text, channel_id::text, author_id, content,
+        SELECT id::text, channel_id::text, author_id, webhook_id, content,
             created_at AS timestamp, edited_at AS edited_timestamp,
             tts, mention_everyone, nonce, message_type, embeds
         FROM messages
@@ -745,11 +758,8 @@ class Storage:
 
         res['reactions'] = await self.get_reactions(message_id, user_id)
 
-        # TODO: handle webhook authors
-        res['author'] = await self.get_user(res['author_id'])
-        res.pop('author_id')
+        await self._inject_author(res)
 
-        # TODO: res['attachments']
         res['attachments'] = await self.get_attachments(message_id)
 
         # TODO: res['member'] for partial member data