Remove forward action for polls (#1973)

element-hq · Oct 27, 2023 · 5439b65 · 5439b65
1 parent a837ce5
commit 5439b65
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift b/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
@@ -598,7 +598,7 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
             }
         }
 
-        if item.isRemoteMessage {
+        if item.isForwardable {
             actions.append(.forward(itemID: itemID))
         }
 

diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/EventBasedTimelineItemProtocol.swift b/ElementX/Sources/Services/Timeline/TimelineItems/EventBasedTimelineItemProtocol.swift
@@ -34,7 +34,11 @@ extension EventBasedTimelineItemProtocol {
     var description: String {
         "\(String(describing: Self.self)): id: \(id), timestamp: \(timestamp), isOutgoing: \(isOutgoing), properties: \(properties)"
     }
-
+
+    var isForwardable: Bool {
+        isRemoteMessage && !(self is PollRoomTimelineItem)
+    }
+
     var isRemoteMessage: Bool {
         id.eventID != nil
     }
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
-            if item.isRemoteMessage {
+            if item.isForwardable {
                 actions.append(.forward(itemID: itemID))
             }
@@ Expand Down @@