✨ Complete friend visibility

pkg/internal/services/accounts.go

@@ -2,15 +2,45 @@ package services
 
 import (
 	"context"
+	"fmt"
 	"git.solsynth.dev/hydrogen/dealer/pkg/hyper"
 	"git.solsynth.dev/hydrogen/dealer/pkg/proto"
 	"git.solsynth.dev/hydrogen/interactive/pkg/internal/database"
 	"git.solsynth.dev/hydrogen/interactive/pkg/internal/gap"
 	"git.solsynth.dev/hydrogen/interactive/pkg/internal/models"
 	"github.com/rs/zerolog/log"
+	"github.com/samber/lo"
 	"time"
 )
 
+func ListAccountFriends(user models.Account) ([]models.Account, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
+	defer cancel()
+
+	pc, err := gap.H.GetServiceGrpcConn(hyper.ServiceTypeAuthProvider)
+	if err != nil {
+		return nil, fmt.Errorf("failed to listing account friends: %v", err)
+	}
+	result, err := proto.NewAuthClient(pc).ListUserFriends(ctx, &proto.ListUserRelativeRequest{
+		UserId:    uint64(user.ID),
+		IsRelated: true,
+	})
+	if err != nil {
+		return nil, fmt.Errorf("failed to listing account friends: %v", err)
+	}
+
+	out := lo.Map(result.Data, func(item *proto.SimpleUserInfo, index int) uint {
+		return uint(item.Id)
+	})
+
+	var accounts []models.Account
+	if err = database.C.Where("id IN ?", out).Find(&accounts).Error; err != nil {
+		return nil, fmt.Errorf("failed to linking listed account friends: %v", err)
+	}
+
+	return accounts, nil
+}
+
 func ModifyPosterVoteCount(user models.Account, isUpvote bool, delta int) error {
 	if isUpvote {
 		user.TotalUpvote += delta

pkg/internal/services/posts.go

@@ -24,17 +24,23 @@ func FilterPostWithUserContext(tx *gorm.DB, user *models.Account) *gorm.DB {
 	const (
 		FriendsVisibility  = models.PostVisibilityFriends
 		SelectedVisibility = models.PostVisibilitySelected
+		FilteredVisibility = models.PostVisibilityFiltered
 		NoneVisibility     = models.PostVisibilityNone
 	)
 
-	// TODO Blocked by dealer, need support get friend list
+	friends, _ := ListAccountFriends(*user)
+	friendAllowList := lo.Map(friends, func(item models.Account, index int) uint {
+		return item.ID
+	})
+
 	tx = tx.Where(
-		"(visibility != ? OR visibility != ? OR (visibility = ? AND ?) OR (visibility = ? AND NOT ?) OR author_id = ?)",
-		FriendsVisibility,
+		"(visibility != ? OR (visibility != ? AND author_id IN ?) OR (visibility = ? AND ?) OR (visibility = ? AND NOT ?) OR author_id = ?)",
 		NoneVisibility,
+		FriendsVisibility,
+		friendAllowList,
 		SelectedVisibility,
 		datatypes.JSONQuery("visible_users").HasKey(strconv.Itoa(int(user.ID))),
-		SelectedVisibility,
+		FilteredVisibility,
 		datatypes.JSONQuery("invisible_users").HasKey(strconv.Itoa(int(user.ID))),
 		user.ID,
 	)