Mastodon/mastodon-app-ufficiale-iphone-ios
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Show domain-block not for my instance (#1269) (#1270)

Browse Source 
Show domain-block not for my instance (#1259)
This commit is contained in:
Nathan Mattes 2024-04-10 18:17:56 +02:00 committed by GitHub
parent 1a2cf272a6
commit a9792878e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Mastodon/Scene/Profile/ProfileViewController.swift
View File

@ -418,22 +418,31 @@ extension ProfileViewController {
} }
private func bindMoreBarButtonItem() { private func bindMoreBarButtonItem() {
Publishers.CombineLatest( Publishers.CombineLatest3(
viewModel.$account, viewModel.$account,
viewModel.$me,
viewModel.$relationship viewModel.$relationship
) )
.asyncMap { [weak self] user, relationship -> UIMenu? in .asyncMap { [weak self] user, me, relationship -> UIMenu? in
guard let self, let relationship, let domain = user.domainFromAcct else { return nil } guard let self, let relationship, let domain = user.domainFromAcct, let myDomain = me.domainFromAcct else { return nil }
let name = user.displayNameWithFallback let name = user.displayNameWithFallback
var menuActions: [MastodonMenu.Action] = [ var menuActions: [MastodonMenu.Action] = [
.muteUser(.init(name: name, isMuting: relationship.muting)), .muteUser(.init(name: name, isMuting: relationship.muting)),
.blockUser(.init(name: name, isBlocking: relationship.blocking)), .blockUser(.init(name: name, isBlocking: relationship.blocking))
.blockDomain(.init(domain: domain, isBlocking: relationship.domainBlocking)), ]
if myDomain != domain {
menuActions.append(
.blockDomain(.init(domain: domain, isBlocking: relationship.domainBlocking))
)
}
menuActions.append(contentsOf: [
.reportUser(.init(name: name)), .reportUser(.init(name: name)),
.shareUser(.init(name: name)), .shareUser(.init(name: name)),
] ])
if relationship.following { if relationship.following {
let showReblogs = relationship.showingReblogs// me.showingReblogsBy.contains(user) let showReblogs = relationship.showingReblogs// me.showingReblogsBy.contains(user)