Merge pull request #4895 from element-hq/feature/fga/can-edit-permission

ganfra · web-flow · commit 680b63d46012 · 2025-06-18T17:28:59.000+02:00
fix (event action): allow to edit only if permission to send message
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt
@@ -169,7 +169,7 @@ class DefaultActionListPresenter @AssistedInject constructor(
             if (timelineItem.isRemote && timelineItem.content.canBeForwarded()) {
                 add(TimelineItemAction.Forward)
             }
-            if (timelineItem.isEditable) {
+            if (timelineItem.isEditable && usersEventPermissions.canSendMessage) {
                 if (timelineItem.content is TimelineItemEventContentWithAttachment) {
                     // Caption
                     if (timelineItem.content.caption == null) {
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt
@@ -81,8 +81,6 @@ class ActionListPresenterTest {
                     )
                 )
             )
-            // val loadingState = awaitItem()
-            // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))
             val successState = awaitItem()
             assertThat(successState.target).isEqualTo(
                 ActionListState.Target.Success(
@@ -124,8 +122,6 @@ class ActionListPresenterTest {
                     )
                 )
             )
-            // val loadingState = awaitItem()
-            // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))
             val successState = awaitItem()
             assertThat(successState.target).isEqualTo(
                 ActionListState.Target.Success(
@@ -167,8 +163,6 @@ class ActionListPresenterTest {
                     )
                 )
             )
-            // val loadingState = awaitItem()
-            // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))
             val successState = awaitItem()
             assertThat(successState.target).isEqualTo(
                 ActionListState.Target.Success(
@@ -262,8 +256,6 @@ class ActionListPresenterTest {
                     )
                 )
             )
-            // val loadingState = awaitItem()
-            // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))
             val successState = awaitItem()
             assertThat(successState.target).isEqualTo(
                 ActionListState.Target.Success(
@@ -405,8 +397,6 @@ class ActionListPresenterTest {
                     )
                 )
             )
-            // val loadingState = awaitItem()
-            // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))
             val successState = awaitItem()
             assertThat(successState.target).isEqualTo(
                 ActionListState.Target.Success(
@@ -500,8 +490,6 @@ class ActionListPresenterTest {
                     )
                 )
             )
-            // val loadingState = awaitItem()
-            // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))
             val successState = awaitItem()
             assertThat(successState.target).isEqualTo(
                 ActionListState.Target.Success(
@@ -525,6 +513,49 @@ class ActionListPresenterTest {
         }
     }
 
+    @Test
+    fun `present - compute for my message no permission`() = runTest {
+        val presenter = createActionListPresenter(isDeveloperModeEnabled = true, isPinFeatureEnabled = true)
+        moleculeFlow(RecompositionMode.Immediate) {
+            presenter.present()
+        }.test {
+            val initialState = awaitItem()
+            val messageEvent = aMessageEvent(
+                isMine = true,
+                content = TimelineItemTextContent(body = A_MESSAGE, htmlDocument = null, isEdited = false, formattedBody = A_MESSAGE)
+            )
+            initialState.eventSink.invoke(
+                ActionListEvents.ComputeForMessage(
+                    event = messageEvent,
+                    userEventPermissions = aUserEventPermissions(
+                        canRedactOwn = false,
+                        canRedactOther = false,
+                        canSendMessage = false,
+                        canSendReaction = false,
+                        canPinUnpin = false,
+                    )
+                )
+            )
+            val successState = awaitItem()
+            assertThat(successState.target).isEqualTo(
+                ActionListState.Target.Success(
+                    event = messageEvent,
+                    sentTimeFull = "0 Full true",
+                    displayEmojiReactions = false,
+                    verifiedUserSendFailure = VerifiedUserSendFailure.None,
+                    actions = persistentListOf(
+                        TimelineItemAction.Forward,
+                        TimelineItemAction.CopyLink,
+                        TimelineItemAction.CopyText,
+                        TimelineItemAction.ViewSource,
+                    )
+                )
+            )
+            initialState.eventSink.invoke(ActionListEvents.Clear)
+            assertThat(awaitItem().target).isEqualTo(ActionListState.Target.None)
+        }
+    }
+
     @Test
     fun `present - compute for a media item`() = runTest {
         val presenter = createActionListPresenter(isDeveloperModeEnabled = true, isPinFeatureEnabled = true)
@@ -747,8 +778,6 @@ class ActionListPresenterTest {
                     )
                 )
             )
-            // val loadingState = awaitItem()
-            // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))
             val successState = awaitItem()
             assertThat(successState.target).isEqualTo(
                 ActionListState.Target.Success(
@@ -789,8 +818,6 @@ class ActionListPresenterTest {
                     )
                 )
             )
-            // val loadingState = awaitItem()
-            // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))
             assertThat(awaitItem().target).isEqualTo(ActionListState.Target.None)
         }
     }
@@ -818,8 +845,6 @@ class ActionListPresenterTest {
                     )
                 )
             )
