@shaxpir/duiduidui-models 1.24.0 → 1.24.3

package/dist/models/Chat.d.ts

@@ -5,6 +5,7 @@ import { ArrayView } from './ArrayView';
 import { ContentBody, ContentId, ContentMeta } from './Content';
 import { SharedContent } from './SharedContent';
 import { SocialUser } from './Social';
+export declare const NEW_CHAT_SCRATCHPAD_KEY = "(new-chat)";
 export interface TextBlock {
     type: 'text';
     text: string;
@@ -62,9 +63,9 @@ export interface ChatScratchpad {
 }
 export interface ChatStub {
     id: ContentId;
-    title?: string;
+    title: string | null;
     participants: SocialUser[];
-    last_message_preview?: string;
+    last_message_preview: string | null;
     updated_at: CompactDateTime;
     has_unread: {
         [user_id: string]: boolean;

package/dist/models/Chat.js

@@ -1,12 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Chat = void 0;
+exports.Chat = exports.NEW_CHAT_SCRATCHPAD_KEY = void 0;
 const shaxpir_common_1 = require("@shaxpir/shaxpir-common");
 const repo_1 = require("../repo");
 const ArrayView_1 = require("./ArrayView");
 const ContentKind_1 = require("./ContentKind");
 const Operation_1 = require("./Operation");
 const SharedContent_1 = require("./SharedContent");
+// Scratchpad key for composing the first message of a new chat.
+// Uses characters outside the base62 ContentId alphabet so it can never
+// collide with an actual chat ID.
+exports.NEW_CHAT_SCRATCHPAD_KEY = '(new-chat)';
 // ---- Chat model ----
 class Chat extends SharedContent_1.SharedContent {
     constructor(doc, shouldAcquire, shareSync) {
@@ -58,12 +62,10 @@ class Chat extends SharedContent_1.SharedContent {
         for (const userId of userIds) {
             try {
                 const workspaceId = shaxpir_common_1.CachingHasher.makeMd5Base62Hash(userId + "-" + ContentKind_1.ContentKind.WORKSPACE);
-                const workspace = this.shareSync.load(ContentKind_1.ContentKind.WORKSPACE, workspaceId);
-                if (workspace) {
-                    await workspace.acquire();
-                    if (workspace.exists()) {
-                        workspace.upsertChatStub(stub);
-                    }
+                const workspace = await this.shareSync.acquire(ContentKind_1.ContentKind.WORKSPACE, workspaceId);
+                if (workspace && workspace.exists()) {
+                    // Cast needed to avoid circular dependency between Chat and Workspace
+                    workspace.upsertChatStub(stub);
                     workspace.release();
                 }
             }
@@ -162,7 +164,7 @@ class Chat extends SharedContent_1.SharedContent {
     toStub() {
         this.checkDisposed('Chat.toStub');
         const msgs = this.messages.values;
-        let preview;
+        let preview = null;
         if (msgs.length > 0) {
             const lastMsg = msgs[msgs.length - 1];
             const textBlock = lastMsg.content.find(b => b.type === 'text');
@@ -177,7 +179,7 @@ class Chat extends SharedContent_1.SharedContent {
         }
         return {
             id: this.id,
-            title: this.title,
+            title: this.title || null,
             participants: this.participants.values,
             last_message_preview: preview,
             updated_at: this.updatedAt.utc_time,

package/dist/models/Workspace.d.ts

@@ -62,6 +62,7 @@ export declare class Workspace extends Content {
     getChatScratchpad(chatId: string): ChatScratchpad;
     updateChatScratchpadText(chatId: string, text: string): void;
     updateChatScratchpadField(chatId: string, key: string, value: any): void;
+    private ensureScratchpadExists;
     clearChatScratchpad(chatId: string): void;
     get devices(): ArrayView<ContentId>;
     get uploadedAvatars(): ArrayView<ContentId>;

package/dist/models/Workspace.js

@@ -124,16 +124,25 @@ class Workspace extends Content_1.Content {
     }
     updateChatScratchpadText(chatId, text) {
         this.checkDisposed("Workspace.updateChatScratchpadText");
+        this.ensureScratchpadExists(chatId);
         const batch = new Operation_1.BatchOperation(this);
         batch.editPathText(['payload', 'chat_scratchpads', chatId, 'text'], text);
         batch.commit();
     }
     updateChatScratchpadField(chatId, key, value) {
         this.checkDisposed("Workspace.updateChatScratchpadField");
+        this.ensureScratchpadExists(chatId);
         const batch = new Operation_1.BatchOperation(this);
         batch.setPathValue(['payload', 'chat_scratchpads', chatId, key], value);
         batch.commit();
     }
+    ensureScratchpadExists(chatId) {
+        if (!this.payload.chat_scratchpads.hasOwnProperty(chatId)) {
+            const batch = new Operation_1.BatchOperation(this);
+            batch.setPathValue(['payload', 'chat_scratchpads', chatId], {});
+            batch.commit();
+        }
+    }
     clearChatScratchpad(chatId) {
         this.checkDisposed("Workspace.clearChatScratchpad");
         const path = ['payload', 'chat_scratchpads', chatId];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shaxpir/duiduidui-models",
-  "version": "1.24.0",
+  "version": "1.24.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/shaxpir/duiduidui-models"