Merge pull request #8797 from element-hq/feature/bma/reportUser

bmarty · web-flow · commit 9aaf29d4cfc6 · 2024-04-02T18:08:44.000+02:00
Report user
diff --git a/changelog.d/8796.misc b/changelog.d/8796.misc
@@ -0,0 +1 @@
+ Add a report user action in the message bottom sheet and on the user profile page.
diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml
@@ -1953,8 +1953,11 @@
     <string name="content_reported_as_spam_content">"This content was reported as spam.\n\nIf you don't want to see any more content from this user, you can ignore them to hide their messages."</string>
     <string name="content_reported_as_inappropriate_title">"Reported as inappropriate"</string>
     <string name="content_reported_as_inappropriate_content">"This content was reported as inappropriate.\n\nIf you don't want to see any more content from this user, you can ignore them to hide their messages."</string>
+    <string name="user_reported_as_inappropriate_title">"Reported user"</string>
+    <string name="user_reported_as_inappropriate_content">"The user has been reported.\n\nIf you don't want to see any more content from this user, you can ignore them to hide their messages."</string>
 
     <string name="message_ignore_user">Ignore user</string>
+    <string name="message_report_user">Report user</string>
 
     <string name="room_list_quick_actions_notifications_all_noisy">"All messages (noisy)"</string>
     <string name="room_list_quick_actions_notifications_all">"All messages"</string>
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
@@ -61,7 +61,8 @@ sealed class RoomDetailAction : VectorViewModelAction {
             val senderId: String?,
             val reason: String,
             val spam: Boolean = false,
-            val inappropriate: Boolean = false
+            val inappropriate: Boolean = false,
+            val user: Boolean = false,
     ) : RoomDetailAction()
 
     data class IgnoreUser(val userId: String?) : RoomDetailAction()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
@@ -1345,6 +1345,16 @@ class TimelineFragment :
                                 }
                                 .show()
                     }
