From 4b79410fa24693b95c7da95f28617c2d14201a11 Mon Sep 17 00:00:00 2001 From: Avently <7953703+avently@users.noreply.github.com> Date: Thu, 9 Jan 2025 14:19:17 +0700 Subject: [PATCH] item moderated/deleted --- .../kotlin/chat/simplex/common/model/SimpleXAPI.kt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt index 769f4c04a3..1319960439 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt @@ -2603,7 +2603,11 @@ object ChatController { generalGetString(MR.strings.marked_deleted_description) ) } - val deleted = if (r.member_ != null) CIDeleted.Moderated(Clock.System.now(), r.member_) else CIDeleted.Deleted(Clock.System.now()) + val deleted = if (r.member_ != null && (cItem.chatDir as CIDirection.GroupRcv?)?.groupMember != r.member_) { + CIDeleted.Moderated(Clock.System.now(), r.member_) + } else { + CIDeleted.Deleted(Clock.System.now()) + } upsertChatItem(rhId, cInfo, cItem.copy(meta = cItem.meta.copy(itemDeleted = deleted))) } } @@ -2614,7 +2618,11 @@ object ChatController { // Stop voice playback only inside a chat, allow to play in a chat list AudioPlayer.stop(cItem) } - val deleted = if (r.member_ != null) CIDeleted.Moderated(Clock.System.now(), r.member_) else CIDeleted.Deleted(Clock.System.now()) + val deleted = if (r.member_ != null && (cItem.chatDir as CIDirection.GroupRcv?)?.groupMember != r.member_) { + CIDeleted.Moderated(Clock.System.now(), r.member_) + } else { + CIDeleted.Deleted(Clock.System.now()) + } upsertChatItem(rhId, cInfo, cItem.copy(meta = cItem.meta.copy(itemDeleted = deleted))) } }