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

Show domain-block not for my instance (#1259)
mastodon · Apr 10, 2024 · a979287 · a979287
1 parent 1a2cf27
commit a979287
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/Mastodon/Scene/Profile/ProfileViewController.swift b/Mastodon/Scene/Profile/ProfileViewController.swift
@@ -418,22 +418,31 @@ extension ProfileViewController {
     }
 
     private func bindMoreBarButtonItem() {
-        Publishers.CombineLatest(
+        Publishers.CombineLatest3(
             viewModel.$account,
+            viewModel.$me,
             viewModel.$relationship
         )
-        .asyncMap { [weak self] user, relationship -> UIMenu? in
-            guard let self, let relationship, let domain = user.domainFromAcct else { return nil }
+        .asyncMap { [weak self] user, me, relationship -> UIMenu? in
+            guard let self, let relationship, let domain = user.domainFromAcct, let myDomain = me.domainFromAcct else { return nil }
 
             let name = user.displayNameWithFallback
 
             var menuActions: [MastodonMenu.Action] = [
                 .muteUser(.init(name: name, isMuting: relationship.muting)),
-                .blockUser(.init(name: name, isBlocking: relationship.blocking)),
-                .blockDomain(.init(domain: domain, isBlocking: relationship.domainBlocking)),
+                .blockUser(.init(name: name, isBlocking: relationship.blocking))
+            ]
+
+            if myDomain != domain {
+                menuActions.append(
+                    .blockDomain(.init(domain: domain, isBlocking: relationship.domainBlocking))
+                )
+            }
+
+            menuActions.append(contentsOf: [
                 .reportUser(.init(name: name)),
                 .shareUser(.init(name: name)),
-            ]
+            ])
 
             if relationship.following {
                 let showReblogs = relationship.showingReblogs// me.showingReblogsBy.contains(user)