Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
Fix message reaction deletion
Hakan Shehudbffc94527bb
diff --git a/apps/desktop/src/main/jobs/sync-pending-mutations.ts b/apps/desktop/src/main/jobs/sync-pending-mutations.tsindex da631197..59d26056 100644--- a/apps/desktop/src/main/jobs/sync-pending-mutations.ts+++ b/apps/desktop/src/main/jobs/sync-pending-mutations.ts@@ -257,6 +257,28 @@ export class SyncPendingMutationsJobHandlerdeletedMutationIds.add(previousMutation.id);}}+ } else if (mutation.type === 'delete_message_reaction') {+ for (let j = i - 1; j >= 0; j--) {+ const previousMutation = mutations[j];+ if (!previousMutation) {+ continue;+ }++ if (+ previousMutation.type === 'create_message_reaction' &&+ previousMutation.data.messageId === mutation.data.messageId &&+ previousMutation.data.reaction === mutation.data.reaction+ ) {+ deletedMutationIds.add(mutation.id);+ deletedMutationIds.add(previousMutation.id);+ } else if (+ previousMutation.type === 'delete_message_reaction' &&+ previousMutation.data.messageId === mutation.data.messageId &&+ previousMutation.data.reaction === mutation.data.reaction+ ) {+ deletedMutationIds.add(previousMutation.id);+ }+ }} else if (mutation.type === 'mark_entry_seen') {for (let j = i - 1; j >= 0; j--) {const previousMutation = mutations[j];diff --git a/apps/desktop/src/main/mutations/messages/message-reaction-create.ts b/apps/desktop/src/main/mutations/messages/message-reaction-create.tsindex 9f73862b..c412bfa9 100644--- a/apps/desktop/src/main/mutations/messages/message-reaction-create.ts+++ b/apps/desktop/src/main/mutations/messages/message-reaction-create.ts@@ -106,6 +106,13 @@ export class MessageReactionCreateMutationHandlerversion: 0n,created_at: new Date().toISOString(),})+ .onConflict((cb) =>+ cb+ .columns(['message_id', 'collaborator_id', 'reaction'])+ .doUpdateSet({+ deleted_at: null,+ })+ ).executeTakeFirst();if (!createdMessageReaction) {diff --git a/apps/desktop/src/main/queries/messages/message-reactions-get.ts b/apps/desktop/src/main/queries/messages/message-reactions-get.tsindex 03b18495..b0854c89 100644--- a/apps/desktop/src/main/queries/messages/message-reactions-get.ts+++ b/apps/desktop/src/main/queries/messages/message-reactions-get.ts@@ -1,13 +1,10 @@-import { compareString } from '@colanode/core';import { sql } from 'kysely';import { databaseService } from '@/main/data/database-service';-import { SelectMessage } from '@/main/data/workspace/schema';import { ChangeCheckResult, QueryHandler } from '@/main/types';-import { mapMessage } from '@/main/utils';import { MessageReactionsGetQueryInput } from '@/shared/queries/messages/message-reactions-get';import { Event } from '@/shared/types/events';-import { MessageNode, MessageReactionsCount } from '@/shared/types/messages';+import { MessageReactionsCount } from '@/shared/types/messages';interface MessageReactionsCountRow {reaction: string;@@ -104,9 +101,4 @@ export class MessageReactionsGetQueryHandlerreturn counts;}-- private buildMessages = (rows: SelectMessage[]): MessageNode[] => {- const messages = rows.map(mapMessage);- return messages.sort((a, b) => compareString(a.id, b.id));- };}diff --git a/apps/desktop/src/main/services/message-service.ts b/apps/desktop/src/main/services/message-service.tsindex 2d6cfc4c..2741717e 100644--- a/apps/desktop/src/main/services/message-service.ts+++ b/apps/desktop/src/main/services/message-service.ts@@ -172,6 +172,29 @@ class MessageService {const workspaceDatabase =await databaseService.getWorkspaceDatabase(userId);+ if (messageReaction.deletedAt) {+ const deletedMessageReaction = await workspaceDatabase+ .deleteFrom('message_reactions')+ .returningAll()+ .where('message_id', '=', messageReaction.messageId)+ .where('collaborator_id', '=', messageReaction.collaboratorId)+ .where('reaction', '=', messageReaction.reaction)+ .executeTakeFirst();++ if (deletedMessageReaction) {+ eventBus.publish({+ type: 'message_reaction_deleted',+ userId,+ messageReaction: mapMessageReaction(deletedMessageReaction),+ });+ }++ this.debug(+ `Server message reaction for message ${messageReaction.messageId} has been synced`+ );+ return;+ }+const existingMessageReaction = await workspaceDatabase.selectFrom('message_reactions').selectAll()@@ -221,6 +244,12 @@ class MessageService {created_at: messageReaction.createdAt,version,})+ .onConflict((b) =>+ b.columns(['message_id', 'collaborator_id', 'reaction']).doUpdateSet({+ version,+ deleted_at: null,+ })+ ).executeTakeFirst();if (!createdMessageReaction) {