Add "reply in thread" timeline item action menu entry.

2026-11-02 21:33:26 +00:00 · 2025-06-10 14:00:24 +03:00
parent 09779a4e12
commit 3ef479305a
52 changed files with 109 additions and 88 deletions
@@ -146,6 +146,7 @@ class TimelineMediaPreviewViewModel: TimelineMediaPreviewViewModelType {
                                           pinnedEventIDs: timelineContext.viewState.pinnedEventIDs,
                                           isDM: timelineContext.viewState.isDirectOneToOneRoom,
                                           isViewSourceEnabled: timelineContext.viewState.isViewSourceEnabled,
+                                           areThreadsEnabled: timelineContext.viewState.areThreadsEnabled,
                                           timelineKind: timelineContext.viewState.timelineKind,
                                           emojiProvider: timelineContext.viewState.emojiProvider)
                .makeActions()
@@ -24,6 +24,7 @@ enum TimelineInteractionHandlerAction {
    case displayErrorToast(String)
    
    case viewInRoomTimeline(eventID: String)
+    case displayThread(itemID: TimelineItemIdentifier)
 }

 /// The interaction handler groups logic for dealing with various actions the user can take on a timeline's
@@ -162,6 +163,8 @@ class TimelineInteractionHandler {
            let replyDetails = TimelineItemReplyDetails.loaded(sender: eventTimelineItem.sender, eventID: eventID, eventContent: replyInfo.type)
            
            actionsSubject.send(.composer(action: .setMode(mode: .reply(eventID: eventID, replyDetails: replyDetails, isThread: replyInfo.isThread))))
+        case .replyInThread:
+            actionsSubject.send(.displayThread(itemID: eventTimelineItem.id))
        case .forward(let itemID):
            actionsSubject.send(.displayMessageForwarding(itemID: itemID))
        case .viewSource:
@@ -517,6 +517,8 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol {
                    state.bindings.debugInfo = debugInfo
                case .viewInRoomTimeline(let eventID):
                    actionsSubject.send(.viewInRoomTimeline(eventID: eventID))
+                case .displayThread(let itemID):
+                    actionsSubject.send(.displayThread(itemID: itemID))
                }
            }
            .store(in: &cancellables)
