Fix #3639 - Reorder timeline item menu options

2026-11-03 06:55:59 +00:00 · 2024-12-19 09:42:18 +02:00
parent e7cc807084
commit 21a15936a9
45 changed files with 101 additions and 102 deletions
@@ -42,6 +42,10 @@ struct TimelineItemMenuActionProvider {
        if timelineKind == .pinned || timelineKind == .media(.mediaFilesScreen) {
            actions.append(.viewInRoomTimeline)
        }
+        
+        if canRedactItem(item), let poll = item.pollIfAvailable, !poll.hasEnded, let eventID = item.id.eventID {
+            actions.append(.endPoll(pollStartID: eventID))
+        }

        if item.canBeRepliedTo {
            if let messageItem = item as? EventBasedMessageTimelineItemProtocol {
@@ -55,14 +59,6 @@ struct TimelineItemMenuActionProvider {
            actions.append(.forward(itemID: item.id))
        }
        
-        if canCurrentUserPin, let eventID = item.id.eventID {
-            actions.append(pinnedEventIDs.contains(eventID) ? .unpin : .pin)
-        }
-        
-        if item.isRemoteMessage {
-            actions.append(.copyPermalink)
-        }
-        
        if item.isEditable {
            if item.supportsMediaCaption {
                if item.hasMediaCaption {
@@ -76,6 +72,14 @@ struct TimelineItemMenuActionProvider {
                actions.append(.edit)
            }
        }
+        
+        if item.isRemoteMessage {
+            actions.append(.copyPermalink)
+        }
+        
+        if canCurrentUserPin, let eventID = item.id.eventID {
+            actions.append(pinnedEventIDs.contains(eventID) ? .unpin : .pin)
+        }

        if item.isCopyable {
            actions.append(.copy)
@@ -87,10 +91,6 @@ struct TimelineItemMenuActionProvider {
            actions.append(.removeCaption)
        }
        
-        if canRedactItem(item), let poll = item.pollIfAvailable, !poll.hasEnded, let eventID = item.id.eventID {
-            actions.append(.endPoll(pollStartID: eventID))
-        }
-        
        if isViewSourceEnabled {
            actions.append(.viewSource)
        }
@@ -131,15 +131,14 @@ struct TimelineItemMenuActionProvider {
    
    private func makeEncryptedItemActions(_ encryptedItem: EncryptedRoomTimelineItem) -> TimelineItemMenuActions? {
        var actions: [TimelineItemMenuAction] = [.copyPermalink]
-        var secondaryActions: [TimelineItemMenuAction] = []
-        
+
        if isViewSourceEnabled {
            actions.append(.viewSource)
        }
                
        return .init(isReactable: false,
                     actions: actions,
-                     secondaryActions: secondaryActions,
+                     secondaryActions: [],
                     emojiProvider: emojiProvider)
    }
    
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dbe55ed5c2834d6356439566e6f14f88ff25ae94663b451d1d281ae11b1308bc
-size 147063
+oid sha256:c86a7c06f58e38074a93b808f68ab64b5c002b7b8bcaea0c2c75334da6e1bd65
+size 147176
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e4e2f174390b856c4c7614f94338a799e1967ab791aef3e8580aa75e14001c86
-size 154082
+oid sha256:d02c8c21850591b42621ac5bf236e422d82745dc6112fcce27af4f3deebab010
+size 154043
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0abea34229aad686e9930a4ffab05d2535e0e6e2daa698e9b60830735156ec65
-size 145856
+oid sha256:db97cab6f9bce28eab4f9f24e836695487307323d40076b4ebf9870006b88d94
+size 145956
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:18089539eadff95e686aae50d3e1aab1b32b3b43e739f1c33768694a56fdcf16
-size 142697
+oid sha256:49ac91ef285233823a3726ba3cb207bcafefcb404c0f3d1d1de066f5531cd95a
+size 142756
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:11929d4c5d3c3981f277591916142bda9a207ddd8ca902f210bcd31118ff60ea
-size 132601
+oid sha256:8572818adebef1563717d139959733ea1810a98045fc89ecfec2ea8691686d1d
+size 132447
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f6601f71b869fffbe1b399cd6b7bf8e59dfa20703c722e5f03365790717bd3e
-size 135130
+oid sha256:5e61bd24f04fc1f666f3f139ced0c67e11fbc21539992e3e432e72730b762b5c
+size 135133
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f876e23b2fa86eab0eb4005eee808ca03ace96cccb894b36ebc66f3e7b52661
-size 146456
+oid sha256:39ec62f72cc9fba4f192f9e76f4f8e15466a11d76416c59b4d214227e3b115de
+size 146565
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:15360ccd983a900d65dd6a5932396c4d4707e40ae5e9bd4fce1512d7b19f7d6c
-size 140671
+oid sha256:6afbe4ba26f7ec22df84f6a67ae568a8d57103615a280dd6f4bbdc210ab0e575
+size 140623
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f6601f71b869fffbe1b399cd6b7bf8e59dfa20703c722e5f03365790717bd3e
-size 135130
+oid sha256:5e61bd24f04fc1f666f3f139ced0c67e11fbc21539992e3e432e72730b762b5c
+size 135133
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:beb6a25b8f4940dd7758f5965d5cb1030699c49d498db458290b43ef4f068042
-size 145608
+oid sha256:c1074f3d5ba827cf0ed7f7ddc304f3abd2be8d2825e6de22b7f249529aa5be75
+size 145706
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93ab390923ac70647b960325f7e62c7c1e4672083361eed77ae4ac87263dce12
-size 144447
+oid sha256:c44abe9eea51fe421daa71c34fadedd520d46ee71db213f19c52d271686b495e
+size 144549
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d769aeff733765600c0fb2c13c6f3b7f7fd888a435ed30661b4224e61a9abf2
-size 156450
+oid sha256:508506f1b24800e6de537875204dc067ddcc271b56d0424d052c43616edb0872
+size 156449
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:353c5272ea59d7315563a880f85bd27fedd1620ce158a544ea1de30a42fe5a3e
-size 158259
+oid sha256:b93b88c2fb0ef5ce881ff8df776d6ad00155b5d524d72986b01a87c3d6c74ee4
+size 158267
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3f5a74ae7772ef5ffe520fad261baca1f170c1f1d32e1b3e5c1701f5e6a1b825
-size 155543
+oid sha256:c57bf2acb0e8e46fed87e8db5a93034e96542a2dbeadaa407a32744a56143122
+size 155484
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:79123d180e109f073736467d9d8c18468392d6964c195c821a7dca3649940e63
-size 148189
+oid sha256:a3e696131497f695f81b1b4fc6288f06effb668a19aafdde508a04cfcd3f92f2
+size 148259
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bbea3318c4d831c0f9953f38a2d8cae6c92099020402521b23b206dbaba7a3c6
-size 136966
+oid sha256:160018c55300e2d84dc877b3e225782b352943e055b697d85f4111b7aaf075c5
+size 136712
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eafa01942b03019b35798ea02db7be04a1ebe3727c3a2477d8269391620b332f
-size 139560
+oid sha256:b9c28a360093e1f35cd972096b4c40734ba8e4476234c55ec42beeff0c8a99f5
+size 139569
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a834e1bd229de4491d65935b33358fc1916732def5ef49275d9c5ec004514c27
-size 154521
+oid sha256:ae1df102085ba1bbe8bdc398b2d595e2316eb5c852b0e2f52b31bfb2bdbee48d
+size 154472
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e07fa6f091ac13eabde11393d61aff91b4c385ab68cfdaa91d4b42012c64245
-size 146854
+oid sha256:d99f435700232ceb21bb26799e2560048fde545090992b3015d3d3d722927b34
+size 147069
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eafa01942b03019b35798ea02db7be04a1ebe3727c3a2477d8269391620b332f
-size 139560
+oid sha256:b9c28a360093e1f35cd972096b4c40734ba8e4476234c55ec42beeff0c8a99f5
+size 139569
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:977e1f10031c91f88435673ead3a746d514df4f823de87ca86a5b5daa95230e3
-size 153884
+oid sha256:4cbbdbaa199785909fc584dd3e50d8a276d8aedf48ad6fdb9a85e389206ba76d
+size 153853
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:815f0865879d9e551244286b77335a2d20e38a9bcfb3690506d3602bf2f6db4f
-size 152918
+oid sha256:855cc4f23431af74efd4ab7779832f68ec1fa7e5f17194308f283c716717d21e
+size 152971
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d0d4f5382c58a4e3ad78caf96f54c84cfc36181d476c1940b5d934de45341ec
-size 99145
+oid sha256:6fc3f6bffd8d0aab6fd5b8b3ab18b36e1db9aa35336613a9522c8552b9d6db4f
+size 98812
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0317d78b00953f3f9b5fa09cbf6cdc9a2d662d79b6686de6ef10570054dbc0e7
+oid sha256:657a5625954c354a20b5a4b4e2d4a9b3867c75dda0d7dcc5198f2cf62071848c
 size 102572
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:87e3d6f5b99c4f4b35f7bb609d6695704958ee2f3bdc494c8a3e423ae112b7f3
-size 97357
+oid sha256:51d396a4b74d557378b77177b0ab3302ba683b0501a8100d22fced8a05778dd6
+size 97576
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1d217d5ce0b94b1abea00dc9673af0454e13b324d8499413c5f9c47587090e24
-size 95344
+oid sha256:001705e90b08b66cc6ec4e0935c8f5f6aec64f49a14ed97b7db93253e1836438
+size 95470
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:29d0784fac37389a44a753be4273955146639e0a61c8a768e9f2fdc0c040f31d
-size 86814
+oid sha256:3eac0b711c28c9b4972efad08908fb567d28ceb769ffaef024596cf4dcbcb6a2
+size 86687
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e046a313b853da07de41173c8d77f128f7e97d386fdd73603827d9451aa5334e
-size 88870
+oid sha256:362bd490e10b25967bba6dd8153e7bd877c3921dfafa5cd82bf4bd47a689033e
+size 88871
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f99f06eb06c263cd2dd1b20ccd3a4043a6e6c4b1e0039db70c7adbf63f718f4
-size 98196
+oid sha256:01021c658d24ccd4f6cbd9e8756420f803f53c000a54ca4508fed64dfb282f35
+size 98388
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc4c1f1813c983b299aca030b152e08c2899bf35519ae815920c9b1ce094418b
-size 91650
+oid sha256:af4b3f623aa90fc0333b58ffa1e6b65f16172d6012b318dbb0961c231ac01bdd
+size 91645
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e046a313b853da07de41173c8d77f128f7e97d386fdd73603827d9451aa5334e
-size 88870
+oid sha256:362bd490e10b25967bba6dd8153e7bd877c3921dfafa5cd82bf4bd47a689033e
+size 88871
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c0930e2733a32b2873df5f90a7e42ee3b13372289fb2fca889400745704ddbf
-size 96931
+oid sha256:255f65cc551f66b6f8abac2d25dc9392d571ec817ac35faeffb3edf5afe041b0
+size 97161
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab9ecba9656490a8d9f78965f21ea45b900a2fc8515f5c979771c7405fac7964
-size 94895
+oid sha256:af341cdd7b939305d12bdc708038261e69b20d226fba26b1e3e962d40eb5632c
+size 94896
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:07972bfa92b057f38a820eedd84b02b4ff3c5dcd602c5fcdc49a595f9a127274
-size 120928
+oid sha256:2ff50d376ed003e1ed74d1280e925ac5ad7a6b6c40e90d8380942a6ba00e01c1
+size 120895
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de55020a1d36571f14d1f4ffc3308b6215f1390c39150ed69163f4c0294e1098
-size 114151
+oid sha256:214ac5fd136bdb59309d1888c457414805d21b8933c48cacec77d6b6d1d385bb
+size 114155
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a542b964cd14c1335af638cea7ed61df3e9cc6480138ffd92bb2416f01cf3a3e
-size 119370
+oid sha256:db3e76eeffddb941800e0223114aef12348eedbec814260438b2473b17114b0b
+size 119303
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c46ac55c1f0eb8772852406a4be7fae03cb6b181a13f38eb3c76823bb6db2caa
-size 111333
+oid sha256:ecd3d6006f5d70672f6d498672ec58cc15f29c8bf2a822eee72ff2d6750c11b3
+size 111270
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:92cefcba2c5a9f48b57c4dac5a3e451add14ee2d6527cf00a7aebb6587aea05b
-size 99619
+oid sha256:31272d735d59f0f4fcc533a21428fa0d75497cc78dcce346968f16002929d977
+size 99538
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2beaccaca7eeb34fa8d11422ef83bf924e2058d8e351f53b567700e3db38631d
-size 100950
+oid sha256:d26f83ab4865c041c99cd21dd860a11d07fa2e2aed0468bda49a1cccb57458b0
+size 100965
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:86f426d0a1de9533da1c2e71e2640c464c271506813b537c40b16aade0f1cae6
-size 121598
+oid sha256:a81ee898f11f596924e241c787c1b43ef2fb8bdd62b81fb15cb7389ba1ce79dc
+size 121700
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:114d73c0d63acabcf95a4deaa4ee78e9d59e873348f6863dae637499db39018c
-size 105467
+oid sha256:473c68d634cc59fc15797dc34abd2a12be2734d492f3bc662297bd26f2309cfa
+size 105735
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2beaccaca7eeb34fa8d11422ef83bf924e2058d8e351f53b567700e3db38631d
-size 100950
+oid sha256:d26f83ab4865c041c99cd21dd860a11d07fa2e2aed0468bda49a1cccb57458b0
+size 100965
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fcd5f1db8e34d3ac34f018106ffe623d994b8d058a0ea55396584d94a339228d
-size 117670
+oid sha256:bfb8fb7e8a2969f4d98331e28dd407f3e27b9e1f867c2800b3bc17a4e8a24b6c
+size 117597
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da844483dc54ca2134a1f8f871153ab6c49ad58514153eba32abc96a6ea37c14
-size 112540
+oid sha256:ebdd860109bc016112ee7c3b32c3cc101827c503f348df694271e6cdca9bbda2
+size 112788