From 3e9c84a2848ef4c896dc234e4b27d3f2f5ae2e93 Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Thu, 25 Apr 2024 22:08:49 +0800
Subject: [PATCH] :sparkles: Able to list all the friend without status filter

---
 .idea/workspace.xml           | 10 +++-------
 pkg/server/friendships_api.go | 16 ++++++++++++----
 pkg/server/startup.go         |  5 +++--
 pkg/services/friendships.go   | 14 ++++++++++++++
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a5a4431..08ecef9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,13 +4,8 @@
     <option name="autoReloadType" value="ALL" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":bug: Bug fixes of design">
+    <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":sparkles: Bug fixes">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pkg/server/auth_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/server/auth_api.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pkg/server/oauth_api.go" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/pkg/server/startup.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/server/startup.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pkg/views/users/directory/userinfo.gohtml" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/views/users/directory/userinfo.gohtml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pkg/views/users/me.gohtml" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/views/users/me.gohtml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -142,7 +137,8 @@
     <MESSAGE value=":sparkles: Others userinfo" />
     <MESSAGE value=":lipstick: Fix ui design" />
     <MESSAGE value=":bug: Bug fixes of design" />
-    <option name="LAST_COMMIT_MESSAGE" value=":bug: Bug fixes of design" />
+    <MESSAGE value=":sparkles: Bug fixes" />
+    <option name="LAST_COMMIT_MESSAGE" value=":sparkles: Bug fixes" />
   </component>
   <component name="VgoProject">
     <settings-migrated>true</settings-migrated>
diff --git a/pkg/server/friendships_api.go b/pkg/server/friendships_api.go
index 59c7ba4..fcc15ba 100644
--- a/pkg/server/friendships_api.go
+++ b/pkg/server/friendships_api.go
@@ -9,13 +9,21 @@ import (
 
 func listFriendship(c *fiber.Ctx) error {
 	user := c.Locals("principal").(models.Account)
-	status := c.QueryInt("status", int(models.FriendshipActive))
+	status := c.QueryInt("status", -1)
 
-	if friends, err := services.ListFriend(user, models.FriendshipStatus(status)); err != nil {
-		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
+	var err error
+	var friends []models.AccountFriendship
+	if status < 0 {
+		if friends, err = services.ListAllFriend(user); err != nil {
+			return fiber.NewError(fiber.StatusInternalServerError, err.Error())
+		}
 	} else {
-		return c.JSON(friends)
+		if friends, err = services.ListFriend(user, models.FriendshipStatus(status)); err != nil {
+			return fiber.NewError(fiber.StatusInternalServerError, err.Error())
+		}
 	}
+
+	return c.JSON(friends)
 }
 
 func getFriendship(c *fiber.Ctx) error {
diff --git a/pkg/server/startup.go b/pkg/server/startup.go
index 00f8ca6..3b0452e 100644
--- a/pkg/server/startup.go
+++ b/pkg/server/startup.go
@@ -1,6 +1,9 @@
 package server
 
 import (
+	"net/http"
+	"strings"
+
 	"git.solsynth.dev/hydrogen/passport/pkg"
 	"git.solsynth.dev/hydrogen/passport/pkg/i18n"
 	"git.solsynth.dev/hydrogen/passport/pkg/server/ui"
@@ -14,8 +17,6 @@ import (
 	jsoniter "github.com/json-iterator/go"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/viper"
-	"net/http"
-	"strings"
 )
 
 var A *fiber.App
diff --git a/pkg/services/friendships.go b/pkg/services/friendships.go
index a7a8389..4c0a039 100644
--- a/pkg/services/friendships.go
+++ b/pkg/services/friendships.go
@@ -3,11 +3,25 @@ package services
 import (
 	"errors"
 	"fmt"
+
 	"git.solsynth.dev/hydrogen/passport/pkg/database"
 	"git.solsynth.dev/hydrogen/passport/pkg/models"
 	"gorm.io/gorm"
 )
 
+func ListAllFriend(anyside models.Account) ([]models.AccountFriendship, error) {
+	var relationships []models.AccountFriendship
+	if err := database.C.
+		Where("account_id = ? OR related_id = ?", anyside.ID, anyside.ID).
+		Preload("Account").
+		Preload("Related").
+		Find(&relationships).Error; err != nil {
+		return relationships, err
+	}
+
+	return relationships, nil
+}
+
 func ListFriend(anyside models.Account, status models.FriendshipStatus) ([]models.AccountFriendship, error) {
 	var relationships []models.AccountFriendship
 	if err := database.C.