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 interaction syncing and radar service counter
Hakan Shehucec617fa0c4a
diff --git a/apps/desktop/src/main/services/interaction-service.ts b/apps/desktop/src/main/services/interaction-service.tsindex 98021608..9c87fa78 100644--- a/apps/desktop/src/main/services/interaction-service.ts+++ b/apps/desktop/src/main/services/interaction-service.ts@@ -65,6 +65,7 @@ class InteractionService {.selectFrom('interactions').selectAll().where('node_id', '=', nodeId)+ .where('user_id', '=', userId).executeTakeFirst();const existingAttributes = interaction?.attributes@@ -289,6 +290,7 @@ class InteractionService {.selectFrom('interactions').selectAll().where('node_id', '=', interaction.nodeId)+ .where('user_id', '=', userId).executeTakeFirst();const interactionEvents = await workspaceDatabasediff --git a/apps/desktop/src/main/services/radar-service.ts b/apps/desktop/src/main/services/radar-service.tsindex ead02782..6f7c419e 100644--- a/apps/desktop/src/main/services/radar-service.ts+++ b/apps/desktop/src/main/services/radar-service.ts@@ -10,11 +10,7 @@ import { WorkspaceDatabaseSchema } from '@/main/data/workspace/schema';import { mapWorkspace } from '@/main/utils';import { databaseService } from '@/main/data/database-service';import { eventBus } from '@/shared/lib/event-bus';-import {- Event,- InteractionUpdatedEvent,- NodeCreatedEvent,-} from '@/shared/types/events';+import { Event, InteractionUpdatedEvent } from '@/shared/types/events';import {WorkspaceRadarData,ChannelReadState,@@ -93,21 +89,21 @@ class RadarWorkspace {public async init(): Promise<void> {const unreadMessagesRows = await this.workspaceDatabase.selectFrom('nodes as node')- .leftJoin(- 'interactions as node_interactions',- 'node.id',- 'node_interactions.node_id'+ .innerJoin('interactions as node_interactions', (join) =>+ join+ .onRef('node.id', '=', 'node_interactions.node_id')+ .on('node_interactions.user_id', '=', this.workspace.userId))- .leftJoin(- 'interactions as parent_interactions',- 'node.parent_id',- 'parent_interactions.node_id'+ .innerJoin('interactions as parent_interactions', (join) =>+ join+ .onRef('node.parent_id', '=', 'parent_interactions.node_id')+ .on('parent_interactions.user_id', '=', this.workspace.userId)).select(['node.id as node_id', 'node.parent_id as parent_id']).where('node.type', '=', 'message').where('node.created_by', '!=', this.workspace.userId).where('node_interactions.last_seen_at', 'is', null)- .where('parent_interactions.last_seen_at', '!=', null)+ .where('parent_interactions.last_seen_at', 'is not', null).whereRef('node.created_at','>=',@@ -124,87 +120,80 @@ class RadarWorkspace {}}- public async handleNodeCreated(event: NodeCreatedEvent): Promise<void> {- if (event.userId !== this.workspace.userId) {+ public async handleInteractionUpdated(+ event: InteractionUpdatedEvent+ ): Promise<void> {+ const interaction = event.interaction;+ if (+ event.userId !== this.workspace.userId ||+ interaction.userId !== this.workspace.userId ||+ interaction.nodeType !== 'message'+ ) {return;}- if (event.node.type !== 'message') {+ if (interaction.attributes.lastSeenAt) {+ const unreadMessage = this.unreadMessages.get(interaction.nodeId);+ if (unreadMessage) {+ this.unreadMessages.delete(interaction.nodeId);++ eventBus.publish({+ type: 'radar_data_updated',+ });+ }+return;}- if (event.node.createdBy === this.workspace.userId) {+ if (this.unreadMessages.has(interaction.nodeId)) {return;}- const interactions = await this.workspaceDatabase- .selectFrom('interactions')+ const node = await this.workspaceDatabase+ .selectFrom('nodes').selectAll()- .where('node_id', '=', event.node.id)- .where('user_id', '=', this.workspace.userId)+ .where('id', '=', interaction.nodeId).executeTakeFirst();- if (interactions && interactions.last_seen_at) {+ if (!node) {return;}- const parentInteractions = await this.workspaceDatabase+ if (node.type !== 'message') {+ return;+ }++ const parentInteraction = await this.workspaceDatabase.selectFrom('interactions').selectAll()- .where('node_id', '=', event.node.parentId)+ .where('node_id', '=', node.parent_id).executeTakeFirst();- if (!parentInteractions || !parentInteractions.last_seen_at) {+ if (!parentInteraction || !parentInteraction.last_seen_at) {return;}const parentInteractionAttributes: InteractionAttributes = JSON.parse(- parentInteractions.attributes+ parentInteraction.attributes);if (- compareDate(- parentInteractionAttributes.firstSeenAt,- event.node.createdAt- ) > 0+ !parentInteractionAttributes.firstSeenAt ||+ compareDate(parentInteractionAttributes.firstSeenAt, node.created_at) > 0) {return;}- this.unreadMessages.set(event.node.id, {- messageId: event.node.id,- parentId: event.node.parentId,- parentIdType: getIdType(event.node.parentId),+ this.unreadMessages.set(interaction.nodeId, {+ messageId: interaction.nodeId,+ parentId: node.parent_id,+ parentIdType: getIdType(node.parent_id),});eventBus.publish({type: 'radar_data_updated',});}-- public async handleInteractionUpdated(- event: InteractionUpdatedEvent- ): Promise<void> {- if (- event.userId !== this.workspace.userId ||- event.interaction.userId !== this.workspace.userId- ) {- return;- }-- const unreadMessage = this.unreadMessages.get(event.interaction.nodeId);- if (!unreadMessage) {- return;- }-- if (event.interaction.attributes.lastSeenAt) {- this.unreadMessages.delete(unreadMessage.messageId);-- eventBus.publish({- type: 'radar_data_updated',- });- }- }}class RadarService {@@ -257,11 +246,17 @@ class RadarService {if (radarWorkspace) {radarWorkspace.handleInteractionUpdated(event);}- } else if (event.type === 'node_created') {- const radarWorkspace = this.workspaces.get(event.userId);- if (radarWorkspace) {- radarWorkspace.handleNodeCreated(event);- }+ } else if (event.type === 'workspace_created') {+ const workspaceDatabase = await databaseService.getWorkspaceDatabase(+ event.workspace.userId+ );++ const radarWorkspace = new RadarWorkspace(+ event.workspace,+ workspaceDatabase+ );+ this.workspaces.set(event.workspace.userId, radarWorkspace);+ await radarWorkspace.init();}}}diff --git a/apps/desktop/src/main/utils.ts b/apps/desktop/src/main/utils.tsindex 9c4102e6..e62027bc 100644--- a/apps/desktop/src/main/utils.ts+++ b/apps/desktop/src/main/utils.ts@@ -249,8 +249,9 @@ export const mapDownload = (row: SelectDownload): Download => {export const mapInteraction = (row: SelectInteraction): Interaction => {return {- nodeId: row.node_id,userId: row.user_id,+ nodeId: row.node_id,+ nodeType: row.node_type,attributes: JSON.parse(row.attributes),createdAt: new Date(row.created_at),updatedAt: row.updated_at ? new Date(row.updated_at) : null,diff --git a/apps/desktop/src/shared/types/interactions.ts b/apps/desktop/src/shared/types/interactions.tsindex 1ac73ef3..14afc68a 100644--- a/apps/desktop/src/shared/types/interactions.ts+++ b/apps/desktop/src/shared/types/interactions.ts@@ -1,8 +1,9 @@-import { InteractionAttributes } from '@colanode/core';+import { InteractionAttributes, NodeType } from '@colanode/core';export type Interaction = {- nodeId: string;userId: string;+ nodeId: string;+ nodeType: NodeType;attributes: InteractionAttributes;createdAt: Date;updatedAt: Date | null;