From 501c3aed237d64128e0429cc81115c0fc9fe5964 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Tue, 19 Sep 2023 16:53:01 +0300 Subject: [PATCH] Disable reply actions for local echoes --- ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift | 4 ++-- .../TimelineItems/EventBasedTimelineItemProtocol.swift | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift b/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift index f40e620ec..b831fa845 100644 --- a/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift +++ b/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift @@ -517,8 +517,8 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol var actions: [TimelineItemMenuAction] = [] - if let messageitem = item as? EventBasedMessageTimelineItemProtocol { - actions.append(.reply(isThread: messageitem.isThreaded)) + if let messageItem = item as? EventBasedMessageTimelineItemProtocol, messageItem.isRemoteMessage { + actions.append(.reply(isThread: messageItem.isThreaded)) actions.append(.forward(itemID: itemID)) } diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/EventBasedTimelineItemProtocol.swift b/ElementX/Sources/Services/Timeline/TimelineItems/EventBasedTimelineItemProtocol.swift index 82284a24d..f2f188f2f 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItems/EventBasedTimelineItemProtocol.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItems/EventBasedTimelineItemProtocol.swift @@ -33,6 +33,10 @@ extension EventBasedTimelineItemProtocol { var description: String { "\(String(describing: Self.self)): id: \(id), timestamp: \(timestamp), isOutgoing: \(isOutgoing), properties: \(properties)" } + + var isRemoteMessage: Bool { + id.eventID != nil + } var hasFailedToSend: Bool { properties.deliveryStatus == .sendingFailed