@dxos/plugin-thread 0.8.4-main.1068cf700f → 0.8.4-main.1c7ec43d41

package/src/translations.ts

@@ -4,97 +4,93 @@
 
 import { Type } from '@dxos/echo';
 import { type Resource } from '@dxos/react-ui';
+import { Channel } from '@dxos/types';
 
-import { meta } from './meta';
-import { Channel } from './types';
+import { meta } from '#meta';
 
 export const translations = [
   {
     'en-US': {
       [Type.getTypename(Channel.Channel)]: {
-        'typename label': 'Channel',
-        'typename label_zero': 'Channels',
-        'typename label_one': 'Channel',
-        'typename label_other': 'Channels',
-        'object name placeholder': 'New channel',
-        'rename object label': 'Rename channel',
-        'delete object label': 'Delete channel',
-        'object deleted label': 'Channel deleted',
+        'typename.label': 'Channel',
+        'typename.label_zero': 'Channels',
+        'typename.label_one': 'Channel',
+        'typename.label_other': 'Channels',
+        'object-name.placeholder': 'New channel',
+        'add-object.label': 'Add channel',
+        'rename-object.label': 'Rename channel',
+        'delete-object.label': 'Delete channel',
+        'object-deleted.label': 'Channel deleted',
       },
       [meta.id]: {
-        'plugin name': 'Chat',
-        'channel title label': 'Title',
-        'message placeholder': 'Reply…',
-        'activity message': 'Processing…',
-        'anonymous label': 'Anonymous',
-        'delete message block label': 'Delete message block',
-        'detached thread label': 'Referenced content was removed',
-        'delete thread label': 'Delete thread',
-        'resolve thread label': 'Resolve thread',
-        'thread deleted label': 'Thread deleted',
-        'message deleted label': 'Message deleted',
-        'comments heading': 'Comments',
-        'chat heading': 'Chat',
-        'draft button': 'DRAFT',
-        'no comments title': 'Comments',
-        'no comments message':
+        'plugin.name': 'Chat',
+        'channel-title.label': 'Title',
+        'message.placeholder': 'Reply…',
+        'activity.message': 'Processing…',
+        'anonymous.label': 'Anonymous',
+        'delete-message-block.label': 'Delete message block',
+        'detached-thread.label': 'Referenced content was removed',
+        'delete-thread.label': 'Delete thread',
+        'resolve-thread.label': 'Resolve thread',
+        'thread-deleted.label': 'Thread deleted',
+        'message-deleted.label': 'Message deleted',
+        'comments.heading': 'Comments',
+        'chat.heading': 'Chat',
+        'draft.button': 'DRAFT',
+        'no-comments.title': 'Comments',
+        'no-comments.message':
           'Click on the <commentIcon></commentIcon> button in the document toolbar to create a comment thread on the selected text.',
-        'toggle show resolved': 'Show resolved',
-        'unnamed object threads label': 'Threads',
-        'mark as resolved label': 'Mark as resolved',
-        'mark as unresolved label': 'Mark as unresolved',
-        'save message label': 'Save',
-        'edit message label': 'Edit',
-        'delete message label': 'Delete message',
-        'accept proposal label': 'Accept proposal',
-        'open comments panel label': 'Show Comments',
-        'comments label': 'Comments',
-        'show all label': 'All comments',
-        'show unresolved label': 'Unresolved comments',
-        'add comment label': 'Add comment',
+        'toggle-show-resolved.label': 'Show resolved',
+        'unnamed-object-threads.label': 'Threads',
+        'mark-as-resolved.label': 'Mark as resolved',
+        'mark-as-unresolved.label': 'Mark as unresolved',
+        'save-message.label': 'Save',
+        'edit-message.label': 'Edit',
+        'delete-message.label': 'Delete message',
+        'accept-proposal.label': 'Accept proposal',
+        'open-comments-panel.label': 'Show Comments',
+        'comments.label': 'Comments',
+        'show-all.label': 'All comments',
+        'show-unresolved.label': 'Unresolved comments',
+        'add-comment.label': 'Add comment',
 
-        'channel companion label': 'Channel',
-        'call panel label': 'Active Call',
+        'channel-companion.label': 'Channel',
+        'call-panel.label': 'Active Call',
 
-        'display name label': 'Display name',
-        'display name description': 'Set your display name before joining a meeting.',
-        'display name input placeholder': 'Enter your name',
-        'set display name label': 'Continue',
+        'display-name.label': 'Display name',
+        'display-name.description': 'Set your display name before joining a meeting.',
+        'display-name-input.placeholder': 'Enter your name',
+        'set-display-name.label': 'Continue',
 
-        'call tab label': 'Call',
-        'meeting status title': 'Calls',
-        'share meeting link label': 'Share meeting',
-        'show webrtc stats title': 'WebRTC Stats',
-        'show calls history title': 'Service History',
+        'call-tab.label': 'Call',
+        'meeting-status.title': 'Calls',
+        'share-meeting-link.label': 'Share meeting',
+        'show-webrtc-stats.title': 'WebRTC Stats',
+        'show-calls-history.title': 'Service History',
 
-        'meeting summary label': 'Summary',
-        'summarize label': 'Summarize',
-        'summarizing label': 'Creating summary...',
-        'create summary message': 'A summary doesn’t exist for this meeting yet. Create one now?',
+        'meeting-summary.label': 'Summary',
+        'summarize.label': 'Summarize',
+        'summarizing.label': 'Creating summary...',
+        'create-summary.message': 'A summary doesn’t exist for this meeting yet. Create one now?',
 
-        'join call': 'Join',
-        'leave call': 'Leave',
+        'icon-pin.label': 'Pin video',
+        'icon-unpin.label': 'Unpin video',
+        'icon-wave.label': 'Waving',
+        'icon-muted.label': 'Muted',
+        'join-call.button': 'Join',
+        'leave-call.button': 'Leave',
+        'mic-on.button': 'Unmute',
+        'mic-off.button': 'Mute',
+        'camera-on.button': 'Turn camera on',
+        'camera-off.button': 'Turn camera off',
+        'camera-off.label': 'Camera off',
+        'raise-hand.button': 'Raise hand',
+        'lower-hand.button': 'Lower hand',
+        'screenshare-on.button': 'Share screen',
+        'screenshare-off.button': 'Stop streaming',
 
-        'lobby participants_zero': 'No participants',
-        'lobby participants_one': '1 participant',
-        'lobby participants_other': '{{count}} participants',
-
-        'icon pin': 'Pin video',
-        'icon unpin': 'Unpin video',
-        'icon wave': 'Waving',
-        'icon muted': 'Muted',
-        'icon speaking': 'Speaking',
-
-        'mic on': 'Unmute',
-        'mic off': 'Mute',
-        'camera on': 'Turn camera on',
-        'camera off': 'Turn camera off',
-        'camera off label': 'Camera off',
-
-        'raise hand': 'Raise hand',
-        'lower hand': 'Lower hand',
-        'screenshare on': 'Share screen',
-        'screenshare off': 'Stop streaming',
+        'channel-toolbar.title': 'Channel actions',
+        'start-video-call.menu': 'Start video call',
       },
     },
   },

package/src/types/Settings.ts

@@ -0,0 +1,10 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+// @import-as-namespace
+
+import * as Schema from 'effect/Schema';
+
+export const Settings = Schema.mutable(Schema.Struct({}));
+export interface Settings extends Schema.Schema.Type<typeof Settings> {}

package/src/types/capabilities.ts

@@ -5,14 +5,22 @@
 import { type Atom } from '@effect-atom/atom-react';
 
 import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { type Channel } from '@dxos/types';
+
+import { meta } from '#meta';
 
 import { type CallManager, type CallState, type MediaState } from '../calls';
-import { meta } from '../meta';
-import { type Channel, type ThreadSettingsProps, type ThreadState, type ViewStore } from '../types';
+import { type ThreadState, type ViewStore } from '../types';
+import * as Settings from './Settings';
 
 export namespace ThreadCapabilities {
-  export const Settings = Capability.make<Atom.Writable<ThreadSettingsProps>>(`${meta.id}/capability/settings`);
-  export const CallManager = Capability.make<CallManager>(`${meta.id}/capability/call-manager`);
+  export const Settings = Capability.make<Atom.Writable<Settings.Settings>>(`${meta.id}.capability.settings`);
+  export const CallManager = Capability.make<CallManager>(`${meta.id}.capability.call-manager`);
+
+  /** Comment configuration contributed per typename by plugins that support commenting. */
+  export type CommentConfig = AppCapabilities.CommentConfig;
+  export const CommentConfig: Capability.InterfaceDef<AppCapabilities.CommentConfig> = AppCapabilities.CommentConfig;
 
   // TODO(burdon): Better way to define specific extensions for meeting companions.
   // TODO(burdon): This brings in deps from ../calls; how should we manage/minimize explicit type exposure to other plugins?
@@ -24,11 +32,11 @@ export namespace ThreadCapabilities {
     onMediaStateUpdated: ([mediaState, isSpeaking]: [MediaState, boolean]) => Promise<void>;
   };
 
-  export const CallExtension = Capability.make<CallProperties>(`${meta.id}/capability/call-extension`);
+  export const CallExtension = Capability.make<CallProperties>(`${meta.id}.capability.call-extension`);
 
   /** Thread state (drafts, toolbar state, current selection). */
-  export const State = Capability.make<Atom.Writable<ThreadState>>(`${meta.id}/capability/state`);
+  export const State = Capability.make<Atom.Writable<ThreadState>>(`${meta.id}.capability.state`);
 
   /** Per-subject view state (e.g., showResolvedThreads). */
-  export const ViewState = Capability.make<Atom.Writable<ViewStore>>(`${meta.id}/capability/view-state`);
+  export const ViewState = Capability.make<Atom.Writable<ViewStore>>(`${meta.id}.capability.view-state`);
 }

package/src/types/index.ts

@@ -3,5 +3,4 @@
 //
 
 export * from './capabilities';
-export * as Channel from './Channel';
 export * from './types';

package/src/types/types.ts

@@ -2,191 +2,9 @@
 // Copyright 2023 DXOS.org
 //
 
-import * as Schema from 'effect/Schema';
+import { AnchoredTo, Thread } from '@dxos/types';
 
-import { Capability } from '@dxos/app-framework';
-import { Key, Type } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
-import { SpaceSchema } from '@dxos/react-client/echo';
-import { Collection } from '@dxos/schema';
-import { Actor, AnchoredTo, Message, Thread } from '@dxos/types';
-
-import { meta } from '../meta';
-
-import * as Channel from './Channel';
-
-const THREAD_OPERATION = `${meta.id}/operation`;
-
-/**
- * Operations for the Thread plugin.
- * Note: Complex ECHO types are typed as Schema.Any to avoid serialization issues.
- */
-export namespace ThreadOperation {
-  export const OnCreateSpace = Operation.make({
-    meta: { key: `${THREAD_OPERATION}/on-create-space`, name: 'On Create Space' },
-    services: [Capability.Service],
-    schema: {
-      input: Schema.Struct({
-        space: SpaceSchema,
-        rootCollection: Collection.Collection,
-        isDefault: Schema.Boolean.pipe(Schema.optional),
-      }),
-      output: Schema.Void,
-    },
-  });
-
-  export const CreateChannel = Operation.make({
-    meta: { key: `${THREAD_OPERATION}/create-channel`, name: 'Create Channel' },
-    services: [Capability.Service],
-    schema: {
-      input: Schema.Struct({
-        spaceId: Key.SpaceId,
-        name: Schema.optional(Schema.String),
-      }),
-      output: Schema.Struct({
-        object: Channel.Channel,
-      }),
-    },
-  });
-
-  export const CreateChannelThread = Operation.make({
-    meta: { key: `${THREAD_OPERATION}/create-channel-thread`, name: 'Create Channel Thread' },
-    services: [Capability.Service],
-    schema: {
-      input: Schema.Struct({
-        channel: Channel.Channel,
-      }),
-      output: Schema.Struct({
-        object: Thread.Thread,
-      }),
-    },
-  });
-
-  export const Create = Operation.make({
-    meta: { key: `${THREAD_OPERATION}/create`, name: 'Create Thread' },
-    services: [Capability.Service],
-    schema: {
-      input: Schema.Struct({
-        name: Schema.optional(Schema.String),
-        anchor: Schema.optional(Schema.String),
-        subject: Type.Obj,
-      }),
-      output: Schema.Void,
-    },
-  });
-
-  export const DeleteOutput = Schema.Struct({
-    thread: Thread.Thread.annotations({ description: 'The deleted thread.' }),
-    anchor: AnchoredTo.AnchoredTo.annotations({ description: 'The deleted anchor.' }),
-  }).pipe(Schema.partial);
-
-  export type DeleteOutput = Schema.Schema.Type<typeof DeleteOutput>;
-
-  export const Delete = Operation.make({
-    meta: { key: `${THREAD_OPERATION}/delete`, name: 'Delete Thread' },
-    services: [Capability.Service],
-    schema: {
-      input: Schema.Struct({
-        anchor: AnchoredTo.AnchoredTo,
-        subject: Type.Obj,
-        thread: Schema.optional(Thread.Thread),
-      }),
-      output: DeleteOutput,
-    },
-  });
-
-  export const Select = Operation.make({
-    meta: { key: `${THREAD_OPERATION}/select`, name: 'Select Thread' },
-    services: [Capability.Service],
-    schema: {
-      input: Schema.Struct({
-        current: Schema.String,
-      }),
-      output: Schema.Void,
-    },
-  });
-
-  export const ToggleResolved = Operation.make({
-    meta: { key: `${THREAD_OPERATION}/toggle-resolved`, name: 'Toggle Resolved' },
-    services: [Capability.Service],
-    schema: {
-      input: Schema.Struct({
-        thread: Thread.Thread,
-      }),
-      output: Schema.Void,
-    },
-  });
-
-  export const AddMessage = Operation.make({
-    meta: { key: `${THREAD_OPERATION}/add-message`, name: 'Add Message' },
-    services: [Capability.Service],
-    schema: {
-      input: Schema.Struct({
-        subject: Type.Obj,
-        anchor: AnchoredTo.AnchoredTo,
-        sender: Actor.Actor,
-        text: Schema.String,
-      }),
-      output: Schema.Void,
-    },
-  });
-
-  export const DeleteMessageOutput = Schema.partial(
-    Schema.Struct({
-      message: Message.Message.annotations({ description: 'The deleted message.' }),
-      messageIndex: Schema.Number.annotations({ description: 'The index the message was at.' }),
-    }),
-  );
-
-  export type DeleteMessageOutput = Schema.Schema.Type<typeof DeleteMessageOutput>;
-
-  export const DeleteMessage = Operation.make({
-    meta: { key: `${THREAD_OPERATION}/delete-message`, name: 'Delete Message' },
-    services: [Capability.Service],
-    schema: {
-      input: Schema.Struct({
-        anchor: AnchoredTo.AnchoredTo,
-        subject: Type.Obj,
-        messageId: Schema.String,
-      }),
-      output: DeleteMessageOutput,
-    },
-  });
-
-  /**
-   * Restore a deleted thread (inverse of Delete).
-   */
-  export const Restore = Operation.make({
-    meta: { key: `${THREAD_OPERATION}/restore`, name: 'Restore Thread' },
-    services: [Capability.Service],
-    schema: {
-      input: Schema.Struct({
-        thread: Thread.Thread.annotations({ description: 'The thread to restore.' }),
-        anchor: AnchoredTo.AnchoredTo.annotations({ description: 'The anchor relation to restore.' }),
-      }),
-      output: Schema.Void,
-    },
-  });
-
-  /**
-   * Restore a deleted message (inverse of DeleteMessage).
-   */
-  export const RestoreMessage = Operation.make({
-    meta: { key: `${THREAD_OPERATION}/restore-message`, name: 'Restore Message' },
-    services: [Capability.Service],
-    schema: {
-      input: Schema.Struct({
-        anchor: AnchoredTo.AnchoredTo.annotations({ description: 'The anchor of the thread.' }),
-        message: Message.Message.annotations({ description: 'The message to restore.' }),
-        messageIndex: Schema.Number.annotations({ description: 'The index to restore the message at.' }),
-      }),
-      output: Schema.Void,
-    },
-  });
-}
-
-export const ThreadSettingsSchema = Schema.mutable(Schema.Struct({}));
-export type ThreadSettingsProps = Schema.Schema.Type<typeof ThreadSettingsSchema>;
+export * as Settings from './Settings';
 
 export interface ThreadModel {
   root: Thread.Thread;

package/src/util.ts

@@ -5,22 +5,54 @@
 import * as Match from 'effect/Match';
 
 import { generateName } from '@dxos/display-name';
-import { type Selection } from '@dxos/plugin-attention';
 import { type PublicKey } from '@dxos/react-client';
 import { type Identity } from '@dxos/react-client/halo';
+import { type Selection } from '@dxos/react-ui-attention';
 import { type MessageMetadata } from '@dxos/react-ui-thread';
-import { hexToFallback } from '@dxos/util';
+import { hexToFallback, toFallback } from '@dxos/util';
 
 export type MessagePropertiesProvider = (identityKey: PublicKey | undefined) => MessageMetadata;
 
-export const getMessageMetadata = (id: string, identity?: Identity): MessageMetadata => {
-  const fallback = hexToFallback(identity?.identityKey.toHex() ?? '0');
+/**
+ * Stable hash for an arbitrary string — used as the avatar-fallback seed for
+ * external senders who have no DXOS identity (e.g. Slack/Discord-synced
+ * messages). djb2-ish, only stability matters.
+ *
+ * Coerced to unsigned 32-bit via `>>> 0` because `toFallback` does a plain
+ * modulo against `idEmoji.length * idHue.length` and JavaScript's `%`
+ * preserves the sign of the dividend — a negative hash would index
+ * `idEmoji[-x]` and `idHue[-x]` to `undefined`, causing the avatar to fall
+ * through to `Avatar.Content`'s default red/ghost.
+ */
+const hashString = (s: string): number => {
+  let h = 0;
+  for (let i = 0; i < s.length; i++) {
+    h = (h * 31 + s.charCodeAt(i)) | 0;
+  }
+  return h >>> 0;
+};
+
+export const getMessageMetadata = (
+  id: string,
+  identity?: Identity,
+  /**
+   * Externally-sourced sender info (Slack/Discord/etc). Used only when no
+   * matching DXOS `identity` is available — provides `name`/`email` for the
+   * author label and a stable seed for the avatar fallback.
+   */
+  fallbackSender?: { name?: string; email?: string },
+): MessageMetadata => {
+  const fallback = identity?.identityKey
+    ? hexToFallback(identity.identityKey.toHex())
+    : toFallback(hashString(fallbackSender?.name ?? fallbackSender?.email ?? '0'));
   return {
     id,
     authorId: identity?.did,
     authorName:
       identity?.profile?.displayName ??
-      (identity?.identityKey ? generateName(identity.identityKey.toHex()) : undefined),
+      (identity?.identityKey ? generateName(identity.identityKey.toHex()) : undefined) ??
+      fallbackSender?.name ??
+      fallbackSender?.email,
     authorAvatarProps: {
       hue: identity?.profile?.data?.hue ?? fallback.hue,
       emoji: identity?.profile?.data?.emoji ?? fallback.emoji,