From 36801e48765f19f6b91cf56c45d0221de56040d1 Mon Sep 17 00:00:00 2001 From: Ryan Zhao Date: Thu, 18 Aug 2022 11:16:01 +1000 Subject: [PATCH] feat: disable emoji reacts for message requests --- Session/Conversations/ConversationVC+Interaction.swift | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Session/Conversations/ConversationVC+Interaction.swift b/Session/Conversations/ConversationVC+Interaction.swift index 6b2dc4691..27c1d4e8e 100644 --- a/Session/Conversations/ConversationVC+Interaction.swift +++ b/Session/Conversations/ConversationVC+Interaction.swift @@ -671,8 +671,9 @@ extension ConversationVC: contextMenuWindow == nil, let actions: [ContextMenuVC.Action] = ContextMenuVC.actions( for: cellViewModel, - recentEmojis: (self.viewModel.threadData.recentReactionEmoji ?? []) - .compactMap { EmojiWithSkinTones(rawValue: $0) }, + recentEmojis: ((self.viewModel.threadData.threadIsMessageRequest == true) ? [] : + (self.viewModel.threadData.recentReactionEmoji ?? []) + ).compactMap { EmojiWithSkinTones(rawValue: $0) }, currentUserIsOpenGroupModerator: OpenGroupManager.isUserModeratorOrAdmin( self.viewModel.threadData.currentUserPublicKey, for: self.viewModel.threadData.openGroupRoomToken, @@ -1061,6 +1062,9 @@ extension ConversationVC: return } + let threadIsMessageRequest: Bool = (self.viewModel.threadData.threadIsMessageRequest == true) + guard !threadIsMessageRequest else { return } + // Perform local rate limiting (don't allow more than 20 reactions within 60 seconds) let sentTimestamp: Int64 = Int64(floor(Date().timeIntervalSince1970 * 1000)) let recentReactionTimestamps: [Int64] = General.cache.wrappedValue.recentReactionTimestamps