From bd757e214bc33ee29c6f50b7a8fe699ee922c2fe Mon Sep 17 00:00:00 2001
From: Troplo <troplo@flowinity.com>
Date: Mon, 30 Nov 2020 18:17:24 +1100
Subject: [PATCH] asdasdasdad

---
 frontend/src/components/ThreadCubashImpl.vue | 28 +++++---------------
 frontend/src/components/routes/Thread.vue    | 20 +++++---------
 frontend/src/store/modules/thread.js         |  2 ++
 models/post.js                               |  3 +--
 routes/user.js                               | 15 +++--------
 5 files changed, 21 insertions(+), 47 deletions(-)

diff --git a/frontend/src/components/ThreadCubashImpl.vue b/frontend/src/components/ThreadCubashImpl.vue
index 3d242d4..2c37eef 100644
--- a/frontend/src/components/ThreadCubashImpl.vue
+++ b/frontend/src/components/ThreadCubashImpl.vue
@@ -1,43 +1,28 @@
 <template>
   <div
     class='post'
-    :class='{
-			"post--highlighted": highlight,
-			"post--selected": selected
-		}'
-    @mouseenter='hover = true'
-    @mouseleave='hover = false'
   >
 
 
     <div class='post__meta_data'>
       <div style='display: inline-flex;'>
-        <avatar-icon :user='post.User' class='post__avatar'></avatar-icon>
-        <div class='post__thread' v-if='showThread' @click.stop='goToThread'>
-          &nbsp;&middot;&nbsp;
+        <avatar-icon :user='$store.state.thread.username' class='post__avatar'></avatar-icon>
+        <div class='post__thread' v-if='showThread'>
         </div>
         <div class='post__user' v-else>
-          PLACEHOLDER-USERNAME
+          {{$store.state.thread.username.username}}
         </div>
       </div>
-    PLACEHOLDER DATE</div>
-    <div class='post__date post__date--mobile'>PLACEHOLDER DATE</div>
+    </div>
     <div
       tabindex='-1'
       class='post__content'
-      v-html='postContentHTML'
-      @mouseup='setShowQuote'
-      @blur='showQuote = false'
+      v-html='$store.state.thread.content'
     ></div>
     <div class='post__footer'>
       <div
         class='post__footer_group'
       >
-        <div class='post__footer_sub_group'>
-          <heart-button :post='post' v-if='showReply'></heart-button>
-        </div>
-        <div class='post__footer_sub_group' v-if='post.Replies.length'>
-        </div>
 
       </div>
     </div>
@@ -64,7 +49,8 @@
 		components: {
       // eslint-disable-next-line vue/no-unused-components
 			ModalWindow,
-			AvatarIcon,
+      // eslint-disable-next-line vue/no-unused-components
+      AvatarIcon,
 
 		},
 		data () {
diff --git a/frontend/src/components/routes/Thread.vue b/frontend/src/components/routes/Thread.vue
index 5bbb64e..be2c1c3 100644
--- a/frontend/src/components/routes/Thread.vue
+++ b/frontend/src/components/routes/Thread.vue
@@ -17,11 +17,13 @@
 				@loadPrevious='loadPreviousPosts'
 			>
 				<template v-if='!posts.length'>
-					<thread-post-placeholder
-						v-for='n in 3'
-						:key='"thread-post-placeholder-loading-" + n'
-						:class='{"post--last": n === 2}'
-					></thread-post-placeholder>
+          <thread-cubash-impl
+            :show-reply='!$store.state.thread.locked'
+            :showSelect='$store.state.thread.showRemovePostsButton'
+            :allowQuote='true'
+
+            ref='posts'
+          ></thread-cubash-impl>
 				</template>
 
 				<template v-if='$store.state.thread.loadingPosts === "previous"'>
@@ -31,14 +33,6 @@
 					>
 					</thread-post-placeholder>
 				</template>
-        <thread-cubash-impl
-          :show-reply='!$store.state.thread.locked'
-          :showSelect='$store.state.thread.showRemovePostsButton'
-          :highlight='highlightedPostIndex === index'
-          :allowQuote='true'
-
-          ref='posts'
-        ></thread-cubash-impl>
 				<thread-post
 					v-for='(post, index) in posts'
 					:key='"thread-post-" + post.id'
diff --git a/frontend/src/store/modules/thread.js b/frontend/src/store/modules/thread.js
index fd2000a..e260026 100644
--- a/frontend/src/store/modules/thread.js
+++ b/frontend/src/store/modules/thread.js
@@ -280,6 +280,8 @@ const mutations = {
 		state.thread = obj.name
     state.content = obj.content
     state.title = obj.title
+    state.username = obj.User
+    state.createdAt = obj.createdAt
 		state.threadId = obj.id
 		state.PollQuestionId = obj.PollQuestionId
 		state.category = obj.Category
diff --git a/models/post.js b/models/post.js
index 7f282d0..bf4e5f8 100644
--- a/models/post.js
+++ b/models/post.js
@@ -95,10 +95,9 @@ module.exports = (sequelize, DataTypes) => {
 
 		return [
 			{ model: models.User, attributes: ['username', 'createdAt', 'id', 'color', 'picture'] },
-			{ model: models.User, as: 'Likes', attributes: ['username', 'createdAt', 'id', 'color', 'picture'] },
 			{ model: models.Thread, include: [models.Category]} ,
 			{
-				model: models.Post, as: 'Replies', include:
+				model: models.Post, as: 'Posts', include:
 					[{ model: models.User, attributes: ['username', 'id', 'color', 'picture'] }]
 			}
 		]
diff --git a/routes/user.js b/routes/user.js
index f57bae9..7367c3b 100644
--- a/routes/user.js
+++ b/routes/user.js
@@ -194,13 +194,6 @@ router.get('/', async(req, res, next) => {
 		};
 		let offset = Number.isInteger(+req.query.offset) ? +req.query.offset : 0;
 		let havingClause = '';
-		if(req.query.role === 'admin') {
-			havingClause = 'HAVING Users.admin = true';
-		} else if(req.query.role === 'user') {
-			havingClause = 'HAVING Users.admin = false';
-		} else {
-			havingClause = 'Having Users.hidden = false';
-		}
 		if(req.query.search) {
 			//I.e. if there is not already a HAVING clause
 			if(!havingClause.length) {
@@ -211,17 +204,17 @@ router.get('/', async(req, res, next) => {
 			havingClause += 'Users.username LIKE $search';
 		}
 		let sql = `	
-			SELECT X.username, X.admin, X.picture, X.level, X.levelProgress, X.bot, X.booster, X.description, X.bodyColor, X.headColor, X.leftLegColor, X.rightLegColor, X.leftArmColor, X.rightArmColor, X.hidden, X.system, X.createdAt, X.contributor, X.postCount, COUNT(Threads.id) as threadCount	
+			SELECT X.username, X.postCount, COUNT(Threads.id) as threadCount	
 			FROM (	
 				SELECT Users.*, COUNT(Posts.id) as postCount	
 				FROM Users	
 				LEFT OUTER JOIN Posts	
-				ON Users.id = Posts.UserId	
-				GROUP BY Users.id	
+				ON Users.id = Posts.UserUsername	
+				GROUP BY Users.username	
 				${havingClause}	
 			) as X	
 			LEFT OUTER JOIN threads	
-			ON X.id = Threads.UserId	
+			ON X.username = Threads.UserUsername	
 			GROUP BY X.id	
 			ORDER BY ${sortFields[req.query.sort] || 'X.id'} ${req.query.order === 'asc' ? 'DESC' : 'ASC'}	
 			LIMIT 30