From c338d5e930e22b8a8c26d65a5b70d103f493c8c2 Mon Sep 17 00:00:00 2001
From: Dominik Picheta <dominikpicheta@gmail.com>
Date: Wed, 16 May 2018 14:39:14 +0100
Subject: [PATCH] Fixes crash with profile view on new profile.

---
 forum.nim            | 28 ++++++++++++++++------------
 redesign/profile.nim | 28 +++++++++++++++-------------
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/forum.nim b/forum.nim
index 3f951bc..c55f074 100644
--- a/forum.nim
+++ b/forum.nim
@@ -1286,38 +1286,42 @@ routes:
 
     let postsQuery = sql("""
       select p.id, strftime('%s', p.creation),
-             u.name, u.email, strftime('%s', u.lastOnline), u.status,
-             strftime('%s', u.creation), u.id,
              t.name, t.id
       $1
       order by p.id desc limit 10;
     """ % postsFrom)
 
+    let userQuery = sql("""
+      select name, email, strftime('%s', lastOnline), status,
+             strftime('%s', creation), id
+      from person
+      where name = ?
+    """)
+
     var profile = Profile(
       threads: @[],
       posts: @[]
     )
 
-    let rows = db.getAllRows(postsQuery, username)
-    let userID = rows[0][7]
-    profile.user = selectUser(@[
-      rows[0][2], rows[0][3], rows[0][4], rows[0][5]
-    ], avatarSize=200)
-    profile.joinTime = rows[0][6].parseInt()
+    let userRow = db.getRow(userQuery, username)
+
+    let userID = userRow[^1]
+    profile.user = selectUser(userRow, avatarSize=200)
+    profile.joinTime = userRow[4].parseInt()
     profile.postCount =
       getValue(db, sql("select count(*) " & postsFrom), username).parseInt()
     profile.threadCount =
       getValue(db, sql("select count(*) " & threadsFrom), userID).parseInt()
 
     if c.rank >= Admin:
-      profile.email = some(rows[0][3])
+      profile.email = some(userRow[1])
 
-    for row in rows:
+    for row in db.getAllRows(postsQuery, username):
       profile.posts.add(
         PostLink(
           creation: row[1].parseInt(),
-          topic: row[8],
-          threadId: row[9].parseInt(),
+          topic: row[2],
+          threadId: row[3].parseInt(),
           postId: row[0].parseInt()
         )
       )
diff --git a/redesign/profile.nim b/redesign/profile.nim
index 7c78249..7ab23ac 100644
--- a/redesign/profile.nim
+++ b/redesign/profile.nim
@@ -79,8 +79,9 @@ when defined(js):
           dl():
             dt(text "Joined")
             dd(text threadlist.renderActivity(profile.joinTime))
-            dt(text "Last Post")
-            dd(text renderActivity(profile.posts[0].creation))
+            if profile.posts.len > 0:
+              dt(text "Last Post")
+              dd(text renderActivity(profile.posts[0].creation))
             dt(text "Last Online")
             dd(text renderActivity(profile.user.lastOnline))
             dt(text "Posts")
@@ -102,16 +103,17 @@ when defined(js):
               dd(class="spoiler"):
                 text profile.email.get()
 
-        tdiv(class="columns"):
-          tdiv(class="column col-6"):
-            h4(text "Latest Posts")
-            tdiv(class="posts"):
-              for post in profile.posts:
-                genPostLink(post)
-          tdiv(class="column col-6"):
-            h4(text "Latest Threads")
-            tdiv(class="posts"):
-              for thread in profile.threads:
-                genPostLink(thread)
+        if profile.posts.len > 0 or profile.threads.len > 0:
+          tdiv(class="columns"):
+            tdiv(class="column col-6"):
+              h4(text "Latest Posts")
+              tdiv(class="posts"):
+                for post in profile.posts:
+                  genPostLink(post)
+            tdiv(class="column col-6"):
+              h4(text "Latest Threads")
+              tdiv(class="posts"):
+                for thread in profile.threads:
+                  genPostLink(thread)