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 message interactions tracking
Hakan Shehufaa0554112aa
diff --git a/apps/desktop/src/main/data/workspace/migrations.ts b/apps/desktop/src/main/data/workspace/migrations.tsindex 7c6bef6b..00ea6b67 100644--- a/apps/desktop/src/main/data/workspace/migrations.ts+++ b/apps/desktop/src/main/data/workspace/migrations.ts@@ -184,7 +184,8 @@ const createMessageInteractionsTable: Migration = {.addColumn('message_id', 'text', (col) => col.notNull()).addColumn('collaborator_id', 'text', (col) => col.notNull()).addColumn('root_id', 'text', (col) => col.notNull())- .addColumn('seen_at', 'text')+ .addColumn('first_seen_at', 'text')+ .addColumn('last_seen_at', 'text').addColumn('first_opened_at', 'text').addColumn('last_opened_at', 'text').addColumn('version', 'integer', (col) => col.notNull())diff --git a/apps/desktop/src/main/data/workspace/schema.ts b/apps/desktop/src/main/data/workspace/schema.tsindex 574ae6fa..4dd08f4b 100644--- a/apps/desktop/src/main/data/workspace/schema.ts+++ b/apps/desktop/src/main/data/workspace/schema.ts@@ -138,7 +138,8 @@ interface MessageInteractionTable {message_id: ColumnType<string, string, never>;collaborator_id: ColumnType<string, string, never>;root_id: ColumnType<string, string, string>;- seen_at: ColumnType<string | null, string | null, string | null>;+ first_seen_at: ColumnType<string | null, string | null, string | null>;+ last_seen_at: ColumnType<string | null, string | null, string | null>;first_opened_at: ColumnType<string | null, string | null, string | null>;last_opened_at: ColumnType<string | null, string | null, string | null>;version: ColumnType<bigint, bigint, bigint>;diff --git a/apps/desktop/src/main/mutations/messages/message-mark-seen.ts b/apps/desktop/src/main/mutations/messages/message-mark-seen.tsindex 1c05d119..c72d5414 100644--- a/apps/desktop/src/main/mutations/messages/message-mark-seen.ts+++ b/apps/desktop/src/main/mutations/messages/message-mark-seen.ts@@ -38,12 +38,23 @@ export class MessageMarkSeenMutationHandler.where('collaborator_id', '=', input.userId).executeTakeFirst();- if (existingInteraction && existingInteraction.seen_at !== null) {- return {- success: true,- };+ if (existingInteraction) {+ const lastSeenAt = existingInteraction.last_seen_at;+ if (+ lastSeenAt &&+ lastSeenAt > new Date(Date.now() - 5 * 1000).toISOString()+ ) {+ return {+ success: true,+ };+ }}+ const lastSeenAt = new Date().toISOString();+ const firstSeenAt = existingInteraction+ ? existingInteraction.first_seen_at+ : lastSeenAt;+const { createdInteraction, createdMutation } = await workspaceDatabase.transaction().execute(async (trx) => {@@ -53,17 +64,16 @@ export class MessageMarkSeenMutationHandler.values({message_id: input.messageId,collaborator_id: input.userId,- seen_at: new Date().toISOString(),+ first_seen_at: firstSeenAt,+ last_seen_at: lastSeenAt,version: 0n,root_id: message.root_id,}).onConflict((b) =>- b- .columns(['message_id', 'collaborator_id'])- .doUpdateSet({- seen_at: new Date().toISOString(),- })- .where('seen_at', 'is', null)+ b.columns(['message_id', 'collaborator_id']).doUpdateSet({+ first_seen_at: firstSeenAt,+ last_seen_at: lastSeenAt,+ })).executeTakeFirst();diff --git a/apps/desktop/src/main/services/message-service.ts b/apps/desktop/src/main/services/message-service.tsindex 23718a00..2d6cfc4c 100644--- a/apps/desktop/src/main/services/message-service.ts+++ b/apps/desktop/src/main/services/message-service.ts@@ -268,16 +268,18 @@ class MessageService {message_id: messageInteraction.messageId,collaborator_id: messageInteraction.collaboratorId,root_id: messageInteraction.rootId,- seen_at: messageInteraction.seenAt,- last_opened_at: messageInteraction.lastOpenedAt,+ first_seen_at: messageInteraction.firstSeenAt,+ last_seen_at: messageInteraction.lastSeenAt,first_opened_at: messageInteraction.firstOpenedAt,+ last_opened_at: messageInteraction.lastOpenedAt,version,}).onConflict((b) =>b.columns(['message_id', 'collaborator_id']).doUpdateSet({- seen_at: messageInteraction.seenAt,- last_opened_at: messageInteraction.lastOpenedAt,+ first_seen_at: messageInteraction.firstSeenAt,+ last_seen_at: messageInteraction.lastSeenAt,first_opened_at: messageInteraction.firstOpenedAt,+ last_opened_at: messageInteraction.lastOpenedAt,version,}))diff --git a/apps/desktop/src/main/services/radar-service.ts b/apps/desktop/src/main/services/radar-service.tsindex 34de964c..be01466a 100644--- a/apps/desktop/src/main/services/radar-service.ts+++ b/apps/desktop/src/main/services/radar-service.ts@@ -124,7 +124,7 @@ class RadarWorkspace {).select(['message.id as message_id', 'message.entry_id as entry_id']).where('message.created_by', '!=', this.workspace.userId)- .where('message_interactions.seen_at', 'is', null)+ .where('message_interactions.last_seen_at', 'is', null).where('entry_interactions.last_seen_at', 'is not', null).whereRef('message.created_at', '>=', 'entry_interactions.first_seen_at').execute();@@ -149,7 +149,7 @@ class RadarWorkspace {return;}- if (interaction.seenAt) {+ if (interaction.lastSeenAt) {const unreadMessage = this.unreadMessages.get(interaction.messageId);if (unreadMessage) {this.unreadMessages.delete(interaction.messageId);@@ -187,7 +187,7 @@ class RadarWorkspace {.where('collaborator_id', '=', this.workspace.userId).executeTakeFirst();- if (messageInteraction && messageInteraction.seen_at) {+ if (messageInteraction && messageInteraction.last_seen_at) {return;}diff --git a/apps/desktop/src/main/utils.ts b/apps/desktop/src/main/utils.tsindex ed7a60f1..7546fd68 100644--- a/apps/desktop/src/main/utils.ts+++ b/apps/desktop/src/main/utils.ts@@ -345,7 +345,9 @@ export const mapMessageInteraction = (messageId: row.message_id,collaboratorId: row.collaborator_id,rootId: row.root_id,- seenAt: row.seen_at,+ firstSeenAt: row.first_seen_at,+ lastSeenAt: row.last_seen_at,+ firstOpenedAt: row.first_opened_at,lastOpenedAt: row.last_opened_at,version: row.version,};diff --git a/apps/desktop/src/shared/types/messages.ts b/apps/desktop/src/shared/types/messages.tsindex 49f4be75..fcdba855 100644--- a/apps/desktop/src/shared/types/messages.ts+++ b/apps/desktop/src/shared/types/messages.ts@@ -31,7 +31,9 @@ export type MessageInteraction = {messageId: string;collaboratorId: string;rootId: string;- seenAt: string | null;+ firstSeenAt: string | null;+ lastSeenAt: string | null;+ firstOpenedAt: string | null;lastOpenedAt: string | null;version: bigint;};diff --git a/apps/server/src/data/migrations.ts b/apps/server/src/data/migrations.tsindex 0f340739..93b5c461 100644--- a/apps/server/src/data/migrations.ts+++ b/apps/server/src/data/migrations.ts@@ -506,7 +506,8 @@ const createMessageInteractionsTable: Migration = {.addColumn('collaborator_id', 'varchar(30)', (col) => col.notNull()).addColumn('root_id', 'varchar(30)', (col) => col.notNull()).addColumn('workspace_id', 'varchar(30)', (col) => col.notNull())- .addColumn('seen_at', 'timestamptz')+ .addColumn('first_seen_at', 'timestamptz')+ .addColumn('last_seen_at', 'timestamptz').addColumn('first_opened_at', 'timestamptz').addColumn('last_opened_at', 'timestamptz').addColumn('version', 'bigint', (col) =>diff --git a/apps/server/src/data/schema.ts b/apps/server/src/data/schema.tsindex 5f4d5cf9..4d360fd1 100644--- a/apps/server/src/data/schema.ts+++ b/apps/server/src/data/schema.ts@@ -213,7 +213,8 @@ interface MessageInteractionTable {collaborator_id: ColumnType<string, string, never>;root_id: ColumnType<string, string, never>;workspace_id: ColumnType<string, string, never>;- seen_at: ColumnType<Date | null, Date | null, Date | null>;+ first_seen_at: ColumnType<Date | null, Date | null, Date | null>;+ last_seen_at: ColumnType<Date | null, Date | null, Date | null>;first_opened_at: ColumnType<Date | null, Date | null, Date | null>;last_opened_at: ColumnType<Date | null, Date | null, Date | null>;version: ColumnType<bigint, never, never>;diff --git a/apps/server/src/services/message-service.ts b/apps/server/src/services/message-service.tsindex 4ee48f51..53a6345b 100644--- a/apps/server/src/services/message-service.ts+++ b/apps/server/src/services/message-service.ts@@ -345,25 +345,29 @@ class MessageService {if (existingInteraction &&- existingInteraction.seen_at !== null &&- existingInteraction.seen_at <= new Date(mutation.data.seenAt)+ existingInteraction.last_seen_at !== null &&+ existingInteraction.last_seen_at >= new Date(mutation.data.seenAt)) {return true;}+ const lastSeenAt = new Date(mutation.data.seenAt);+ const firstSeenAt = existingInteraction?.first_seen_at ?? lastSeenAt;const createdInteraction = await database.insertInto('message_interactions').returningAll().values({message_id: mutation.data.messageId,collaborator_id: user.id,- seen_at: new Date(mutation.data.seenAt),+ first_seen_at: firstSeenAt,+ last_seen_at: lastSeenAt,root_id: root.id,workspace_id: root.workspace_id,}).onConflict((b) =>b.columns(['message_id', 'collaborator_id']).doUpdateSet({- seen_at: new Date(mutation.data.seenAt),+ last_seen_at: lastSeenAt,+ first_seen_at: firstSeenAt,})).executeTakeFirst();diff --git a/apps/server/src/synchronizers/message-interactions.ts b/apps/server/src/synchronizers/message-interactions.tsindex 99881863..ef843458 100644--- a/apps/server/src/synchronizers/message-interactions.ts+++ b/apps/server/src/synchronizers/message-interactions.ts@@ -60,7 +60,8 @@ export class MessageInteractionSynchronizer extends BaseSynchronizer<SyncMessage(messageInteraction) => ({messageId: messageInteraction.message_id,collaboratorId: messageInteraction.collaborator_id,- seenAt: messageInteraction.seen_at?.toISOString() ?? null,+ firstSeenAt: messageInteraction.first_seen_at?.toISOString() ?? null,+ lastSeenAt: messageInteraction.last_seen_at?.toISOString() ?? null,firstOpenedAt:messageInteraction.first_opened_at?.toISOString() ?? null,lastOpenedAt: messageInteraction.last_opened_at?.toISOString() ?? null,diff --git a/packages/core/src/synchronizers/message-interactions.ts b/packages/core/src/synchronizers/message-interactions.tsindex 56ac9c40..c843992f 100644--- a/packages/core/src/synchronizers/message-interactions.ts+++ b/packages/core/src/synchronizers/message-interactions.ts@@ -6,7 +6,8 @@ export type SyncMessageInteractionsInput = {export type SyncMessageInteractionData = {messageId: string;collaboratorId: string;- seenAt: string | null;+ firstSeenAt: string | null;+ lastSeenAt: string | null;firstOpenedAt: string | null;lastOpenedAt: string | null;rootId: string;