From a356b080d0a0733eab8218be47c2b02ccfd45be6 Mon Sep 17 00:00:00 2001 From: Ryan Zhao Date: Mon, 13 Dec 2021 16:32:15 +1100 Subject: [PATCH 1/2] Do not show user details to prevent spam --- Session/Conversations/Message Cells/VisibleMessageCell.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Session/Conversations/Message Cells/VisibleMessageCell.swift b/Session/Conversations/Message Cells/VisibleMessageCell.swift index fe529aa51..9742f9955 100644 --- a/Session/Conversations/Message Cells/VisibleMessageCell.swift +++ b/Session/Conversations/Message Cells/VisibleMessageCell.swift @@ -468,6 +468,7 @@ final class VisibleMessageCell : MessageCell, LinkPreviewViewDelegate { let location = gestureRecognizer.location(in: self) if profilePictureView.frame.contains(location) && VisibleMessageCell.shouldShowProfilePicture(for: viewItem) { guard let message = viewItem.interaction as? TSIncomingMessage else { return } + guard !message.isOpenGroupMessage else { return } // Do not show user details to prevent spam delegate?.showUserDetails(for: message.authorId) } else if replyButton.frame.contains(location) { UIImpactFeedbackGenerator(style: .heavy).impactOccurred() From 9e373dc3d1dc8def96e6b54fdc3fc1437321f1e0 Mon Sep 17 00:00:00 2001 From: Ryan Zhao Date: Wed, 15 Dec 2021 16:32:45 +1100 Subject: [PATCH 2/2] do not show copy session id option when long press messages in open groups --- .../Conversations/Context Menu/ContextMenuVC+Action.swift | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Session/Conversations/Context Menu/ContextMenuVC+Action.swift b/Session/Conversations/Context Menu/ContextMenuVC+Action.swift index 0bc15e9ba..57d0168e6 100644 --- a/Session/Conversations/Context Menu/ContextMenuVC+Action.swift +++ b/Session/Conversations/Context Menu/ContextMenuVC+Action.swift @@ -56,7 +56,9 @@ extension ContextMenuVC { if isReplyingAllowed() { result.append(Action.reply(viewItem, delegate)) } result.append(Action.copy(viewItem, delegate)) let isGroup = viewItem.isGroupThread - if isGroup && viewItem.interaction is TSIncomingMessage { result.append(Action.copySessionID(viewItem, delegate)) } + if let message = viewItem.interaction as? TSIncomingMessage, isGroup, !message.isOpenGroupMessage { + result.append(Action.copySessionID(viewItem, delegate)) + } if !isGroup || viewItem.userCanDeleteGroupMessage { result.append(Action.delete(viewItem, delegate)) } if isGroup && viewItem.interaction is TSIncomingMessage && viewItem.userHasModerationPermission { result.append(Action.ban(viewItem, delegate)) @@ -69,7 +71,9 @@ extension ContextMenuVC { if viewItem.canCopyMedia() { result.append(Action.copy(viewItem, delegate)) } if viewItem.canSaveMedia() { result.append(Action.save(viewItem, delegate)) } let isGroup = viewItem.isGroupThread - if isGroup && viewItem.interaction is TSIncomingMessage { result.append(Action.copySessionID(viewItem, delegate)) } + if let message = viewItem.interaction as? TSIncomingMessage, isGroup, !message.isOpenGroupMessage { + result.append(Action.copySessionID(viewItem, delegate)) + } if !isGroup || viewItem.userCanDeleteGroupMessage { result.append(Action.delete(viewItem, delegate)) } if isGroup && viewItem.interaction is TSIncomingMessage && viewItem.userHasModerationPermission { result.append(Action.ban(viewItem, delegate))