add mentions

app/models.py

@@ -53,7 +53,8 @@ class Users(Model):
                 COUNT(DISTINCT threads.id) AS thread_count,
                 MAX(threads.title) FILTER (WHERE threads.created_at = latest.created_at) AS latest_thread_title,
                 MAX(threads.slug) FILTER (WHERE threads.created_at = latest.created_at) AS latest_thread_slug,
-                inviter.username AS inviter_username
+                inviter.username AS inviter_username,
+                inviter.display_name AS inviter_display_name
             FROM users
             LEFT JOIN posts ON posts.user_id = users.id
             LEFT JOIN threads ON threads.user_id = users.id
@@ -106,6 +107,15 @@ class Users(Model):
         res = db.query(q, self.id)
         return [BookmarkCollections.find({'id': bc['id']}) for bc in res]
 
+    def get_readable_name(self):
+        if self.display_name:
+            return self.display_name
+
+        return self.username
+
+    def has_display_name(self):
+        return self.display_name != ''
+
 
 class Topics(Model):
     table = "topics"
@@ -116,6 +126,7 @@ class Topics(Model):
             SELECT
                 topics.id, topics.name, topics.slug, topics.description, topics.is_locked,
                 users.username AS latest_thread_username,
+                users.display_name AS latest_thread_display_name,
                 threads.title AS latest_thread_title,
                 threads.slug AS latest_thread_slug,
                 threads.created_at AS latest_thread_created_at
@@ -141,7 +152,7 @@ class Topics(Model):
                 SELECT
                     threads.topic_id, threads.id AS thread_id, threads.title AS thread_title, threads.slug AS thread_slug,
                     posts.id AS post_id, posts.created_at AS post_created_at,
-                    users.username,
+                    users.username, users.display_name,
                     ROW_NUMBER() OVER (PARTITION BY threads.topic_id ORDER BY posts.created_at DESC) AS rn
                 FROM
                     threads
@@ -154,7 +165,7 @@ class Topics(Model):
                 topic_id,
                 thread_id, thread_title, thread_slug,
                 post_id, post_created_at,
-                username
+                username, display_name
             FROM
                 ranked_threads
             WHERE
@@ -170,6 +181,7 @@ class Topics(Model):
                 'thread_slug': thread['thread_slug'],
                 'post_id': thread['post_id'],
                 'username': thread['username'],
+                'display_name': thread['display_name'],
                 'post_created_at': thread['post_created_at']
             }
         return active_threads
@@ -185,7 +197,9 @@ class Topics(Model):
             SELECT
                 threads.id, threads.title, threads.slug, threads.created_at, threads.is_locked, threads.is_stickied,
                 users.username AS started_by,
-            u.username AS latest_post_username,
+                users.display_name AS started_by_display_name,
+                u.username AS latest_post_username,
+                u.display_name AS latest_post_display_name,
                 ph.content AS latest_post_content,
                 posts.created_at AS latest_post_created_at,
                 posts.id AS latest_post_id
@@ -230,7 +244,13 @@ class Threads(Model):
 class Posts(Model):
     FULL_POSTS_QUERY = """
         SELECT
-            posts.id, posts.created_at, post_history.content, post_history.edited_at, users.username, users.status, avatars.file_path AS avatar_path, posts.thread_id, users.id AS user_id, post_history.original_markup, users.signature_rendered, threads.slug AS thread_slug, threads.is_locked AS thread_is_locked, threads.title AS thread_title
+            posts.id, posts.created_at,
+            post_history.content, post_history.edited_at,
+            users.username, users.display_name, users.status,
+            avatars.file_path AS avatar_path, posts.thread_id,
+            users.id AS user_id, post_history.original_markup,
+            users.signature_rendered, threads.slug AS thread_slug,
+            threads.is_locked AS thread_is_locked, threads.title AS thread_title
         FROM
             posts
         JOIN
@@ -410,3 +430,7 @@ class MOTD(Model):
         q = 'SELECT id FROM motd'
         res = db.query(q)
         return [MOTD.find({'id': i['id']}) for i in res]
+
+
+class Mentions(Model):
+    table = 'mentions'