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
Improve radar service and fix interactions merging
Hakan Shehu91591b058f0c
diff --git a/apps/desktop/src/main/mutations/interactions/mark-node-as-seen.ts b/apps/desktop/src/main/mutations/interactions/mark-node-as-seen.tsindex a1453018..27df697d 100644--- a/apps/desktop/src/main/mutations/interactions/mark-node-as-seen.ts+++ b/apps/desktop/src/main/mutations/interactions/mark-node-as-seen.ts@@ -19,6 +19,14 @@ export class MarkNodeAsSeenMutationHandlernew Date().toISOString());+ await interactionService.setInteraction(+ input.userId,+ input.nodeId,+ 'message',+ 'firstSeenAt',+ new Date().toISOString()+ );+return {success: true,};diff --git a/apps/desktop/src/main/services/radar-service.ts b/apps/desktop/src/main/services/radar-service.tsindex d26bccdb..ead02782 100644--- a/apps/desktop/src/main/services/radar-service.ts+++ b/apps/desktop/src/main/services/radar-service.ts@@ -1,5 +1,10 @@-import { getIdType, IdType } from '@colanode/core';-import { Kysely } from 'kysely';+import {+ compareDate,+ getIdType,+ IdType,+ InteractionAttributes,+} from '@colanode/core';+import { Kysely, sql } from 'kysely';import { WorkspaceDatabaseSchema } from '@/main/data/workspace/schema';import { mapWorkspace } from '@/main/utils';@@ -88,11 +93,26 @@ class RadarWorkspace {public async init(): Promise<void> {const unreadMessagesRows = await this.workspaceDatabase.selectFrom('nodes as node')- .leftJoin('interactions as interaction', 'node.id', 'interaction.node_id')+ .leftJoin(+ 'interactions as node_interactions',+ 'node.id',+ 'node_interactions.node_id'+ )+ .leftJoin(+ 'interactions as parent_interactions',+ 'node.parent_id',+ 'parent_interactions.node_id'+ ).select(['node.id as node_id', 'node.parent_id as parent_id']).where('node.type', '=', 'message').where('node.created_by', '!=', this.workspace.userId)- .where('interaction.last_seen_at', 'is', null)+ .where('node_interactions.last_seen_at', 'is', null)+ .where('parent_interactions.last_seen_at', '!=', null)+ .whereRef(+ 'node.created_at',+ '>=',+ sql`json_extract(parent_interactions.attributes, '$.firstSeenAt')`+ ).execute();for (const unreadMessageRow of unreadMessagesRows) {@@ -128,6 +148,29 @@ class RadarWorkspace {return;}+ const parentInteractions = await this.workspaceDatabase+ .selectFrom('interactions')+ .selectAll()+ .where('node_id', '=', event.node.parentId)+ .executeTakeFirst();++ if (!parentInteractions || !parentInteractions.last_seen_at) {+ return;+ }++ const parentInteractionAttributes: InteractionAttributes = JSON.parse(+ parentInteractions.attributes+ );++ if (+ compareDate(+ parentInteractionAttributes.firstSeenAt,+ event.node.createdAt+ ) > 0+ ) {+ return;+ }+this.unreadMessages.set(event.node.id, {messageId: event.node.id,parentId: event.node.parentId,diff --git a/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsx b/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsxindex b2bdae97..03227711 100644--- a/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsx+++ b/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsx@@ -1,4 +1,5 @@import { ChannelNode } from '@colanode/core';+import { InView } from 'react-intersection-observer';import { Avatar } from '@/renderer/components/avatars/avatar';import { ReadStateIndicator } from '@/renderer/components/layouts/read-state-indicator';@@ -20,8 +21,13 @@ export const ChannelSidebarItem = ({ node }: ChannelSidebarItemProps) => {const mentionsCount = channelState.mentionsCount;return (- <button- key={node.id}+ <InView+ rootMargin="20px"+ onChange={(inView) => {+ if (inView) {+ radar.markAsSeen(workspace.userId, node.id, node.transactionId);+ }+ }}className={cn('flex w-full items-center',isActive && 'bg-sidebar-accent'@@ -47,6 +53,6 @@ export const ChannelSidebarItem = ({ node }: ChannelSidebarItemProps) => {hasChanges={unreadCount > 0}/>)}- </button>+ </InView>);};diff --git a/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx b/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsxindex 67199209..9caf2abc 100644--- a/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx+++ b/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx@@ -1,4 +1,5 @@import { ChatNode } from '@colanode/core';+import { InView } from 'react-intersection-observer';import { Avatar } from '@/renderer/components/avatars/avatar';import { ReadStateIndicator } from '@/renderer/components/layouts/read-state-indicator';@@ -36,8 +37,13 @@ export const ChatSidebarItem = ({ node }: ChatSidebarItemProps) => {nodeReadState.unseenMessagesCount + nodeReadState.mentionsCount;return (- <div- key={node.id}+ <InView+ rootMargin="20px"+ onChange={(inView) => {+ if (inView) {+ radar.markAsSeen(workspace.userId, node.id, node.transactionId);+ }+ }}className={cn('flex w-full items-center',isActive && 'bg-sidebar-accent'@@ -60,6 +66,6 @@ export const ChatSidebarItem = ({ node }: ChatSidebarItemProps) => {{!isActive && (<ReadStateIndicator count={unreadCount} hasChanges={unreadCount > 0} />)}- </div>+ </InView>);};diff --git a/packages/core/src/lib/interactions.ts b/packages/core/src/lib/interactions.tsindex 75b3d955..ef13875d 100644--- a/packages/core/src/lib/interactions.ts+++ b/packages/core/src/lib/interactions.ts@@ -19,7 +19,7 @@ export const mergeInteractionAttributes = (if (!attributes.firstSeenAt ||- compareDate(attributes.firstSeenAt, date) < 0+ compareDate(attributes.firstSeenAt, date) > 0) {return { ...attributes, firstSeenAt: date };}@@ -30,7 +30,7 @@ export const mergeInteractionAttributes = (if (!attributes.lastSeenAt ||- compareDate(attributes.lastSeenAt, date) > 0+ compareDate(attributes.lastSeenAt, date) < 0) {return { ...attributes, lastSeenAt: date };}