From 562af023f15c1bd9c495b4460537330c809340be Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Mon, 25 Mar 2024 19:40:43 +0800
Subject: [PATCH] :sparkles: Realm posts mixed in feed :poop: The feed api
 didn't respect the visibility level

---
 pkg/server/feed_api.go                        | 22 ++++++++++++-------
 pkg/views/src/components/posts/PostAction.vue |  1 +
 pkg/views/src/components/posts/PostItem.vue   |  6 ++++-
 pkg/views/src/views/posts/articles.vue        |  1 +
 pkg/views/src/views/posts/moments.vue         |  1 +
 settings.toml                                 |  2 +-
 6 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/pkg/server/feed_api.go b/pkg/server/feed_api.go
index 3195340..f847b24 100644
--- a/pkg/server/feed_api.go
+++ b/pkg/server/feed_api.go
@@ -2,6 +2,7 @@ package server
 
 import (
 	"fmt"
+	"strings"
 
 	"git.solsynth.dev/hydrogen/interactive/pkg/database"
 	"git.solsynth.dev/hydrogen/interactive/pkg/models"
@@ -24,12 +25,12 @@ func listFeed(c *fiber.Ctx) error {
 		take = 20
 	}
 
-	var whereCondition string
+	var whereConditions []string
 
-	if realmId > 0 {
-		whereCondition += fmt.Sprintf("feed.realm_id = %d", realmId)
-	} else {
-		whereCondition += "feed.realm_id IS NULL"
+	if realmId < 0 {
+		whereConditions = append(whereConditions, "feed.realm_id IS NULL")
+	} else if realmId > 0 {
+		whereConditions = append(whereConditions, fmt.Sprintf("feed.realm_id = %d", realmId))
 	}
 
 	var author models.Account
@@ -37,10 +38,15 @@ func listFeed(c *fiber.Ctx) error {
 		if err := database.C.Where(&models.Account{Name: c.Query("authorId")}).First(&author).Error; err != nil {
 			return fiber.NewError(fiber.StatusNotFound, err.Error())
 		} else {
-			whereCondition += fmt.Sprintf("AND feed.author_id = %d", author.ID)
+			whereConditions = append(whereConditions, fmt.Sprintf("feed.author_id = %d", author.ID))
 		}
 	}
 
+	var whereStatement string
+	if len(whereConditions) > 0 {
+		whereStatement += "WHERE " + strings.Join(whereConditions, " AND ")
+	}
+
 	var result []*models.Feed
 
 	userTable := viper.GetString("database.prefix") + "accounts"
@@ -63,11 +69,11 @@ func listFeed(c *fiber.Ctx) error {
             GROUP BY article_id, moment_id) AS reactions
             ON (feed.model_type = 'article' AND feed.id = reactions.article_id) OR 
 			   (feed.model_type = 'moment' AND feed.id = reactions.moment_id)
-		WHERE %s ORDER BY feed.created_at desc  LIMIT ? OFFSET ?`,
+		%s ORDER BY feed.created_at desc  LIMIT ? OFFSET ?`,
 			userTable,
 			commentTable,
 			reactionTable,
-			whereCondition,
+			whereStatement,
 		),
 		database.C.Select(queryArticle).Model(&models.Article{}),
 		database.C.Select(queryMoment).Model(&models.Moment{}),
diff --git a/pkg/views/src/components/posts/PostAction.vue b/pkg/views/src/components/posts/PostAction.vue
index 805ec6d..8a2e091 100644
--- a/pkg/views/src/components/posts/PostAction.vue
+++ b/pkg/views/src/components/posts/PostAction.vue
@@ -26,6 +26,7 @@ const isOwned = computed(() => props.item?.author_id === id.userinfo.data.id)
 
 function editPost() {
   editor.related.edit_to = JSON.parse(JSON.stringify(props.item))
+  // eslint-disable-next-line
   if (editor.show.hasOwnProperty(props.item.model_type)) {
     // @ts-ignore
     editor.show[props.item.model_type] = true
diff --git a/pkg/views/src/components/posts/PostItem.vue b/pkg/views/src/components/posts/PostItem.vue
index 8c6db4a..aedb04d 100644
--- a/pkg/views/src/components/posts/PostItem.vue
+++ b/pkg/views/src/components/posts/PostItem.vue
@@ -33,8 +33,11 @@
         @update="updateReactions"
       />
 
-      <div class="mt-1 text-xs opacity-80 flex gap-2 items-center">
+      <div class="mt-3 text-xs opacity-80 flex items-center">
         <span>Posted at {{ new Date(props.item?.created_at).toLocaleString() }}</span>
+        <section v-if="props.item?.realm_id">
+          &nbsp;·&nbsp;<span>In realm #{{ props.item?.realm_id }}</span>
+        </section>
       </div>
     </div>
 
@@ -67,6 +70,7 @@ function updateReactions(symbol: string, num: number) {
   if (item.reaction_list == null) {
     item.reaction_list = {}
   }
+  // eslint-disable-next-line
   if (item.reaction_list.hasOwnProperty(symbol)) {
     item.reaction_list[symbol] += num
   } else {
diff --git a/pkg/views/src/views/posts/articles.vue b/pkg/views/src/views/posts/articles.vue
index 104f8f5..f65051e 100644
--- a/pkg/views/src/views/posts/articles.vue
+++ b/pkg/views/src/views/posts/articles.vue
@@ -92,6 +92,7 @@ async function readPost() {
 readPost()
 
 function updateReactions(symbol: string, num: number) {
+  // eslint-disable-next-line
   if (post.value.reaction_list.hasOwnProperty(symbol)) {
     post.value.reaction_list[symbol] += num
   } else {
diff --git a/pkg/views/src/views/posts/moments.vue b/pkg/views/src/views/posts/moments.vue
index 27b37c4..8c636d3 100644
--- a/pkg/views/src/views/posts/moments.vue
+++ b/pkg/views/src/views/posts/moments.vue
@@ -100,6 +100,7 @@ async function readPost() {
 readPost()
 
 function updateReactions(symbol: string, num: number) {
+  // eslint-disable-next-line
   if (post.value.reaction_list.hasOwnProperty(symbol)) {
     post.value.reaction_list[symbol] += num
   } else {
diff --git a/settings.toml b/settings.toml
index d1227fe..a7bf7af 100644
--- a/settings.toml
+++ b/settings.toml
@@ -8,7 +8,7 @@ secret = "LtTjzAGFLshwXhN4ZD4nG5KlMv1MWcsvfv03TSZYnT1VhiAnLIZFTnHUwR0XhGgi"
 content = "uploads"
 
 [debug]
-database = false
+database = true
 print_routes = false
 
 [identity]