From 5945869ce3c5900079269bd503005fed2d66a544 Mon Sep 17 00:00:00 2001
From: Bruno Muniz <bf2002@gmail.com>
Date: Sat, 25 Jun 2022 20:43:29 -0300
Subject: [PATCH] Fixed issue w/ leader/members user/nickname
---
.../ViewModels/RequestsReceivedViewModel.swift | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Sources/RequestsFeature/ViewModels/RequestsReceivedViewModel.swift b/Sources/RequestsFeature/ViewModels/RequestsReceivedViewModel.swift
index 158021d9..7dd9e8c1 100644
--- a/Sources/RequestsFeature/ViewModels/RequestsReceivedViewModel.swift
+++ b/Sources/RequestsFeature/ViewModels/RequestsReceivedViewModel.swift
@@ -60,6 +60,7 @@ final class RequestsReceivedViewModel {
let contactsQuery = Contact.Query(
authStatus: [
+ .friend,
.hidden,
.verified,
.verificationFailed,
@@ -80,11 +81,11 @@ final class RequestsReceivedViewModel {
var snapshot = NSDiffableDataSourceSnapshot<Section, RequestReceived>()
snapshot.appendSections([.appearing, .hidden])
- let requests = data.0.map(Request.group) + data.1.map(Request.contact)
+ let contactsFilteringFriends = data.1.filter { $0.authStatus != .friend }
+ let requests = data.0.map(Request.group) + contactsFilteringFriends.map(Request.contact)
let receivedRequests = requests.map { request -> RequestReceived in
switch request {
case let .group(group):
-
func leaderName() -> String {
if let leader = data.1.first(where: { $0.id == group.leaderId }) {
return (leader.nickname ?? leader.username) ?? "Leader is not a friend"
--
GitLab