-            // val loadingState = awaitItem()
-            // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))
             val successState = awaitItem()
             assertThat(successState.target).isEqualTo(
                 ActionListState.Target.Success(
@@ -866,8 +891,6 @@ class ActionListPresenterTest {
                     )
                 )
             )
-            // val loadingState = awaitItem()
-            // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))
             val successState = awaitItem()
             assertThat(successState.target).isEqualTo(
                 ActionListState.Target.Success(
@@ -921,8 +944,6 @@ class ActionListPresenterTest {
                     )
                 )
             )
-            // val loadingState = awaitItem()
-            // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))
             val successState = awaitItem()
             assertThat(successState.target).isEqualTo(
                 ActionListState.Target.Success(

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ class DefaultActionListPresenter @AssistedInject constructor(`
`169`	`169`	`if (timelineItem.isRemote && timelineItem.content.canBeForwarded()) {`
`170`	`170`	`add(TimelineItemAction.Forward)`
`171`	`171`	`}`
`172`		`- if (timelineItem.isEditable) {`
	`172`	`+ if (timelineItem.isEditable && usersEventPermissions.canSendMessage) {`
`173`	`173`	`if (timelineItem.content is TimelineItemEventContentWithAttachment) {`
`174`	`174`	`// Caption`
`175`	`175`	`if (timelineItem.content.caption == null) {`
Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,6 @@ class ActionListPresenterTest {`
`81`	`81`	`)`
`82`	`82`	`)`
`83`	`83`	`)`
`84`		`- // val loadingState = awaitItem()`
`85`		`- // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))`
`86`	`84`	`val successState = awaitItem()`
`87`	`85`	`assertThat(successState.target).isEqualTo(`
`88`	`86`	`ActionListState.Target.Success(`
`@@ -124,8 +122,6 @@ class ActionListPresenterTest {`
`124`	`122`	`)`
`125`	`123`	`)`
`126`	`124`	`)`
`127`		`- // val loadingState = awaitItem()`
`128`		`- // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))`
`129`	`125`	`val successState = awaitItem()`
`130`	`126`	`assertThat(successState.target).isEqualTo(`
`131`	`127`	`ActionListState.Target.Success(`
`@@ -167,8 +163,6 @@ class ActionListPresenterTest {`
`167`	`163`	`)`
`168`	`164`	`)`
`169`	`165`	`)`
`170`		`- // val loadingState = awaitItem()`
`171`		`- // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))`
`172`	`166`	`val successState = awaitItem()`
`173`	`167`	`assertThat(successState.target).isEqualTo(`
`174`	`168`	`ActionListState.Target.Success(`
`@@ -262,8 +256,6 @@ class ActionListPresenterTest {`
`262`	`256`	`)`
`263`	`257`	`)`
`264`	`258`	`)`
`265`		`- // val loadingState = awaitItem()`
`266`		`- // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))`
`267`	`259`	`val successState = awaitItem()`
`268`	`260`	`assertThat(successState.target).isEqualTo(`
`269`	`261`	`ActionListState.Target.Success(`
`@@ -405,8 +397,6 @@ class ActionListPresenterTest {`
`405`	`397`	`)`
`406`	`398`	`)`
`407`	`399`	`)`
`408`		`- // val loadingState = awaitItem()`
`409`		`- // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))`
`410`	`400`	`val successState = awaitItem()`
`411`	`401`	`assertThat(successState.target).isEqualTo(`
`412`	`402`	`ActionListState.Target.Success(`
`@@ -500,8 +490,6 @@ class ActionListPresenterTest {`
`500`	`490`	`)`
`501`	`491`	`)`
`502`	`492`	`)`
`503`		`- // val loadingState = awaitItem()`
`504`		`- // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))`
`505`	`493`	`val successState = awaitItem()`
`506`	`494`	`assertThat(successState.target).isEqualTo(`
`507`	`495`	`ActionListState.Target.Success(`
`@@ -525,6 +513,49 @@ class ActionListPresenterTest {`
`525`	`513`	`}`
`526`	`514`	`}`
`527`	`515`
	`516`	`+ @Test`
	`517`	+ fun `present - compute for my message no permission`() = runTest {
	`518`	`+ val presenter = createActionListPresenter(isDeveloperModeEnabled = true, isPinFeatureEnabled = true)`
	`519`	`+ moleculeFlow(RecompositionMode.Immediate) {`
	`520`	`+ presenter.present()`
	`521`	`+ }.test {`
	`522`	`+ val initialState = awaitItem()`
	`523`	`+ val messageEvent = aMessageEvent(`
	`524`	`+ isMine = true,`
	`525`	`+ content = TimelineItemTextContent(body = A_MESSAGE, htmlDocument = null, isEdited = false, formattedBody = A_MESSAGE)`
	`526`	`+ )`
	`527`	`+ initialState.eventSink.invoke(`
	`528`	`+ ActionListEvents.ComputeForMessage(`
	`529`	`+ event = messageEvent,`
	`530`	`+ userEventPermissions = aUserEventPermissions(`
	`531`	`+ canRedactOwn = false,`
	`532`	`+ canRedactOther = false,`
	`533`	`+ canSendMessage = false,`
	`534`	`+ canSendReaction = false,`
	`535`	`+ canPinUnpin = false,`
	`536`	`+ )`
	`537`	`+ )`
	`538`	`+ )`
	`539`	`+ val successState = awaitItem()`
	`540`	`+ assertThat(successState.target).isEqualTo(`
	`541`	`+ ActionListState.Target.Success(`
	`542`	`+ event = messageEvent,`
	`543`	`+ sentTimeFull = "0 Full true",`
	`544`	`+ displayEmojiReactions = false,`
	`545`	`+ verifiedUserSendFailure = VerifiedUserSendFailure.None,`
	`546`	`+ actions = persistentListOf(`
	`547`	`+ TimelineItemAction.Forward,`
	`548`	`+ TimelineItemAction.CopyLink,`
	`549`	`+ TimelineItemAction.CopyText,`
	`550`	`+ TimelineItemAction.ViewSource,`
	`551`	`+ )`
	`552`	`+ )`
	`553`	`+ )`
	`554`	`+ initialState.eventSink.invoke(ActionListEvents.Clear)`
	`555`	`+ assertThat(awaitItem().target).isEqualTo(ActionListState.Target.None)`
	`556`	`+ }`
	`557`	`+ }`
	`558`	`+`
`528`	`559`	`@Test`
`529`	`560`	fun `present - compute for a media item`() = runTest {
`530`	`561`	`val presenter = createActionListPresenter(isDeveloperModeEnabled = true, isPinFeatureEnabled = true)`
`@@ -747,8 +778,6 @@ class ActionListPresenterTest {`
`747`	`778`	`)`
`748`	`779`	`)`
`749`	`780`	`)`
`750`		`- // val loadingState = awaitItem()`
`751`		`- // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))`
`752`	`781`	`val successState = awaitItem()`
`753`	`782`	`assertThat(successState.target).isEqualTo(`
`754`	`783`	`ActionListState.Target.Success(`
`@@ -789,8 +818,6 @@ class ActionListPresenterTest {`
`789`	`818`	`)`
`790`	`819`	`)`
`791`	`820`	`)`
`792`		`- // val loadingState = awaitItem()`
`793`		`- // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))`
`794`	`821`	`assertThat(awaitItem().target).isEqualTo(ActionListState.Target.None)`
`795`	`822`	`}`
`796`	`823`	`}`
`@@ -818,8 +845,6 @@ class ActionListPresenterTest {`
`818`	`845`	`)`
`819`	`846`	`)`
`820`	`847`	`)`
`821`		`- // val loadingState = awaitItem()`
`822`		`- // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))`
`823`	`848`	`val successState = awaitItem()`
`824`	`849`	`assertThat(successState.target).isEqualTo(`
`825`	`850`	`ActionListState.Target.Success(`
`@@ -866,8 +891,6 @@ class ActionListPresenterTest {`
`866`	`891`	`)`
`867`	`892`	`)`
`868`	`893`	`)`
`869`		`- // val loadingState = awaitItem()`
`870`		`- // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))`
`871`	`894`	`val successState = awaitItem()`
`872`	`895`	`assertThat(successState.target).isEqualTo(`
`873`	`896`	`ActionListState.Target.Success(`
`@@ -921,8 +944,6 @@ class ActionListPresenterTest {`
`921`	`944`	`)`
`922`	`945`	`)`
`923`	`946`	`)`
`924`		`- // val loadingState = awaitItem()`
`925`		`- // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))`
`926`	`947`	`val successState = awaitItem()`
`927`	`948`	`assertThat(successState.target).isEqualTo(`
`928`	`949`	`ActionListState.Target.Success(`