Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Implement message subtypes

Hakan Shehud41d3abd03d5
diff --git a/apps/desktop/src/main/mutations/message-create.ts b/apps/desktop/src/main/mutations/message-create.ts
index b21f1db8..a392117b 100644
--- a/apps/desktop/src/main/mutations/message-create.ts
+++ b/apps/desktop/src/main/mutations/message-create.ts
@@ -10,7 +10,7 @@ import {
MessageCreateMutationInput,
MessageCreateMutationOutput,
} from '@/shared/mutations/message-create';
-import { mapBlocksToContents, mapContentsToBlocks } from '@/shared/lib/editor';
+import { mapContentsToBlocks } from '@/shared/lib/editor';
import { fileService } from '@/main/services/file-service';
import { Block, FileAttributes, MessageAttributes } from '@colanode/core';
import { CreateNodeInput, nodeService } from '@/main/services/node-service';
@@ -24,31 +24,6 @@ export class MessageCreateMutationHandler
const inputs: CreateNodeInput[] = [];
const messageContent = input.content.content ?? [];
- if (input.referenceId) {
- const referenceNode = await nodeService.fetchNode(
- input.referenceId,
- input.userId
- );
-
- if (!referenceNode || referenceNode.type !== 'message') {
- throw new Error('Reference node not found');
- }
-
- const referenceContent = mapBlocksToContents(
- referenceNode.id,
- Object.values(referenceNode.attributes.content)
- );
-
- messageContent.unshift({
- type: 'messageReference',
- attrs: {
- id: input.referenceId,
- conversationId: input.conversationId,
- },
- content: referenceContent,
- });
- }
-
const messageId = generateId(IdType.Message);
const createdAt = new Date().toISOString();
const blocks = mapContentsToBlocks(messageId, messageContent, new Map());
@@ -112,20 +87,46 @@ export class MessageCreateMutationHandler
}
}
- const messageAttributes: MessageAttributes = {
- type: 'message',
- parentId: input.conversationId,
- content: blocks.reduce(
- (acc, block) => {
- acc[block.id] = block;
- return acc;
- },
- {} as Record<string, Block>
- ),
- reactions: {},
- };
+ const blocksRecord = blocks.reduce(
+ (acc, block) => {
+ acc[block.id] = block;
+ return acc;
+ },
+ {} as Record<string, Block>
+ );
+
+ if (input.referenceId) {
+ const reference = await nodeService.fetchNode(
+ input.referenceId,
+ input.userId
+ );
+
+ if (!reference || reference.type !== 'message') {
+ throw new Error('Reference node not found');
+ }
+
+ const messageAttributes: MessageAttributes = {
+ type: 'message',
+ subtype: 'reply',
+ parentId: input.conversationId,
+ referenceId: input.referenceId,
+ content: blocksRecord,
+ reactions: {},
+ };
+
+ inputs.unshift({ id: messageId, attributes: messageAttributes });
+ } else {
+ const messageAttributes: MessageAttributes = {
+ type: 'message',
+ subtype: 'standard',
+ parentId: input.conversationId,
+ content: blocksRecord,
+ reactions: {},
+ };
+
+ inputs.unshift({ id: messageId, attributes: messageAttributes });
+ }
- inputs.unshift({ id: messageId, attributes: messageAttributes });
await nodeService.createNode(input.userId, inputs);
return {
diff --git a/apps/desktop/src/renderer/components/messages/message-avatar.tsx b/apps/desktop/src/renderer/components/messages/message-author-avatar.tsx
similarity index 78%
rename from apps/desktop/src/renderer/components/messages/message-avatar.tsx
rename to apps/desktop/src/renderer/components/messages/message-author-avatar.tsx
index 83ef934f..5dff9bc6 100644
--- a/apps/desktop/src/renderer/components/messages/message-avatar.tsx
+++ b/apps/desktop/src/renderer/components/messages/message-author-avatar.tsx
@@ -3,11 +3,15 @@ import { useQuery } from '@/renderer/hooks/use-query';
import { MessageNode, UserNode } from '@colanode/core';
import { Avatar } from '@/renderer/components/avatars/avatar';
-interface MessageAvatarProps {
+interface MessageAuthorAvatarProps {
message: MessageNode;
+ className?: string;
}
-export const MessageAvatar = ({ message }: MessageAvatarProps) => {
+export const MessageAuthorAvatar = ({
+ message,
+ className,
+}: MessageAuthorAvatarProps) => {
const workspace = useWorkspace();
const { data } = useQuery({
type: 'node_get',
@@ -27,6 +31,7 @@ export const MessageAvatar = ({ message }: MessageAvatarProps) => {
name={author.attributes.name}
avatar={author.attributes.avatar}
size="medium"
+ className={className}
/>
);
};
diff --git a/apps/desktop/src/renderer/components/messages/message-author-name.tsx b/apps/desktop/src/renderer/components/messages/message-author-name.tsx
new file mode 100644
index 00000000..1e16f52c
--- /dev/null
+++ b/apps/desktop/src/renderer/components/messages/message-author-name.tsx
@@ -0,0 +1,34 @@
+import { MessageNode, UserNode } from '@colanode/core';
+
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import { useQuery } from '@/renderer/hooks/use-query';
+import { cn } from '@/shared/lib/utils';
+
+interface MessageAuthorNameProps {
+ message: MessageNode;
+ className?: string;
+}
+
+export const MessageAuthorName = ({
+ message,
+ className,
+}: MessageAuthorNameProps) => {
+ const workspace = useWorkspace();
+ const { data } = useQuery({
+ type: 'node_get',
+ nodeId: message.createdBy,
+ userId: workspace.userId,
+ });
+
+ if (!data || data.type !== 'user') {
+ return null;
+ }
+
+ const author = data as UserNode;
+
+ return (
+ <span className={cn('font-medium', className)}>
+ {author.attributes.name}
+ </span>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/messages/message-header.tsx b/apps/desktop/src/renderer/components/messages/message-header.tsx
deleted file mode 100644
index 0febbcd5..00000000
--- a/apps/desktop/src/renderer/components/messages/message-header.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { MessageNode, UserNode } from '@colanode/core';
-import {
- Tooltip,
- TooltipContent,
- TooltipTrigger,
-} from '@/renderer/components/ui/tooltip';
-import { formatDate, timeAgo } from '@/shared/lib/utils';
-import { useWorkspace } from '@/renderer/contexts/workspace';
-import { useQuery } from '@/renderer/hooks/use-query';
-
-interface MessageHeaderProps {
- message: MessageNode;
-}
-
-export const MessageHeader = ({ message }: MessageHeaderProps) => {
- const workspace = useWorkspace();
- const { data } = useQuery({
- type: 'node_get',
- nodeId: message.createdBy,
- userId: workspace.userId,
- });
-
- if (!data || data.type !== 'user') {
- return null;
- }
-
- const author = data as UserNode;
-
- return (
- <div className="font-medium">
- <span>{author.attributes.name}</span>
- <Tooltip>
- <TooltipTrigger asChild>
- <span className="ml-2 text-xs text-muted-foreground">
- {timeAgo(message.createdAt)}
- </span>
- </TooltipTrigger>
- <TooltipContent>
- <span className="text-sm shadow-md">
- {formatDate(message.createdAt)}
- </span>
- </TooltipContent>
- </Tooltip>
- </div>
- );
-};
diff --git a/apps/desktop/src/renderer/components/messages/message-reference.tsx b/apps/desktop/src/renderer/components/messages/message-reference.tsx
index 52979539..b0db9da6 100644
--- a/apps/desktop/src/renderer/components/messages/message-reference.tsx
+++ b/apps/desktop/src/renderer/components/messages/message-reference.tsx
@@ -1,7 +1,35 @@
-export const MessageReference = () => {
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import { useQuery } from '@/renderer/hooks/use-query';
+import { MessageNode } from '@colanode/core';
+import { MessageAuthorAvatar } from '@/renderer/components/messages/message-author-avatar';
+import { MessageContent } from '@/renderer/components/messages/message-content';
+import { MessageAuthorName } from '@/renderer/components/messages/message-author-name';
+
+interface MessageReferenceProps {
+ messageId: string;
+}
+
+export const MessageReference = ({ messageId }: MessageReferenceProps) => {
+ const workspace = useWorkspace();
+ const { data } = useQuery({
+ type: 'node_get',
+ nodeId: messageId,
+ userId: workspace.userId,
+ });
+
+ if (!data || data.type !== 'message') {
+ return null;
+ }
+
+ const message = data as MessageNode;
+
return (
- <div className="items-top flex flex-row gap-2 border-l-4 p-2">
- <p>Message reference.</p>
+ <div className="flex flex-row gap-2 border-l-4 p-2">
+ <MessageAuthorAvatar message={message} className="size-5 mt-1" />
+ <div className='"flex-grow flex-col gap-1'>
+ <MessageAuthorName message={message} />
+ <MessageContent message={message} />
+ </div>
</div>
);
};
diff --git a/apps/desktop/src/renderer/components/messages/message-time.tsx b/apps/desktop/src/renderer/components/messages/message-time.tsx
new file mode 100644
index 00000000..0bd4b455
--- /dev/null
+++ b/apps/desktop/src/renderer/components/messages/message-time.tsx
@@ -0,0 +1,28 @@
+import { MessageNode } from '@colanode/core';
+import {
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger,
+} from '@/renderer/components/ui/tooltip';
+import { formatDate, timeAgo } from '@/shared/lib/utils';
+
+interface MessageTimeProps {
+ message: MessageNode;
+}
+
+export const MessageTime = ({ message }: MessageTimeProps) => {
+ return (
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <span className="ml-2 text-xs text-muted-foreground">
+ {timeAgo(message.createdAt)}
+ </span>
+ </TooltipTrigger>
+ <TooltipContent>
+ <span className="text-sm shadow-md">
+ {formatDate(message.createdAt)}
+ </span>
+ </TooltipContent>
+ </Tooltip>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/messages/message.tsx b/apps/desktop/src/renderer/components/messages/message.tsx
index 66aa013e..313e97e0 100644
--- a/apps/desktop/src/renderer/components/messages/message.tsx
+++ b/apps/desktop/src/renderer/components/messages/message.tsx
@@ -4,9 +4,11 @@ import { MessageReactions } from '@/renderer/components/messages/message-reactio
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useRadar } from '@/renderer/contexts/radar';
import { MessageActions } from '@/renderer/components/messages/message-actions';
-import { MessageAvatar } from '@/renderer/components/messages/message-avatar';
-import { MessageHeader } from '@/renderer/components/messages/message-header';
+import { MessageAuthorAvatar } from '@/renderer/components/messages/message-author-avatar';
+import { MessageAuthorName } from '@/renderer/components/messages/message-author-name';
import { MessageContent } from '@/renderer/components/messages/message-content';
+import { MessageReference } from '@/renderer/components/messages/message-reference';
+import { MessageTime } from '@/renderer/components/messages/message-time';
interface MessageProps {
message: MessageNode;
@@ -45,11 +47,16 @@ export const Message = ({ message, previousMessage }: MessageProps) => {
}`}
>
<div className="mr-2 w-10 pt-1">
- {displayAuthor && <MessageAvatar message={message} />}
+ {displayAuthor && <MessageAuthorAvatar message={message} />}
</div>
<div className="relative w-full">
- {displayAuthor && <MessageHeader message={message} />}
+ {displayAuthor && (
+ <div className="flex flex-row items-center gap-0.5">
+ <MessageAuthorName message={message} />
+ <MessageTime message={message} />
+ </div>
+ )}
<InView
rootMargin="50px"
onChange={(inView) => {
@@ -59,6 +66,9 @@ export const Message = ({ message, previousMessage }: MessageProps) => {
}}
>
<MessageActions message={message} />
+ {message.attributes.subtype === 'reply' && (
+ <MessageReference messageId={message.attributes.referenceId} />
+ )}
<MessageContent message={message} />
<MessageReactions message={message} />
</InView>
diff --git a/apps/desktop/src/renderer/editor/extensions/message-reference.tsx b/apps/desktop/src/renderer/editor/extensions/message-reference.tsx
deleted file mode 100644
index 66c42c87..00000000
--- a/apps/desktop/src/renderer/editor/extensions/message-reference.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { mergeAttributes, Node } from '@tiptap/core';
-import { ReactNodeViewRenderer } from '@tiptap/react';
-import { MessageReferenceNodeView } from '@/renderer/editor/views/message-reference';
-
-export const MessageReferenceNode = Node.create({
- name: 'messageReference',
- topNode: true,
- content: 'block+',
- addAttributes() {
- return {
- id: {
- default: null,
- },
- messageId: {
- default: null,
- },
- name: {
- default: null,
- },
- };
- },
- renderHTML({ HTMLAttributes }) {
- return ['messageReference', mergeAttributes(HTMLAttributes)];
- },
- addNodeView() {
- return ReactNodeViewRenderer(MessageReferenceNodeView, {
- as: 'messageReference',
- });
- },
-});
diff --git a/apps/desktop/src/renderer/editor/renderers/message-reference.tsx b/apps/desktop/src/renderer/editor/renderers/message-reference.tsx
deleted file mode 100644
index 643ec3b0..00000000
--- a/apps/desktop/src/renderer/editor/renderers/message-reference.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';
-import { JSONContent } from '@tiptap/core';
-
-interface MessageReferenceRendererProps {
- node: JSONContent;
- keyPrefix: string | null;
-}
-
-export const MessageReferenceRenderer = ({
- node,
- keyPrefix,
-}: MessageReferenceRendererProps) => {
- return (
- <div className="items-top flex flex-col gap-2 border-l-4 p-2 text-sm text-foreground">
- <NodeChildrenRenderer node={node} keyPrefix={keyPrefix} />
- </div>
- );
-};
diff --git a/apps/desktop/src/renderer/editor/renderers/node.tsx b/apps/desktop/src/renderer/editor/renderers/node.tsx
index 5e99c6e5..5d74bcae 100644
--- a/apps/desktop/src/renderer/editor/renderers/node.tsx
+++ b/apps/desktop/src/renderer/editor/renderers/node.tsx
@@ -13,7 +13,6 @@ import { ParagraphRenderer } from '@/renderer/editor/renderers/paragraph';
import { TaskItemRenderer } from '@/renderer/editor/renderers/task-item';
import { TaskListRenderer } from '@/renderer/editor/renderers/task-list';
import { TextRenderer } from '@/renderer/editor/renderers/text';
-import { MessageReferenceRenderer } from '@/renderer/editor/renderers/message-reference';
import { MarkRenderer } from '@/renderer/editor/renderers/mark';
import { FileRenderer } from '@/renderer/editor/renderers/file';
import { match } from 'ts-pattern';
@@ -71,9 +70,6 @@ export const NodeRenderer = ({
.with('codeBlock', () => (
<CodeBlockRenderer node={node} keyPrefix={keyPrefix} />
))
- .with('messageReference', () => (
- <MessageReferenceRenderer node={node} keyPrefix={keyPrefix} />
- ))
.with('file', () => <FileRenderer node={node} keyPrefix={keyPrefix} />)
.otherwise(() => null)}
</MarkRenderer>
diff --git a/apps/desktop/src/renderer/editor/views/message-reference.tsx b/apps/desktop/src/renderer/editor/views/message-reference.tsx
deleted file mode 100644
index d60357e3..00000000
--- a/apps/desktop/src/renderer/editor/views/message-reference.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { type NodeViewProps } from '@tiptap/core';
-import { NodeViewContent, NodeViewWrapper } from '@tiptap/react';
-
-export const MessageReferenceNodeView = ({ node }: NodeViewProps) => {
- const name = node.attrs.name ?? 'Unnamed';
-
- if (!name) {
- return null;
- }
-
- return (
- <NodeViewWrapper
- data-id={node.attrs.id}
- className="items-top flex flex-col gap-2 border-l-4 p-2 text-sm text-foreground"
- >
- <p className="font-medium">{name}</p>
- <NodeViewContent />
- </NodeViewWrapper>
- );
-};
diff --git a/packages/core/src/registry/message.ts b/packages/core/src/registry/message.ts
index 03c353bc..22dccad6 100644
--- a/packages/core/src/registry/message.ts
+++ b/packages/core/src/registry/message.ts
@@ -3,13 +3,28 @@ import { NodeModel } from './core';
import { blockSchema } from './block';
import { isEqual } from 'lodash-es';
-export const messageAttributesSchema = z.object({
+const standardMessageAttributesSchema = z.object({
type: z.literal('message'),
+ subtype: z.literal('standard'),
parentId: z.string(),
content: z.record(z.string(), blockSchema),
reactions: z.record(z.string(), z.array(z.string())),
});
+const replyMessageAttributesSchema = z.object({
+ type: z.literal('message'),
+ subtype: z.literal('reply'),
+ parentId: z.string(),
+ content: z.record(z.string(), blockSchema),
+ reactions: z.record(z.string(), z.array(z.string())),
+ referenceId: z.string(),
+});
+
+export const messageAttributesSchema = z.discriminatedUnion('subtype', [
+ standardMessageAttributesSchema,
+ replyMessageAttributesSchema,
+]);
+
export type MessageAttributes = z.infer<typeof messageAttributesSchema>;
export const messageModel: NodeModel = {
diff --git a/packages/crdt/src/index.ts b/packages/crdt/src/index.ts
index c7642eef..518a8473 100644
--- a/packages/crdt/src/index.ts
+++ b/packages/crdt/src/index.ts
@@ -34,7 +34,7 @@ export class YDoc {
public updateAttributes(attributes: NodeAttributes) {
const model = registry.getModel(attributes.type);
- const schema = model.schema;
+ const schema = this.extractType(model.schema, attributes);
if (!(schema instanceof z.ZodObject)) {
throw new Error('Schema must be a ZodObject');
}
@@ -345,7 +345,10 @@ export class YDoc {
return this.extractType(schema.unwrap(), value);
}
- if (schema instanceof z.ZodUnion) {
+ if (
+ schema instanceof z.ZodUnion ||
+ schema instanceof z.ZodDiscriminatedUnion
+ ) {
for (const option of schema.options) {
if (option.safeParse(value).success) {
return this.extractType(option, value);