From 77bdf63c077a110266d3d18cbaff9b1248983e00 Mon Sep 17 00:00:00 2001
From: Bruno Muniz Azevedo Filho <bruno@elixxir.io>
Date: Fri, 12 Aug 2022 01:49:07 -0300
Subject: [PATCH] Ignoring group requests and badge from blocked users
---
.../ContactListFeature/ViewModels/ContactListViewModel.swift | 2 +-
Sources/MenuFeature/ViewModels/MenuViewModel.swift | 2 +-
.../RequestsFeature/ViewModels/RequestsReceivedViewModel.swift | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Sources/ContactListFeature/ViewModels/ContactListViewModel.swift b/Sources/ContactListFeature/ViewModels/ContactListViewModel.swift
index f3fea877..d0915822 100644
--- a/Sources/ContactListFeature/ViewModels/ContactListViewModel.swift
+++ b/Sources/ContactListFeature/ViewModels/ContactListViewModel.swift
@@ -17,7 +17,7 @@ final class ContactListViewModel {
}
var requestCount: AnyPublisher<Int, Never> {
- let groupQuery = Group.Query(authStatus: [.pending])
+ let groupQuery = Group.Query(authStatus: [.pending], isLeaderBlocked: false, isLeaderBanned: false)
let contactsQuery = Contact.Query(authStatus: [
.verified,
.confirming,
diff --git a/Sources/MenuFeature/ViewModels/MenuViewModel.swift b/Sources/MenuFeature/ViewModels/MenuViewModel.swift
index 4d8b0db9..35dfd9ec 100644
--- a/Sources/MenuFeature/ViewModels/MenuViewModel.swift
+++ b/Sources/MenuFeature/ViewModels/MenuViewModel.swift
@@ -12,7 +12,7 @@ final class MenuViewModel {
@KeyObject(.username, defaultValue: "") var username: String
var requestCount: AnyPublisher<Int, Never> {
- let groupQuery = Group.Query(authStatus: [.pending])
+ let groupQuery = Group.Query(authStatus: [.pending], isLeaderBlocked: false, isLeaderBanned: false)
let contactsQuery = Contact.Query(authStatus: [
.verified,
.confirming,
diff --git a/Sources/RequestsFeature/ViewModels/RequestsReceivedViewModel.swift b/Sources/RequestsFeature/ViewModels/RequestsReceivedViewModel.swift
index 57efb1ea..5da72d12 100644
--- a/Sources/RequestsFeature/ViewModels/RequestsReceivedViewModel.swift
+++ b/Sources/RequestsFeature/ViewModels/RequestsReceivedViewModel.swift
@@ -56,7 +56,7 @@ final class RequestsReceivedViewModel {
authStatus: [
.hidden,
.pending
- ])
+ ], isLeaderBlocked: false, isLeaderBanned: false)
let contactsQuery = Contact.Query(
authStatus: [
--
GitLab