polfan-server-js-client 0.2.88 → 0.2.90

package/build/types/state-tracker/MessagesManager.d.ts

@@ -1,5 +1,5 @@
 import { ChatStateTracker } from "./ChatStateTracker";
-import { FollowedTopic } from "../types/src";
+import { FollowedTopic, Message, ChatLocation } from "../types/src";
 import { ObservableIndexedObjectCollection } from "../IndexedObjectCollection";
 import { RoomMessagesHistory } from "./RoomMessagesHistory";
 export declare class MessagesManager {
@@ -38,6 +38,11 @@ export declare class MessagesManager {
      * @internal
      */
     _deleteByTopicIds(roomId: string, ...topicIds: string[]): void;
+    /**
+     * For internal use.
+     * @internal
+     */
+    _resolveLastMessage(location: ChatLocation): Promise<Message | null>;
     private createHistoryForNewRoom;
     private handleNewMessage;
     private handleFollowedTopicUpdated;

package/build/types/state-tracker/RoomMessagesHistory.d.ts

@@ -9,8 +9,10 @@ export declare class RoomMessagesHistory {
     constructor(room: Room, tracker: ChatStateTracker);
     /**
      * Returns a history window object for the given topic ID, allowing you to view message history.
+     * @param topicId
+     * @param peek If true, do not create a cache for this topic and do not allow it to collect new messages.
      */
-    getMessagesWindow(topicId: string): Promise<TopicHistoryWindow | undefined>;
+    getMessagesWindow(topicId: string, peek?: boolean): Promise<TopicHistoryWindow | undefined>;
     private handleRoomUpdated;
     private handleNewTopic;
     private handleTopicDeleted;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polfan-server-js-client",
-  "version": "0.2.88",
+  "version": "0.2.90",
   "description": "JavaScript client library for handling communication with Polfan chat server.",
   "author": "Jarosław Żak",
   "license": "MIT",

package/src/state-tracker/MessagesManager.ts

@@ -7,7 +7,12 @@ import {
     RoomDeleted,
     RoomLeft,
     TopicDeleted,
-    FollowedTopicUpdated, RoomJoined, NewTopic, Session, Room, MessageType,
+    FollowedTopicUpdated,
+    RoomJoined,
+    NewTopic,
+    Session,
+    Room,
+    Message, ChatLocation,
 } from "../types/src";
 import {
     IndexedCollection,
@@ -129,7 +134,7 @@ export class MessagesManager {
             return collection.items.reduce(
                 (previousValue: number, currentValue) => previousValue + (currentValue.missed ?? 0),
                 0,
-            );
+            ) as number;
         }
 
         return undefined;
@@ -143,6 +148,30 @@ export class MessagesManager {
         this.followedTopics.get(roomId)?.delete(...topicIds);
     }
 
+    /**
+     * For internal use.
+     * @internal
+     */
+    public async _resolveLastMessage(location: ChatLocation): Promise<Message|null> {
+        // Try to get last message from history window (if cached)
+        let message: Message = await this.getRoomHistory(location.roomId)
+            .then(roomHistory => roomHistory?.getMessagesWindow(location.topicId, true))
+            .then(
+                historyWindow =>
+                    historyWindow?.hasLatest && historyWindow.getAt(historyWindow.length - 1)
+            );
+
+        if (!message) {
+            const result = await this.tracker.client.send('GetMessages', {
+                location,
+                limit: 1,
+            });
+            message = result.data?.messages[0];
+        }
+
+        return message || null;
+    }
+
     private createHistoryForNewRoom(room: Room): void {
         this.roomHistories.set([room.id, new RoomMessagesHistory(room, this.tracker)]);
     }

package/src/state-tracker/RoomMessagesHistory.ts

@@ -24,9 +24,11 @@ export class RoomMessagesHistory {
 
     /**
      * Returns a history window object for the given topic ID, allowing you to view message history.
+     * @param topicId
+     * @param peek If true, do not create a cache for this topic and do not allow it to collect new messages.
      */
-    public async getMessagesWindow(topicId: string): Promise<TopicHistoryWindow | undefined> {
-        if (!this.historyWindows.has(topicId)) {
+    public async getMessagesWindow(topicId: string, peek: boolean = false): Promise<TopicHistoryWindow | undefined> {
+        if (!this.historyWindows.has(topicId) && !peek) {
             const topic = (await this.tracker.rooms.getTopics(this.room.id, [topicId])).get(topicId);
 
             if (topic) {

package/src/state-tracker/RoomsManager.ts

@@ -1,5 +1,6 @@
 import {IndexedCollection, ObservableIndexedObjectCollection} from "../IndexedObjectCollection";
 import {
+    Message,
     MessagesRedacted,
     NewMessage,
     NewTopic,
@@ -368,12 +369,14 @@ export class RoomsManager {
         }
     }
 
-    private handleMessagesRedacted(ev: MessagesRedacted): void {
-        // Remove redacted messages from topic.lastMessage
+    private async handleMessagesRedacted(ev: MessagesRedacted): Promise<void> {
+        // Remove redacted messages from topic and update metadata
         const topics = this.topics.get(ev.location.roomId);
-        const updatedTopics: Topic[] = topics.items
-            .filter(topic => topic.lastMessage?.id && ev.ids.includes(topic.lastMessage.id))
-            .map(topic => ({ ...topic, lastMessage: null }));
-        topics.set(...updatedTopics);
+        const topic = topics?.get(ev.location.topicId);
+        if (topic) {
+            const messageCount = Math.max(topic.messageCount - ev.ids.length, 0);
+            const lastMessage: Message = messageCount > 0 ? await this.messages._resolveLastMessage(ev.location) : null;
+            topics.set({ ...topic, messageCount, lastMessage } as Topic);
+        }
     }
 }