filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8798 from element-hq/feature/bma/reportUserStateEvent 

When reporting a user, use the membership state eventId for the eventId.
This commit is contained in:
Benoit Marty 2024-04-02 22:18:54 +02:00 committed by GitHub
parent c2b46a1c1e 6cd9e6eedd
commit 9b4394bbe6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
View File

@ -766,7 +766,7 @@ class TimelineViewModel @AssistedInject constructor(
} }
fun getRoom(roomId: String): RoomSummary? = fun getRoom(roomId: String): RoomSummary? =
session.roomService().getRoomSummary(roomId) session.roomService().getRoomSummary(roomId)
private fun handleComposerFocusChange(action: RoomDetailAction.ComposerFocusChange) { private fun handleComposerFocusChange(action: RoomDetailAction.ComposerFocusChange) {
if (room == null) return if (room == null) return
@ -1147,7 +1147,22 @@ class TimelineViewModel @AssistedInject constructor(
if (room == null) return if (room == null) return
viewModelScope.launch { viewModelScope.launch {
val event = try { val event = try {
room.reportingService().reportContent(action.eventId, -100, action.reason) if (action.user && action.senderId != null) {
// When reporting a user, use the user state event if available (it should always be available)
val userStateEventId = room.stateService()
.getStateEvent(EventType.STATE_ROOM_MEMBER, QueryStringValue.Equals(action.senderId))
?.eventId
// If not found fallback to the provided event
val eventId = userStateEventId ?: action.eventId
room.reportingService()
.reportContent(
eventId = eventId,
score = -100,
reason = action.reason
)
} else {
room.reportingService().reportContent(action.eventId, -100, action.reason)
}
RoomDetailViewEvents.ActionSuccess(action) RoomDetailViewEvents.ActionSuccess(action)
} catch (failure: Throwable) { } catch (failure: Throwable) {
RoomDetailViewEvents.ActionFailure(action, failure) RoomDetailViewEvents.ActionFailure(action, failure)

13
vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
View File

@ -174,15 +174,20 @@ class RoomMemberProfileViewModel @AssistedInject constructor(
} }
private fun handleReportAction() { private fun handleReportAction() {
room ?: return
viewModelScope.launch { viewModelScope.launch {
val event = try { val event = try {
// The API need an Event, use the latest Event. // The API needs an Event, use user state event if available (it should always be available)
val latestEventId = room?.roomSummary()?.latestPreviewableEvent?.eventId ?: return@launch val userStateEventId = room.stateService()
.getStateEvent(EventType.STATE_ROOM_MEMBER, QueryStringValue.Equals(initialState.userId))
?.eventId
// If not found fallback to the latest event
val eventId = (userStateEventId ?: room.roomSummary()?.latestPreviewableEvent?.eventId) ?: return@launch
room.reportingService() room.reportingService()
.reportContent( .reportContent(
eventId = latestEventId, eventId = eventId,
score = -100, score = -100,
reason = "Reporting user ${initialState.userId} (eventId is not relevant)" reason = "Reporting user ${initialState.userId}"
) )
RoomMemberProfileViewEvents.OnReportActionSuccess RoomMemberProfileViewEvents.OnReportActionSuccess
} catch (failure: Throwable) { } catch (failure: Throwable) {