Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
xx messenger iOS
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mobile
iOS
xx messenger iOS
Commits
5945869c
Commit
5945869c
authored
2 years ago
by
Bruno Muniz
Browse files
Options
Downloads
Patches
Plain Diff
Fixed issue w/ leader/members user/nickname
parent
58f97032
No related branches found
No related tags found
2 merge requests
!40
v1.1.2b166
,
!38
Using new database structure
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Sources/RequestsFeature/ViewModels/RequestsReceivedViewModel.swift
+3
-2
3 additions, 2 deletions
...equestsFeature/ViewModels/RequestsReceivedViewModel.swift
with
3 additions
and
2 deletions
Sources/RequestsFeature/ViewModels/RequestsReceivedViewModel.swift
+
3
−
2
View file @
5945869c
...
...
@@ -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"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment