Fetching database for messages instead

discordbot/titanembeds/database/__init__.py

@@ -54,14 +54,38 @@ class DatabaseInterface(object):
                         message.channel.id,
                         message.id,
                         message.content,
+                        json.dumps(self.get_message_author(message)),
                         str(message.timestamp),
                         edit_ts,
-                        json.dumps(message.mentions),
+                        json.dumps(self.get_message_mentions(message.mentions)),
                         json.dumps(message.attachments)
                     )
                     session.add(msg)
                     session.commit()
 
+    def get_message_author(self, message):
+        author = message.author
+        obj = {
+            "username": author.name,
+            "discriminator": author.discriminator,
+            "bot": author.bot,
+            "id": author.id,
+            "avatar": author.avatar
+        }
+        return obj
+
+    def get_message_mentions(self, mentions):
+        ments = []
+        for author in mentions:
+            ments.append({
+                "username": author.name,
+                "discriminator": author.discriminator,
+                "bot": author.bot,
+                "id": author.id,
+                "avatar": author.avatar
+            })
+        return ments
+
     async def update_message(self, message):
         if message.server:
             async with threadpool():
@@ -73,8 +97,9 @@ class DatabaseInterface(object):
                     if msg:
                         msg.content = message.content
                         msg.edited_timestamp = message.edited_timestamp
-                        msg.mentions = json.dumps(message.mentions)
+                        msg.mentions = json.dumps(self.get_message_mentions(message.mentions))
                         msg.attachments = json.dumps(message.attachments)
+                        msg.author = json.dumps(self.get_message_author(message))
                         session.commit()
 
     async def delete_message(self, message):

discordbot/titanembeds/database/messages.py

@@ -7,16 +7,18 @@ class Messages(Base):
     channel_id = db.Column(db.String(255))          # Channel id
     message_id = db.Column(db.String(255))          # Message snowflake
     content = db.Column(db.Text())                  # Message contents
+    author = db.Column(db.Text())                   # Author json
     timestamp = db.Column(db.TIMESTAMP)             # Timestamp of when content is created
     edited_timestamp = db.Column(db.TIMESTAMP)      # Timestamp of when content is edited
     mentions = db.Column(db.Text())                 # Mentions serialized
     attachments = db.Column(db.Text())              # serialized attachments
 
-    def __init__(self, guild_id, channel_id, message_id, content, timestamp, edited_timestamp, mentions, attachments):
+    def __init__(self, guild_id, channel_id, message_id, content, author, timestamp, edited_timestamp, mentions, attachments):
         self.guild_id = guild_id
         self.channel_id = channel_id
         self.message_id = message_id
         self.content = content
+        self.author = author
         self.timestamp = timestamp
         self.edited_timestamp = edited_timestamp
         self.mentions = mentions