@shaxpir/duiduidui-models 1.6.8 → 1.6.14

package/dist/models/Social.d.ts

@@ -2,33 +2,37 @@ import { Doc } from '@shaxpir/sharedb/lib/client';
 import { CompactDateTime, MultiTime } from '@shaxpir/shaxpir-common';
 import { ShareSync } from '../repo';
 import { Content, ContentBody, ContentId, ContentMeta } from "./Content";
+import { ImageCropping } from './Image';
 export declare enum FriendRequestStatus {
     PENDING = "pending",
     ACCEPTED = "accepted",
     REJECTED = "rejected"
 }
+export declare enum SharingLevel {
+    FRIEND = "friend",// Default sharing level - basic progress visibility
+    TEACHER = "teacher"
+}
+export interface SocialUser {
+    user_id: ContentId;
+    username: string;
+    full_name: string;
+    avatar_image_ref: ContentId | null;
+    avatar_cropping: ImageCropping | null;
+}
 export interface FriendRequest {
     request_id: string;
-    from_user_id: ContentId;
-    to_user_id: ContentId;
-    from_username: string;
-    from_full_name: string;
-    to_username: string;
-    to_full_name: string;
+    from: SocialUser;
+    to: SocialUser;
     status: FriendRequestStatus;
     created_at: CompactDateTime;
     updated_at: CompactDateTime;
 }
-export interface Friend {
-    user_id: ContentId;
-    username: string;
-    full_name: string;
+export interface Friend extends SocialUser {
     since: CompactDateTime;
+    my_sharing_level: SharingLevel;
+    their_sharing_level: SharingLevel;
 }
-export interface BlockedUser {
-    user_id: ContentId;
-    username: string;
-    full_name: string;
+export interface BlockedUser extends SocialUser {
     blocked_at: CompactDateTime;
 }
 export interface SocialPayload {
@@ -57,8 +61,15 @@ export declare class Social extends Content {
     addFriend(friend: Friend): void;
     removeFriend(userId: ContentId): void;
     isFriend(userId: ContentId): boolean;
+    updateMySharingLevel(userId: ContentId, sharingLevel: SharingLevel): void;
+    updateTheirSharingLevel(userId: ContentId, sharingLevel: SharingLevel): void;
     getBlockedUsers(): BlockedUser[];
     addBlockedUser(blockedUser: BlockedUser): void;
     removeBlockedUser(userId: ContentId): void;
     isBlocked(userId: ContentId): boolean;
+    /**
+     * Updates cached profile fields for all SocialUser references matching the given userId.
+     * This should be called when a user updates their Profile to keep cached data in sync.
+     */
+    updateProfileFields(userId: ContentId, username: string, fullName: string, avatarImageRef: ContentId | null, avatarCropping: ImageCropping | null): void;
 }

package/dist/models/Social.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Social = exports.FriendRequestStatus = void 0;
+exports.Social = exports.SharingLevel = exports.FriendRequestStatus = void 0;
 const shaxpir_common_1 = require("@shaxpir/shaxpir-common");
 const repo_1 = require("../repo");
 const Content_1 = require("./Content");
@@ -12,6 +12,11 @@ var FriendRequestStatus;
     FriendRequestStatus["ACCEPTED"] = "accepted";
     FriendRequestStatus["REJECTED"] = "rejected";
 })(FriendRequestStatus || (exports.FriendRequestStatus = FriendRequestStatus = {}));
+var SharingLevel;
+(function (SharingLevel) {
+    SharingLevel["FRIEND"] = "friend";
+    SharingLevel["TEACHER"] = "teacher"; // Enhanced sharing - detailed progress and learning insights
+})(SharingLevel || (exports.SharingLevel = SharingLevel = {}));
 class Social extends Content_1.Content {
     static makeSocialId(userId) {
         return shaxpir_common_1.CachingHasher.makeMd5Base62Hash(userId + "-" + ContentKind_1.ContentKind.SOCIAL);
@@ -118,6 +123,24 @@ class Social extends Content_1.Content {
         this.checkDisposed("Social.isFriend");
         return this.payload.friends.some(f => f.user_id === userId);
     }
+    updateMySharingLevel(userId, sharingLevel) {
+        this.checkDisposed("Social.updateMySharingLevel");
+        const index = this.payload.friends.findIndex(f => f.user_id === userId);
+        if (index !== -1) {
+            const batch = new Operation_1.BatchOperation(this);
+            batch.setPathValue(['payload', 'friends', index, 'my_sharing_level'], sharingLevel);
+            batch.commit();
+        }
+    }
+    updateTheirSharingLevel(userId, sharingLevel) {
+        this.checkDisposed("Social.updateTheirSharingLevel");
+        const index = this.payload.friends.findIndex(f => f.user_id === userId);
+        if (index !== -1) {
+            const batch = new Operation_1.BatchOperation(this);
+            batch.setPathValue(['payload', 'friends', index, 'their_sharing_level'], sharingLevel);
+            batch.commit();
+        }
+    }
     // ========== Blocked Users ==========
     getBlockedUsers() {
         this.checkDisposed("Social.getBlockedUsers");
@@ -144,5 +167,56 @@ class Social extends Content_1.Content {
         this.checkDisposed("Social.isBlocked");
         return this.payload.blocked_users.some(b => b.user_id === userId);
     }
+    // ========== Sync Profile Changes ==========
+    /**
+     * Updates cached profile fields for all SocialUser references matching the given userId.
+     * This should be called when a user updates their Profile to keep cached data in sync.
+     */
+    updateProfileFields(userId, username, fullName, avatarImageRef, avatarCropping) {
+        this.checkDisposed("Social.updateProfileFields");
+        const batch = new Operation_1.BatchOperation(this);
+        let updated = false;
+        // Helper to update a SocialUser at the given path
+        const updateSocialUser = (basePath) => {
+            batch.setPathValue([...basePath, 'username'], username);
+            batch.setPathValue([...basePath, 'full_name'], fullName);
+            batch.setPathValue([...basePath, 'avatar_image_ref'], avatarImageRef);
+            batch.setPathValue([...basePath, 'avatar_cropping'], avatarCropping);
+            updated = true;
+        };
+        // Update friends
+        this.payload.friends.forEach((friend, index) => {
+            if (friend.user_id === userId) {
+                updateSocialUser(['payload', 'friends', index]);
+            }
+        });
+        // Update blocked users
+        this.payload.blocked_users.forEach((blocked, index) => {
+            if (blocked.user_id === userId) {
+                updateSocialUser(['payload', 'blocked_users', index]);
+            }
+        });
+        // Update outgoing requests (both from and to)
+        this.payload.outgoing_requests.forEach((request, index) => {
+            if (request.from.user_id === userId) {
+                updateSocialUser(['payload', 'outgoing_requests', index, 'from']);
+            }
+            if (request.to.user_id === userId) {
+                updateSocialUser(['payload', 'outgoing_requests', index, 'to']);
+            }
+        });
+        // Update incoming requests (both from and to)
+        this.payload.incoming_requests.forEach((request, index) => {
+            if (request.from.user_id === userId) {
+                updateSocialUser(['payload', 'incoming_requests', index, 'from']);
+            }
+            if (request.to.user_id === userId) {
+                updateSocialUser(['payload', 'incoming_requests', index, 'to']);
+            }
+        });
+        if (updated) {
+            batch.commit();
+        }
+    }
 }
 exports.Social = Social;

package/package.json

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