@@ -531,6 +533,10 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol {
            .weakAssign(to: \.state.isViewSourceEnabled, on: self)
            .store(in: &cancellables)
        
+        appSettings.$threadsEnabled
+            .weakAssign(to: \.state.areThreadsEnabled, on: self)
+            .store(in: &cancellables)
+        
        clientProxy.timelineMediaVisibilityPublisher
            .removeDuplicates()
            .flatMap { [weak self] timelineMediaVisibility -> AnyPublisher<Bool, Never> in
@@ -344,6 +344,7 @@ struct TimelineItemMenu_Previews: PreviewProvider, TestablePreview {
                                                      pinnedEventIDs: [],
                                                      isDM: true,
                                                      isViewSourceEnabled: true,
+                                                      areThreadsEnabled: true,
                                                      timelineKind: .live,
                                                      emojiProvider: EmojiProvider(appSettings: ServiceLocator.shared.settings))
        guard let actions = provider.makeActions() else { return nil }
@@ -65,6 +65,7 @@ enum TimelineItemMenuAction: Identifiable, Hashable {
    case copyPermalink
    case redact
    case reply(isThread: Bool)
+    case replyInThread
    case forward(itemID: TimelineItemIdentifier)
    case viewSource
    case report
@@ -159,6 +160,8 @@ enum TimelineItemMenuAction: Identifiable, Hashable {
            Label(L10n.actionCopyLinkToMessage, icon: \.link)
        case .reply(let isThread):
            Label(isThread ? L10n.actionReplyInThread : L10n.actionReply, icon: \.reply)
+        case .replyInThread:
+            Label(L10n.actionReplyInThread, icon: \.threads)
        case .forward:
            Label(L10n.actionForward, icon: \.forward)
        case .redact:
@@ -16,6 +16,7 @@ struct TimelineItemMenuActionProvider {
    let pinnedEventIDs: Set<String>
    let isDM: Bool
    let isViewSourceEnabled: Bool
+    let areThreadsEnabled: Bool
    let timelineKind: TimelineKind
    let emojiProvider: EmojiProviderProtocol
    
@@ -52,6 +53,10 @@ struct TimelineItemMenuActionProvider {
            } else {
                actions.append(.reply(isThread: false))
            }
+            
+            if areThreadsEnabled, !timelineKind.isThread {
+                actions.append(.replyInThread)
+            }
        }
        
        if item.isForwardable {
@@ -156,6 +156,7 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
                                                              pinnedEventIDs: context.viewState.pinnedEventIDs,
                                                              isDM: context.viewState.isDirectOneToOneRoom,
                                                              isViewSourceEnabled: context.viewState.isViewSourceEnabled,
+                                                              areThreadsEnabled: context.viewState.areThreadsEnabled,
                                                              timelineKind: context.viewState.timelineKind,
                                                              emojiProvider: context.viewState.emojiProvider)
                TimelineItemMacContextMenu(item: timelineItem, actionProvider: provider) { action in
@@ -33,6 +33,7 @@ struct TimelineView: View {
                                                             pinnedEventIDs: timelineContext.viewState.pinnedEventIDs,
                                                             isDM: timelineContext.viewState.isDirectOneToOneRoom,
                                                             isViewSourceEnabled: timelineContext.viewState.isViewSourceEnabled,
+                                                             areThreadsEnabled: timelineContext.viewState.areThreadsEnabled,
                                                             timelineKind: timelineContext.viewState.timelineKind,
                                                             emojiProvider: timelineContext.viewState.emojiProvider)
                    .makeActions()
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d65518fa4242b126ad60b1b87850e35dd4359ccadb7a259c0da567c36911dee9
-size 147190
+oid sha256:42382477b2715e4afd7baa908813349a3d973ac4d654dc6a0dfd4d62d155c3a3
+size 152100
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:17d9c4ea48017a7e3c473c808c47bff71123953ed4f26d3ad43d137da058f19e
-size 156457
+oid sha256:606593a6661d522d34098771301e2fb8b30632bf41ed553f525863203c947215
+size 162109
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4dcca41b015d372b2dcd70e99085841ac1fa9e63e964cf582db4076fbe1f450e
-size 98848
+oid sha256:8cf3a96a2fa88263b61c950eaa15dd6b4843298a51826c70b6ef63e98d098bee
+size 103035
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4221adecf84504c86210d3fb58577c92c3514143a6f1e7b18d6d5ebf5e227fbd
-size 120828
+oid sha256:e624f6d0de5b01c9b6aa958679de8557ce84e3c631d21bc7c020028db7c80213
+size 126224
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b412df4b5b9ca27c80652e314d65c4bfdd3af8bd60b1e969583995076cf8245f
-size 154052
+oid sha256:425e5b0b407d5b08af33f1593241d23e7adc8a518d22ca4b6a2c410e352ff70a
+size 160827
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:41349d5452ecdb2a12476b430be9053dcdeb611261941436a27b77070d2b3e4b
-size 158302
+oid sha256:b96862bd86ef97c5b4751f611ddc3bbf72498dc1ae3a611ad4d2d78ab5932f20
+size 165768
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4b516fc7fc23c6ad733996bcec4043e50d5d14a471b98c0f33fddfffcb157224
-size 102582
+oid sha256:4e56981a661fb7d03bc13b44803d4475d22cfadf7f933739205cd6f3db85c12f
+size 107426
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d7c169e7d5001e9a7756e5c700fae58880c4742a4be13e81b2f8d91fcb689472
-size 114174
+oid sha256:73b3f6cc04b3db319b9cbf3757428d9f85ab7f801a3196687cc201afcf510f3a
+size 120248
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8bed758ea50ee634461f01b181a20f54147c6ec6f44b242b6e5240101b8507e1
-size 145476
+oid sha256:3c944a4a336237a284082ab78663a7c1e19ac57a13d7a5c35aa9fdc13ab9b430
+size 150127
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bdee174998edef6890e1bbfb023715d1d64b229b2ecc477b582601a65339af69
-size 152827
+oid sha256:bca488eb3647507fc8a90804d6275a29e04696beeb2d920d6cbf156a6e2f4663
+size 158386
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a2dbba8ba59114bf7d86a483aec2655c5c75d13dd44225ce3c8faf4cb4097ed
-size 97543
+oid sha256:1278ba76b8cd5be81429fe7211424cf610d1cd6dcc879791ac8fbb62ce7b854d
+size 101107
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7252d5bd467b972b063da7699631d86bfeb2ef14e978cacc2b25943c773d57a9
-size 118361
+oid sha256:82d67acb3c55cfc622faa535bbaacb8b987603e113d51939da40df99ed2e65f7
+size 123702
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4bcec8a4b2f591f2aa72c7b3ff428cff33004abf04f2495a6767fde08a50b77f
-size 132419
+oid sha256:b6c80c067376374bb68ddb5a31fae6a635e75b7750b81fc952ff3a55c12aa9a0
+size 137539
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dac73a9116229764048fb493909ff4a31ffd5cc14bf488cdf4892636293f8472
-size 136684
+oid sha256:994b563af110aa982b1615b47569fb5294d7b458b628666568c9b62c836bdb98
+size 142648
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:82520de4558f122c5e1df9131f4fac0d69d0c84c7b1562acd5cd860a82158665
-size 86671
+oid sha256:af76b006740d0da42b8c7ab7762e623118b081704f6a631e30f0225bf34e6e7e
+size 91026
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b29baf5fc2e58575ad8a6d3fda432bea347edf1f33e0fe892d491e1b3f6a0d3
-size 99523
+oid sha256:97c7fe384efd1a84d9779502a9413c10cd55f14041b30668464d2625ac3b9607
+size 104612
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0bb6e59e1acf87b85fad0bc05690e8159125c9b767694b04b03d4285026a05f1
-size 142729
+oid sha256:b317305450df81ec0d1f866b4b399ad82353f02d1a0d4073a245375914527c46
+size 147689
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:06dd994222afeb573d7b0d9129709bbfe1fcc218ca0db91b57e88a5b61134362
-size 148225
+oid sha256:1902fcd78d5f1974e30cba352d1af32729a1544380d7f6c3ae8d73f4ea03f957
+size 154039
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:afc676356a830e65eb00e61b1d4ab21c176dabba0c7a7d49e25f6d96d6587b8a
-size 95451
+oid sha256:683b4708df6c6e304477230e55a724f97142d9fdd8244339f178b5877999fbdc
+size 100020
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:57ca780fe19706b34084f6decb73a72c41bdee327735687eb94abd65737a272f
-size 111234
+oid sha256:b548b8272f1d82a00f2f35ed82e6915a0ef54210ad10f4c17dc147f8c3adc939
+size 117125
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e48013d553548589417a8f332920c4afe24f7436a4765696452d961c22e9112a
-size 135147
+oid sha256:a268d60c47fdf25077991b4d954fb8b7727ba48e2f459fb6cc699ff6989f12ab
+size 140150
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:23a1e63f5201e6fd767be5a9e3467c484091aa0d64bb7c0d8c86344934094f1e
-size 139586
+oid sha256:a078cdb0b9fb2b847431d6c7f49b34d5edf7e75e51900cf736b275d89a908af9
+size 145286
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:85f036d3116fa4626062ff973ac3f6a3a07bc1ccd42b194afe8b82d9c581e1d6
-size 88902
+oid sha256:2cb677d6ba6ae714ac824ab1aed5c83276b036cc8518ce0e49afc53a1230a913
+size 92773
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d2a2257f1009e26ba69bbb468eb47eb88c8b0551947b2a157d4590f23d53926
-size 100870
+oid sha256:46a808b7e55a4adf62c892564c3a29a47d085530d0d3416746fb7c967dbb9904
+size 105788
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e90ddd7cd2dc2dcc7cee7e42c712d7725a4526d0053f9ed0f971e0c84ce72ed
-size 146601
+oid sha256:989f1cc15c4648875a6e4d9dcad4e4f8d6908a03ff5c4ac970d25958c14dc0c9
+size 151259
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:63055b45e151818f9b97aa0b723023642a3b9ec9b2e14026addd0d695a809612
-size 154501
+oid sha256:dd4ef72ea6b5efd4349c2150b2dee7a8d690505328cf8ad2244cea283c582fe0
+size 160104
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:afad385cb6159b92fd4ab584a34d50655f9ef5da45bb5f52f035da0bedcdbb29
-size 98430
+oid sha256:b2aaa97e070f7b0c670fcc130a705897bb8794fe402489bdbf7f05813d40c579
+size 101989
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d9fb8119dfc4c92b23aa0110f0482dec9a175a6a75eeda06446444c60e8200a
-size 121678
+oid sha256:f73f7d5fcf30242f4927fa7278043f577648cea44c75973da018ccb3ddc7e76a
+size 127026
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6409225f639f1f96ab82c1bcd47b7b6f8dcac396d1e7e097b03c3c463b895eb7
-size 140630
+oid sha256:bee4cb2e8ccea5ec5cc8d205176829dab0debbe5013f3553dc01163f0bcc7688
+size 145302
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cbaa648eca59aeb96c51efa0cd3e92ab51580c1e1e9cb957ee6105594efd8a18
-size 147078
+oid sha256:683953067465f015a00ddad232439b26c7c91eda32aae46cf3b32acad7d5e2a4
+size 152709
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:beebad8f3d4b0ffcd2cb852246b706f2088a7a39a7c51f95fa2c864fda87f920
-size 91655
+oid sha256:a6d08bded27a9f7d9b0f790ff1958c9823a0b0d50794e330c9c00f720e57b2fb
+size 95603
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf8d26ef88043ba44088ba9dd757ebd95d560d3cd4f3883babdb184c65a5dec1
-size 105620
+oid sha256:21e21d2bc198687a798ea0fc7a103664d301a80fa61c7e01655fe3206b2544a7
+size 110494
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e48013d553548589417a8f332920c4afe24f7436a4765696452d961c22e9112a
-size 135147
+oid sha256:a268d60c47fdf25077991b4d954fb8b7727ba48e2f459fb6cc699ff6989f12ab
+size 140150
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:23a1e63f5201e6fd767be5a9e3467c484091aa0d64bb7c0d8c86344934094f1e
-size 139586
+oid sha256:a078cdb0b9fb2b847431d6c7f49b34d5edf7e75e51900cf736b275d89a908af9
+size 145286
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:85f036d3116fa4626062ff973ac3f6a3a07bc1ccd42b194afe8b82d9c581e1d6
-size 88902
+oid sha256:2cb677d6ba6ae714ac824ab1aed5c83276b036cc8518ce0e49afc53a1230a913
+size 92773
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d2a2257f1009e26ba69bbb468eb47eb88c8b0551947b2a157d4590f23d53926
-size 100870
+oid sha256:46a808b7e55a4adf62c892564c3a29a47d085530d0d3416746fb7c967dbb9904
+size 105788
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:afd24d53a763b98bc190fdcf0ca979ab8681d07375adabb4ad0dc827b72ccf93
-size 145730
+oid sha256:63a3defcff8bc635f9dd8d759c2e34501c56326ca4b06d19d136c15e6862f9f7
+size 150376
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8eccf557cd0d81a1e3ad4d5956af2e7d854dba1fd3a8660b96bb9174faf1668
-size 153876
+oid sha256:6bdd91b536c04f701a467c2e8331409da4168747fd5563deadc553fbd7010774
+size 159473
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:70907f267c4fab41984f1fb2ffae8cf0398bfdbdec7957801e183eef24303505
-size 97208
+oid sha256:9a52e92b38b6961abff12598388a643de5f3e844ee7b7f249d22c43750459087
+size 100770
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:20dff15a0b6d5b19ca92c0934102e77d73e8b49213b13ea40718f6535013c260
-size 117564
+oid sha256:756dabe111ea9abaae59d4d048ce09c3203d101202e3af114834348e3e4272d5
+size 122904
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b3499eb6988593be4fff591819343b72959b6dee897f3b99326065ef6f9b0f74
-size 144569
+oid sha256:66406c1f446ac87fa4385bd4288b1e78f91837e4f863214c53c2c7eb9795ef05
+size 149414
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e819b9a0e696d0b882dce52f6759963ab410c3ca7d8cecf445033bb5cd962f88
-size 152985
+oid sha256:4325a7f93015e712eab95cf43231a9c2a8d846cfe81492223b0af4251274c624
+size 158620
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3cad9ceeb24d3dc58602dfb45ac23498211894208eca8ef1ad4d9added193268
-size 94918
+oid sha256:07cafcaa9d23bb0a41a2c05b3e06c32cca720ae1a7177ed275a6e4faf44fb2f8
+size 98851
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5b3a97ade385c67d4528cd5b80de8ffa46c798414448c61f0340afe658c63daf
-size 112725
+oid sha256:4296a7661a941e7b28f9db6410e7ca7f2bfc216abb10c5eb51320d385f4370ee
+size 118489