+                    data.user -> {
+                        MaterialAlertDialogBuilder(requireActivity(), R.style.ThemeOverlay_Vector_MaterialAlertDialog_NegativeDestructive)
+                                .setTitle(R.string.user_reported_as_inappropriate_title)
+                                .setMessage(R.string.user_reported_as_inappropriate_content)
+                                .setPositiveButton(R.string.ok, null)
+                                .setNegativeButton(R.string.block_user) { _, _ ->
+                                    timelineViewModel.handle(RoomDetailAction.IgnoreUser(data.senderId))
+                                }
+                                .show()
+                    }
                     else -> {
                         MaterialAlertDialogBuilder(requireActivity(), R.style.ThemeOverlay_Vector_MaterialAlertDialog_NegativeDestructive)
                                 .setTitle(R.string.content_reported_title)
@@ -1857,6 +1867,13 @@ class TimelineFragment :
             is EventSharedAction.IgnoreUser -> {
                 action.senderId?.let { askConfirmationToIgnoreUser(it) }
             }
+            is EventSharedAction.ReportUser -> {
+                timelineViewModel.handle(
+                        RoomDetailAction.ReportContent(
+                                action.eventId, action.senderId, "Reporting user ${action.senderId}", user = true
+                        )
+                )
+            }
             is EventSharedAction.OnUrlClicked -> {
                 onUrlClicked(action.url, action.title)
             }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
@@ -98,6 +98,9 @@ sealed class EventSharedAction(
     data class IgnoreUser(val senderId: String?) :
             EventSharedAction(R.string.message_ignore_user, R.drawable.ic_alert_triangle, true)
 
+    data class ReportUser(val eventId: String, val senderId: String?) :
+            EventSharedAction(R.string.message_report_user, R.drawable.ic_flag, true)
+
     data class QuickReact(val eventId: String, val clickedOn: String, val add: Boolean) :
             EventSharedAction(0, 0)
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -430,6 +430,12 @@ class MessageActionsViewModel @AssistedInject constructor(
 
             add(EventSharedAction.Separator)
             add(EventSharedAction.IgnoreUser(timelineEvent.root.senderId))
+            add(
+                    EventSharedAction.ReportUser(
+                            eventId = eventId,
+                            senderId = timelineEvent.root.senderId,
+                    )
+            )
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileAction.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileAction.kt
@@ -22,6 +22,7 @@ import im.vector.app.core.platform.VectorViewModelAction
 sealed class RoomMemberProfileAction : VectorViewModelAction {
     object RetryFetchingInfo : RoomMemberProfileAction()
     object IgnoreUser : RoomMemberProfileAction()
+    object ReportUser : RoomMemberProfileAction()
     data class BanOrUnbanUser(val reason: String?) : RoomMemberProfileAction()
     data class KickUser(val reason: String?) : RoomMemberProfileAction()
     object InviteUser : RoomMemberProfileAction()
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
@@ -39,6 +39,7 @@ class RoomMemberProfileController @Inject constructor(
 
     interface Callback {
         fun onIgnoreClicked()
+        fun onReportClicked()
         fun onTapVerify()
         fun onShowDeviceList()
         fun onShowDeviceListNoCrossSigning()
@@ -225,7 +226,7 @@ class RoomMemberProfileController @Inject constructor(
                         title = stringProvider.getString(R.string.room_participants_action_invite),
                         destructive = false,
                         editable = false,
-                        divider = ignoreActionTitle != null,
+                        divider = true,
                         action = { callback?.onInviteClicked() }
                 )
             }
@@ -235,10 +236,18 @@ class RoomMemberProfileController @Inject constructor(
                         title = ignoreActionTitle,
                         destructive = true,
                         editable = false,
-                        divider = false,
+                        divider = true,
                         action = { callback?.onIgnoreClicked() }
                 )
             }
+            buildProfileAction(
+                    id = "report",
+                    title = stringProvider.getString(R.string.message_report_user),
+                    destructive = true,
+                    editable = false,
+                    divider = false,
+                    action = { callback?.onReportClicked() }
+            )
         }
     }
 
@@ -314,9 +323,9 @@ class RoomMemberProfileController @Inject constructor(
     private fun RoomMemberProfileViewState.buildIgnoreActionTitle(): String? {
         val isIgnored = isIgnored() ?: return null
         return if (isIgnored) {
-            stringProvider.getString(R.string.unignore)
+            stringProvider.getString(R.string.room_participants_action_unignore_title)
         } else {
-            stringProvider.getString(R.string.action_ignore)
+            stringProvider.getString(R.string.room_participants_action_ignore_title)
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
@@ -140,11 +140,20 @@ class RoomMemberProfileFragment :
                 is RoomMemberProfileViewEvents.OnIgnoreActionSuccess -> Unit
                 is RoomMemberProfileViewEvents.OnInviteActionSuccess -> Unit
                 RoomMemberProfileViewEvents.GoBack -> handleGoBack()
+                RoomMemberProfileViewEvents.OnReportActionSuccess -> handleReportSuccess()
             }
         }
         setupLongClicks()
     }
 
+    private fun handleReportSuccess() {
+        MaterialAlertDialogBuilder(requireContext())
+                .setTitle(R.string.user_reported_as_inappropriate_title)
+                .setMessage(R.string.user_reported_as_inappropriate_content)
+                .setPositiveButton(R.string.ok, null)
+                .show()
+    }
+
     private fun setupLongClicks() {
         headerViews.memberProfileNameView.copyOnLongClick()
         headerViews.memberProfileIdView.copyOnLongClick()
@@ -301,6 +310,10 @@ class RoomMemberProfileFragment :
                 }
     }
 
+    override fun onReportClicked() {
+        viewModel.handle(RoomMemberProfileAction.ReportUser)
+    }
+
     override fun onTapVerify() {
         viewModel.handle(RoomMemberProfileAction.VerifyUser)
     }
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewEvents.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewEvents.kt
@@ -26,6 +26,7 @@ sealed class RoomMemberProfileViewEvents : VectorViewEvents {
     data class Failure(val throwable: Throwable) : RoomMemberProfileViewEvents()
 
     object OnIgnoreActionSuccess : RoomMemberProfileViewEvents()
+    object OnReportActionSuccess : RoomMemberProfileViewEvents()
     object OnSetPowerLevelSuccess : RoomMemberProfileViewEvents()
     object OnInviteActionSuccess : RoomMemberProfileViewEvents()
     object OnKickActionSuccess : RoomMemberProfileViewEvents()
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
@@ -161,6 +161,7 @@ class RoomMemberProfileViewModel @AssistedInject constructor(
         when (action) {
             is RoomMemberProfileAction.RetryFetchingInfo -> handleRetryFetchProfileInfo()
             is RoomMemberProfileAction.IgnoreUser -> handleIgnoreAction()
+            is RoomMemberProfileAction.ReportUser -> handleReportAction()
             is RoomMemberProfileAction.VerifyUser -> prepareVerification()
             is RoomMemberProfileAction.ShareRoomMemberProfile -> handleShareRoomMemberProfile()
             is RoomMemberProfileAction.SetPowerLevel -> handleSetPowerLevel(action)
@@ -172,6 +173,25 @@ class RoomMemberProfileViewModel @AssistedInject constructor(
         }
     }
 
+    private fun handleReportAction() {
+        viewModelScope.launch {
+            val event = try {
+                // The API need an Event, use the latest Event.
+                val latestEventId = room?.roomSummary()?.latestPreviewableEvent?.eventId ?: return@launch
+                room.reportingService()
+                        .reportContent(
+                                eventId = latestEventId,
+                                score = -100,
+                                reason = "Reporting user ${initialState.userId} (eventId is not relevant)"
+                        )
+                RoomMemberProfileViewEvents.OnReportActionSuccess
+            } catch (failure: Throwable) {
+                RoomMemberProfileViewEvents.Failure(failure)
+            }
+            _viewEvents.post(event)
+        }
+    }
+
     private fun handleOpenOrCreateDm(action: RoomMemberProfileAction.OpenOrCreateDm) {
         viewModelScope.launch {
             _viewEvents.post(RoomMemberProfileViewEvents.Loading())

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ Add a report user action in the message bottom sheet and on the user profile page.`
Original file line number	Diff line number	Diff line change
`@@ -430,6 +430,12 @@ class MessageActionsViewModel @AssistedInject constructor(`
`430`	`430`
`431`	`431`	`add(EventSharedAction.Separator)`
`432`	`432`	`add(EventSharedAction.IgnoreUser(timelineEvent.root.senderId))`
	`433`	`+ add(`
	`434`	`+ EventSharedAction.ReportUser(`
	`435`	`+ eventId = eventId,`
	`436`	`+ senderId = timelineEvent.root.senderId,`
	`437`	`+ )`
	`438`	`+ )`
`433`	`439`	`}`
`434`	`440`	`}`
`435`	`441`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ class RoomMemberProfileController @Inject constructor(`
`39`	`39`
`40`	`40`	`interface Callback {`
`41`	`41`	`fun onIgnoreClicked()`
	`42`	`+ fun onReportClicked()`
`42`	`43`	`fun onTapVerify()`
`43`	`44`	`fun onShowDeviceList()`
`44`	`45`	`fun onShowDeviceListNoCrossSigning()`
`@@ -225,7 +226,7 @@ class RoomMemberProfileController @Inject constructor(`
`225`	`226`	`title = stringProvider.getString(R.string.room_participants_action_invite),`
`226`	`227`	`destructive = false,`
`227`	`228`	`editable = false,`
`228`		`- divider = ignoreActionTitle != null,`
	`229`	`+ divider = true,`
`229`	`230`	`action = { callback?.onInviteClicked() }`
`230`	`231`	`)`
`231`	`232`	`}`
`@@ -235,10 +236,18 @@ class RoomMemberProfileController @Inject constructor(`
`235`	`236`	`title = ignoreActionTitle,`
`236`	`237`	`destructive = true,`
`237`	`238`	`editable = false,`
`238`		`- divider = false,`
	`239`	`+ divider = true,`
`239`	`240`	`action = { callback?.onIgnoreClicked() }`
`240`	`241`	`)`
`241`	`242`	`}`
	`243`	`+ buildProfileAction(`
	`244`	`+ id = "report",`
	`245`	`+ title = stringProvider.getString(R.string.message_report_user),`
	`246`	`+ destructive = true,`
	`247`	`+ editable = false,`
	`248`	`+ divider = false,`
	`249`	`+ action = { callback?.onReportClicked() }`
	`250`	`+ )`
`242`	`251`	`}`
`243`	`252`	`}`
`244`	`253`
`@@ -314,9 +323,9 @@ class RoomMemberProfileController @Inject constructor(`
`314`	`323`	`private fun RoomMemberProfileViewState.buildIgnoreActionTitle(): String? {`
`315`	`324`	`val isIgnored = isIgnored() ?: return null`
`316`	`325`	`return if (isIgnored) {`
`317`		`- stringProvider.getString(R.string.unignore)`
	`326`	`+ stringProvider.getString(R.string.room_participants_action_unignore_title)`
`318`	`327`	`} else {`
`319`		`- stringProvider.getString(R.string.action_ignore)`
	`328`	`+ stringProvider.getString(R.string.room_participants_action_ignore_title)`
`320`	`329`	`}`
`321`	`330`	`}`
`322`	`331`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,11 +140,20 @@ class RoomMemberProfileFragment :`
`140`	`140`	`is RoomMemberProfileViewEvents.OnIgnoreActionSuccess -> Unit`
`141`	`141`	`is RoomMemberProfileViewEvents.OnInviteActionSuccess -> Unit`
`142`	`142`	`RoomMemberProfileViewEvents.GoBack -> handleGoBack()`
	`143`	`+ RoomMemberProfileViewEvents.OnReportActionSuccess -> handleReportSuccess()`
`143`	`144`	`}`
`144`	`145`	`}`
`145`	`146`	`setupLongClicks()`
`146`	`147`	`}`
`147`	`148`
	`149`	`+ private fun handleReportSuccess() {`
	`150`	`+ MaterialAlertDialogBuilder(requireContext())`
	`151`	`+ .setTitle(R.string.user_reported_as_inappropriate_title)`
	`152`	`+ .setMessage(R.string.user_reported_as_inappropriate_content)`
	`153`	`+ .setPositiveButton(R.string.ok, null)`
	`154`	`+ .show()`
	`155`	`+ }`
	`156`	`+`
`148`	`157`	`private fun setupLongClicks() {`
`149`	`158`	`headerViews.memberProfileNameView.copyOnLongClick()`
`150`	`159`	`headerViews.memberProfileIdView.copyOnLongClick()`
`@@ -301,6 +310,10 @@ class RoomMemberProfileFragment :`
`301`	`310`	`}`
`302`	`311`	`}`
`303`	`312`
	`313`	`+ override fun onReportClicked() {`
	`314`	`+ viewModel.handle(RoomMemberProfileAction.ReportUser)`
	`315`	`+ }`
	`316`	`+`
`304`	`317`	`override fun onTapVerify() {`
`305`	`318`	`viewModel.handle(RoomMemberProfileAction.VerifyUser)`
`306`	`319`	`}`