core, ui: prohibit to invite contact to channel (#6731)

2026-03-31 20:36:19 +00:00 · 2026-03-31 11:31:09 +00:00
parent a5f606f44a
commit dfd8e224f6
4 changed files with 60 additions and 45 deletions
--- a/apps/ios/Shared/Views/Chat/ChatView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatView.swift
@@ -253,6 +253,18 @@ struct ChatView: View {
                AddGroupMembersView(chat: chat, groupInfo: groupInfo)
            }
        }
+        .appSheet(isPresented: $showGroupLinkSheet) {
+            if case let .group(groupInfo, _) = cInfo {
+                GroupLinkView(
+                    groupId: groupInfo.groupId,
+                    groupLink: $groupLink,
+                    groupLinkMemberRole: $groupLinkMemberRole,
+                    showTitle: true,
+                    creatingGroup: false,
+                    isChannel: groupInfo.useRelays
+                )
+            }
+        }
        .sheet(isPresented: Binding(
            get: { !forwardedChatItems.isEmpty },
            set: { isPresented in
@@ -579,17 +591,8 @@ struct ChatView: View {
                    contentFilterMenu(withLabel: false)
                    Menu {
                        if groupInfo.canAddMembers {
-                            if (chat.chatInfo.incognito) {
+                            if chat.chatInfo.incognito || groupInfo.useRelays {
                                groupLinkButton()
-                                    .appSheet(isPresented: $showGroupLinkSheet) {
-                                        GroupLinkView(
-                                            groupId: groupInfo.groupId,
-                                            groupLink: $groupLink,
-                                            groupLinkMemberRole: $groupLinkMemberRole,
-                                            showTitle: true,
-                                            creatingGroup: false
-                                        )
-                                    }
                            } else {
                                addMembersButton()
                            }
@@ -1438,7 +1441,11 @@ struct ChatView: View {
                }
            }
        } label: {
-            Label("Group link", systemImage: "link.badge.plus")
+            if case let .group(gInfo, _) = chat.chatInfo, gInfo.useRelays {
+                Label("Channel link", systemImage: "link")
+            } else {
+                Label("Group link", systemImage: "link.badge.plus")
+            }
        }
    }

--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
@@ -1282,7 +1282,7 @@ fun BoxScope.ChatInfoToolbar(
    is ChatInfo.Group -> {
      // Add members / group link moved to menu
      if (chatInfo.groupInfo.canAddMembers) {
-        if (!chatInfo.incognito) {
+        if (!chatInfo.incognito && !chatInfo.groupInfo.useRelays) {
          menuItems.add {
            ItemAction(stringResource(MR.strings.icon_descr_add_members), painterResource(MR.images.ic_person_add_500), onClick = {
              showMenu.value = false
@@ -1291,10 +1291,14 @@ fun BoxScope.ChatInfoToolbar(
          }
        } else {
          menuItems.add {
-            ItemAction(stringResource(MR.strings.group_link), painterResource(MR.images.ic_add_link), onClick = {
-              showMenu.value = false
-              openGroupLink(chatInfo.groupInfo)
-            })
+            ItemAction(
+              stringResource(if (chatInfo.groupInfo.useRelays) MR.strings.channel_link else MR.strings.group_link),
+              painterResource(if (chatInfo.groupInfo.useRelays) MR.images.ic_link else MR.images.ic_add_link),
+              onClick = {
+                showMenu.value = false
+                openGroupLink(chatInfo.groupInfo)
+              }
+            )
          }
        }
      }
@@ -3169,7 +3173,7 @@ fun openGroupLink(groupInfo: GroupInfo, rhId: Long?, view: Any? = null, close: (
    val link = chatModel.controller.apiGetGroupLink(rhId, groupInfo.groupId)
    close?.invoke()
    ModalManager.end.showModalCloseable(true) {
-      GroupLinkView(chatModel, rhId, groupInfo, link, onGroupLinkUpdated = null)
+      GroupLinkView(chatModel, rhId, groupInfo, link, onGroupLinkUpdated = null, isChannel = groupInfo.useRelays)
    }
  }
 }
--- a/src/Simplex/Chat/Library/Commands.hs
+++ b/src/Simplex/Chat/Library/Commands.hs
@@ -2425,9 +2425,10 @@ processChatCommand vr nm = \case
  APIAddMember groupId contactId memRole -> withUser $ \user -> withGroupLock "addMember" groupId $ do
    -- TODO for large groups: no need to load all members to determine if contact is a member
    (group, contact) <- withFastStore $ \db -> (,) <$> getGroup db vr user groupId <*> getContact db vr user contactId
-    assertDirectAllowed user MDSnd contact XGrpInv_
    let Group gInfo members = group
        Contact {localDisplayName = cName} = contact
+    when (useRelays' gInfo) $ throwCmdError "can't invite contact to channel"
+    assertDirectAllowed user MDSnd contact XGrpInv_
    assertUserGroupRole gInfo $ max GRAdmin memRole
    -- [incognito] forbid to invite contact to whom user is connected incognito
    when (contactConnIncognito contact) $ throwChatError CEContactIncognitoCantInvite
--- a/src/Simplex/Chat/Library/Subscriber.hs
+++ b/src/Simplex/Chat/Library/Subscriber.hs
@@ -2314,34 +2314,37 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
      toView $ CEvtNewChatItems user [AChatItem SCTGroup (msgDirection @d) cInfo ci]

    processGroupInvitation :: Contact -> GroupInvitation -> RcvMessage -> MsgMeta -> CM ()
-    processGroupInvitation ct inv msg msgMeta = do
-      let Contact {localDisplayName = c, activeConn} = ct
-          GroupInvitation {fromMember = (MemberIdRole fromMemId fromRole), invitedMember = (MemberIdRole memId memRole), connRequest, groupLinkId} = inv
-      forM_ activeConn $ \Connection {connId, connChatVersion, peerChatVRange, customUserProfileId, groupLinkId = groupLinkId'} -> do
-        when (fromRole < GRAdmin || fromRole < memRole) $ throwChatError (CEGroupContactRole c)
-        when (fromMemId == memId) $ throwChatError CEGroupDuplicateMemberId
-        -- [incognito] if direct connection with host is incognito, create membership using the same incognito profile
-        (gInfo@GroupInfo {groupId, localDisplayName, groupProfile, membership}, hostId) <- withStore $ \db -> createGroupInvitation db vr user ct inv customUserProfileId
-        void $ createChatItem user (CDGroupSnd gInfo Nothing) False CIChatBanner Nothing (Just epochStart)
-        let GroupMember {groupMemberId, memberId = membershipMemId} = membership
-        if sameGroupLinkId groupLinkId groupLinkId'
-          then do
-            subMode <- chatReadVar subscriptionMode
-            dm <- encodeConnInfo $ XGrpAcpt membershipMemId
-            connIds <- joinAgentConnectionAsync user Nothing True connRequest dm subMode
-            withStore' $ \db -> do
-              setViaGroupLinkUri db groupId connId
-              createMemberConnectionAsync db user hostId connIds connChatVersion peerChatVRange subMode
-              updateGroupMemberStatusById db userId hostId GSMemAccepted
-              updateGroupMemberStatus db userId membership GSMemAccepted
-            toView $ CEvtUserAcceptedGroupSent user gInfo {membership = membership {memberStatus = GSMemAccepted}} (Just ct)
-          else do
-            let content = CIRcvGroupInvitation (CIGroupInvitation {groupId, groupMemberId, localDisplayName, groupProfile, status = CIGISPending}) memRole
-            (ci, cInfo) <- saveRcvChatItemNoParse user (CDDirectRcv ct) msg brokerTs content
-            withStore' $ \db -> setGroupInvitationChatItemId db user groupId (chatItemId' ci)
-            toView $ CEvtNewChatItems user [AChatItem SCTDirect SMDRcv cInfo ci]
-            toView $ CEvtReceivedGroupInvitation {user, groupInfo = gInfo, contact = ct, fromMemberRole = fromRole, memberRole = memRole}
+    processGroupInvitation ct inv msg msgMeta
+      | isJust groupLink || isJust sharedGroupId = messageError "x.grp.inv: can't invite to channel"
+      | otherwise = do
+          let Contact {localDisplayName = c, activeConn} = ct
+              GroupInvitation {fromMember = (MemberIdRole fromMemId fromRole), invitedMember = (MemberIdRole memId memRole), connRequest, groupLinkId} = inv
+          forM_ activeConn $ \Connection {connId, connChatVersion, peerChatVRange, customUserProfileId, groupLinkId = groupLinkId'} -> do
+            when (fromRole < GRAdmin || fromRole < memRole) $ throwChatError (CEGroupContactRole c)
+            when (fromMemId == memId) $ throwChatError CEGroupDuplicateMemberId
+            -- [incognito] if direct connection with host is incognito, create membership using the same incognito profile
+            (gInfo@GroupInfo {groupId, localDisplayName, groupProfile, membership}, hostId) <- withStore $ \db -> createGroupInvitation db vr user ct inv customUserProfileId
+            void $ createChatItem user (CDGroupSnd gInfo Nothing) False CIChatBanner Nothing (Just epochStart)
+            let GroupMember {groupMemberId, memberId = membershipMemId} = membership
+            if sameGroupLinkId groupLinkId groupLinkId'
+              then do
+                subMode <- chatReadVar subscriptionMode
+                dm <- encodeConnInfo $ XGrpAcpt membershipMemId
+                connIds <- joinAgentConnectionAsync user Nothing True connRequest dm subMode
+                withStore' $ \db -> do
+                  setViaGroupLinkUri db groupId connId
+                  createMemberConnectionAsync db user hostId connIds connChatVersion peerChatVRange subMode
+                  updateGroupMemberStatusById db userId hostId GSMemAccepted
+                  updateGroupMemberStatus db userId membership GSMemAccepted
+                toView $ CEvtUserAcceptedGroupSent user gInfo {membership = membership {memberStatus = GSMemAccepted}} (Just ct)
+              else do
+                let content = CIRcvGroupInvitation (CIGroupInvitation {groupId, groupMemberId, localDisplayName, groupProfile, status = CIGISPending}) memRole
+                (ci, cInfo) <- saveRcvChatItemNoParse user (CDDirectRcv ct) msg brokerTs content
+                withStore' $ \db -> setGroupInvitationChatItemId db user groupId (chatItemId' ci)
+                toView $ CEvtNewChatItems user [AChatItem SCTDirect SMDRcv cInfo ci]
+                toView $ CEvtReceivedGroupInvitation {user, groupInfo = gInfo, contact = ct, fromMemberRole = fromRole, memberRole = memRole}
      where
+        GroupInvitation {groupProfile = GroupProfile {groupLink, sharedGroupId}} = inv
        brokerTs = metaBrokerTs msgMeta
        sameGroupLinkId :: Maybe GroupLinkId -> Maybe GroupLinkId -> Bool
        sameGroupLinkId (Just gli) (Just gli') = gli == gli'