Fixing the complete removal

This commit is contained in:
2026-09-29 21:36:31 +03:30
parent 83504816c5
commit 88dc7c5a1c
2 changed files with 105 additions and 68 deletions
+102 -61
View File
@@ -37,10 +37,23 @@ const PAGE_SIZE = 50;
const IMAGE_MAX_EDGE = 1600; const IMAGE_MAX_EDGE = 1600;
const IMAGE_WEBP_QUALITY = 0.82; const IMAGE_WEBP_QUALITY = 0.82;
const MAX_UPLOAD_BYTES = 40 * 1024 * 1024; const MAX_UPLOAD_BYTES = 40 * 1024 * 1024;
const DELETED_CONTENT = 'این پیام حذف شد'; /** Synced hard-delete marker (edit channel). Clients purge the message; never shown in UI. */
const HARD_DELETE_MARKER = '__MENTO_DEL__';
function isDeletedContent(content: string): boolean { function isDeletedContent(content: string): boolean {
return /^(?:\[?\s*deleted\s*\]?|این پیام حذف شد|پیام حذف شد)$/i.test(content.trim()); const t = content.trim();
return (
/^(?:\[?\s*deleted\s*\]?|این پیام حذف شد|پیام حذف شد)$/i.test(t) ||
t.includes('MENTO_DEL') ||
t === HARD_DELETE_MARKER
);
}
function purgeMessageById(id: string) {
const key = String(id || '').trim();
if (!key) return;
const next = messages.value.filter((m) => m.id !== key);
if (next.length !== messages.value.length) messages.value = next;
} }
let socket: WebSocket | null = null; let socket: WebSocket | null = null;
@@ -306,12 +319,11 @@ function normalizeIncoming(
const type = inferMediaType(declared, content, fileName); const type = inferMediaType(declared, content, fileName);
const isMedia = type !== 'text'; const isMedia = type !== 'text';
const mediaUrl = isMedia ? buildChatFileUrl(content, downloadUrl) : undefined; const mediaUrl = isMedia ? buildChatFileUrl(content, downloadUrl) : undefined;
const deleted = Boolean( const deletedFlag = Boolean(base.deleted || base.is_deleted || base.isDeleted);
base.deleted || if (deletedFlag || isDeletedContent(content)) {
base.is_deleted || // Hard-delete: drop from history / ignore tombstones
base.isDeleted || return null;
isDeletedContent(content), }
);
const edited = Boolean(base.edited || base.is_edited || base.isEdited || base.edited_at); const edited = Boolean(base.edited || base.is_edited || base.isEdited || base.edited_at);
return { return {
@@ -320,57 +332,50 @@ function normalizeIncoming(
senderId: String( senderId: String(
base.sender_id ?? base.user_id ?? base.from_user_id ?? raw.sender_id ?? '', base.sender_id ?? base.user_id ?? base.from_user_id ?? raw.sender_id ?? '',
), ),
content: deleted ? DELETED_CONTENT : content, content,
type: deleted ? 'text' : type, type,
createdAt: String( createdAt: String(
base.created_at ?? base.createdAt ?? raw.created_at ?? new Date().toISOString(), base.created_at ?? base.createdAt ?? raw.created_at ?? new Date().toISOString(),
), ),
reply: base.reply ? String(base.reply) : null, reply: base.reply ? String(base.reply) : null,
readAt: readAt ? String(readAt) : null, readAt: readAt ? String(readAt) : null,
delivery: readAt ? 'read' : 'sent', delivery: readAt ? 'read' : 'sent',
mediaUrl: deleted ? undefined : mediaUrl, mediaUrl,
fileName: deleted ? undefined : fileName, fileName,
edited: deleted ? false : edited, edited,
deleted, deleted: false,
}; };
} }
function mergeMessages(incoming: ChatMessage, list: ChatMessage[]): ChatMessage[] { function mergeMessages(incoming: ChatMessage, list: ChatMessage[]): ChatMessage[] {
if (incoming.deleted || isDeletedContent(incoming.content)) {
return list.filter((m) => m.id !== incoming.id);
}
const byId = list.findIndex((m) => m.id === incoming.id); const byId = list.findIndex((m) => m.id === incoming.id);
if (byId >= 0) { if (byId >= 0) {
const prev = list[byId]; const prev = list[byId];
if (prev.deleted) {
return list.filter((m) => m.id !== prev.id);
}
const next = [...list]; const next = [...list];
next[byId] = { next[byId] = {
...prev, ...prev,
...incoming, ...incoming,
optimistic: false, optimistic: false,
type: type: inferMediaType(
prev.deleted || incoming.deleted prev.type === 'voice' || incoming.type === 'voice'
? 'text' ? 'voice'
: inferMediaType( : prev.type === 'video' || incoming.type === 'video'
prev.type === 'voice' || incoming.type === 'voice' ? 'video'
? 'voice' : incoming.type,
: prev.type === 'video' || incoming.type === 'video' incoming.content || prev.content,
? 'video' incoming.fileName || prev.fileName,
: incoming.type, ),
incoming.content || prev.content,
incoming.fileName || prev.fileName,
),
content:
prev.deleted || incoming.deleted
? DELETED_CONTENT
: incoming.content || prev.content,
localPreviewUrl: incoming.localPreviewUrl ?? prev.localPreviewUrl, localPreviewUrl: incoming.localPreviewUrl ?? prev.localPreviewUrl,
mediaUrl: mediaUrl: incoming.mediaUrl || prev.mediaUrl,
prev.deleted || incoming.deleted fileName: incoming.fileName || prev.fileName,
? undefined
: incoming.mediaUrl || prev.mediaUrl,
fileName:
prev.deleted || incoming.deleted
? undefined
: incoming.fileName || prev.fileName,
edited: incoming.edited || prev.edited, edited: incoming.edited || prev.edited,
deleted: prev.deleted || incoming.deleted, deleted: false,
delivery: delivery:
incoming.delivery === 'read' || prev.delivery === 'read' incoming.delivery === 'read' || prev.delivery === 'read'
? 'read' ? 'read'
@@ -538,9 +543,9 @@ function applyEditedMessage(payload: Record<string, unknown>) {
if (!id) return; if (!id) return;
const content = String(base.content ?? base.text ?? base.body ?? '').trim(); const content = String(base.content ?? base.text ?? base.body ?? '').trim();
if (!content) return; if (!content) return;
// Delete-for-everyone is synced via edit tombstone (native delete is not broadcast by chat WS) // Hard-delete sync uses edit channel with purge marker
if (isDeletedContent(content)) { if (isDeletedContent(content)) {
applyDeletedMessage({ id }); purgeMessageById(id);
return; return;
} }
messages.value = messages.value.map((m) => messages.value = messages.value.map((m) =>
@@ -564,21 +569,25 @@ function applyDeletedMessage(payload: Record<string, unknown>) {
? (payload.message as Record<string, unknown>) ? (payload.message as Record<string, unknown>)
: payload; : payload;
const id = String(base.id ?? base.message_id ?? payload.message_id ?? '').trim(); const id = String(base.id ?? base.message_id ?? payload.message_id ?? '').trim();
if (!id) return; purgeMessageById(id);
messages.value = messages.value.map((m) => }
m.id === id
? { function extractPayloadContent(parsed: Record<string, unknown>): string {
...m, const base =
content: DELETED_CONTENT, parsed.message && typeof parsed.message === 'object'
type: 'text', ? (parsed.message as Record<string, unknown>)
deleted: true, : parsed;
edited: false, return String(
mediaUrl: undefined, base.content ?? base.text ?? base.body ?? parsed.content ?? '',
fileName: undefined, ).trim();
localPreviewUrl: undefined, }
}
: m, function extractPayloadId(parsed: Record<string, unknown>): string {
); const base =
parsed.message && typeof parsed.message === 'object'
? (parsed.message as Record<string, unknown>)
: parsed;
return String(base.id ?? base.message_id ?? parsed.message_id ?? '').trim();
} }
function onSocketMessage(event: MessageEvent) { function onSocketMessage(event: MessageEvent) {
@@ -614,6 +623,12 @@ function onSocketMessage(event: MessageEvent) {
applyDeletedMessage(parsed); applyDeletedMessage(parsed);
return; return;
} }
const purgeId = extractPayloadId(parsed);
const purgeContent = extractPayloadContent(parsed);
if (purgeId && isDeletedContent(purgeContent)) {
purgeMessageById(purgeId);
return;
}
const msg = normalizeIncoming(parsed, activeRoomId.value); const msg = normalizeIncoming(parsed, activeRoomId.value);
if (!msg) return; if (!msg) return;
handleIncomingMessage(msg); handleIncomingMessage(msg);
@@ -1065,18 +1080,18 @@ export function useOrgChat() {
await connectSocket(); await connectSocket();
if (!socket || socket.readyState !== WebSocket.OPEN) throw new Error('ws not open'); if (!socket || socket.readyState !== WebSocket.OPEN) throw new Error('ws not open');
applyDeletedMessage({ id: messageId }); // Remove locally immediately (no tombstone)
purgeMessageById(messageId);
// Chat WS does not reliably broadcast type:delete — sync via edit (proven channel). // Sync to peers via edit channel (proven to broadcast) + best-effort delete
socket.send( socket.send(
JSON.stringify({ JSON.stringify({
type: 'edit', type: 'edit',
id: messageId, id: messageId,
room_id: roomId, room_id: roomId,
content: DELETED_CONTENT, content: HARD_DELETE_MARKER,
}), }),
); );
// Best-effort native delete for backends that support it
socket.send( socket.send(
JSON.stringify({ JSON.stringify({
type: 'delete', type: 'delete',
@@ -1085,10 +1100,36 @@ export function useOrgChat() {
room_id: roomId, room_id: roomId,
}), }),
); );
socket.send(
JSON.stringify({
type: 'remove',
id: messageId,
message_id: messageId,
room_id: roomId,
}),
);
// Best-effort REST delete if the chat host supports it
try {
const session = await ensureSession();
const apiKey = new URL(session.wsUrl).searchParams.get('api_key') ?? '';
const params = new URLSearchParams({
api_key: apiKey,
room_id: roomId,
user_id: session.chatUserId,
});
void fetch(`${session.messagesBaseUrl}/api/messages/${encodeURIComponent(messageId)}?${params}`, {
method: 'DELETE',
headers: { Accept: 'application/json' },
}).catch(() => undefined);
} catch {
// ignore
}
const last = [...messages.value].reverse().find((m) => m.roomId === roomId);
emitRoomLive({ emitRoomLive({
roomId, roomId,
preview: DELETED_CONTENT, preview: last ? previewLabelForMessage(last) : ' ',
at: new Date().toISOString(), at: new Date().toISOString(),
fromSelf: true, fromSelf: true,
}); });
+3 -7
View File
@@ -837,18 +837,14 @@ onUnmounted(() => {
<div <div
class="bubble" class="bubble"
:class="{ :class="{
media: msg.type !== 'text' && !msg.deleted, media: msg.type !== 'text',
deleted: msg.deleted,
}" }"
@touchstart.passive="onBubbleTouchStart(msg, $event)" @touchstart.passive="onBubbleTouchStart(msg, $event)"
@touchend="onBubbleTouchEnd" @touchend="onBubbleTouchEnd"
@touchmove="onBubbleTouchEnd" @touchmove="onBubbleTouchEnd"
@touchcancel="onBubbleTouchEnd" @touchcancel="onBubbleTouchEnd"
> >
<template v-if="msg.deleted"> <template v-if="msg.type === 'image'">
<p class="deleted-text">این پیام حذف شد</p>
</template>
<template v-else-if="msg.type === 'image'">
<button <button
type="button" type="button"
class="media-image" class="media-image"
@@ -907,7 +903,7 @@ onUnmounted(() => {
</template> </template>
<p v-else>{{ msg.content }}</p> <p v-else>{{ msg.content }}</p>
<div class="bubble-meta"> <div class="bubble-meta">
<span v-if="msg.edited && !msg.deleted" class="edited-mark">ویرایش‌شده</span> <span v-if="msg.edited" class="edited-mark">ویرایش‌شده</span>
<time>{{ formatListTime(msg.createdAt) }}</time> <time>{{ formatListTime(msg.createdAt) }}</time>
<span <span
v-if="msg.senderId === chatUserId || msg.optimistic" v-if="msg.senderId === chatUserId || msg.optimistic"