polfan-server-js-client 0.2.32 → 0.2.34

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

@@ -1,8 +1,10 @@
 import { ChatStateTracker } from "./ChatStateTracker";
 import { ObservableIndexedObjectCollection } from "../IndexedObjectCollection";
 import { User } from "../types/src";
+import { EventTarget } from "../EventTarget";
 export declare class UsersManager {
     private tracker;
+    readonly onlineStatus: EventTarget<any>;
     private readonly users;
     constructor(tracker: ChatStateTracker);
     /**
@@ -10,6 +12,6 @@ export declare class UsersManager {
      */
     getAvailable(): Promise<ObservableIndexedObjectCollection<User>>;
     private handleMembers;
-    private handleUsers;
     private handleSession;
+    private handleUsers;
 }

package/package.json

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

package/src/state-tracker/MessagesManager.ts

@@ -8,7 +8,7 @@ import {
     RoomDeleted,
     RoomLeft,
     TopicDeleted,
-    FollowedTopicUpdated, RoomJoined, NewTopic, Session, Room,
+    FollowedTopicUpdated, RoomJoined, NewTopic, Session, Room, MessageType,
 } from "../types/src";
 import {
     IndexedCollection,
@@ -209,9 +209,10 @@ export class MessagesManager {
     private updateLocallyFollowedTopicOnNewMessage(ev: NewMessage): void {
         const roomFollowedTopics = this.followedTopics.get(ev.message.location.roomId);
         const followedTopic = roomFollowedTopics?.get(ev.message.location.topicId);
+        const ephemeralMessageTypes = ['System'] as MessageType[];
 
-        if (! roomFollowedTopics || ! followedTopic) {
-            // Skip if we don't follow this room or targeted topic
+        if (!roomFollowedTopics || !followedTopic || ephemeralMessageTypes.includes(ev.message.type)) {
+            // Skip if we don't follow this room or targeted topic or message is ephemeral
             return;
         }
 

package/src/state-tracker/UsersManager.ts

@@ -2,8 +2,11 @@ import {ChatStateTracker} from "./ChatStateTracker";
 import {ObservableIndexedObjectCollection} from "../IndexedObjectCollection";
 import {RoomMember, Session, SpaceMember, User} from "../types/src";
 import {extractUserFromMember} from "./functions";
+import {EventTarget} from "../EventTarget";
 
 export class UsersManager {
+    public readonly onlineStatus = new EventTarget();
+
     private readonly users: ObservableIndexedObjectCollection<User> = new ObservableIndexedObjectCollection('id');
 
     public constructor(private tracker: ChatStateTracker) {
@@ -26,15 +29,22 @@ export class UsersManager {
     }
 
     private handleMembers(members: (RoomMember | SpaceMember)[]): void {
-        this.users.set(...members.map(extractUserFromMember));
-    }
-
-    private handleUsers(users: User[]): void {
-        this.users.set(...users);
+        this.handleUsers(members.map(extractUserFromMember));
     }
 
     private handleSession(session: Session): void {
         this.users.deleteAll();
-        this.users.set(session.user);
+        this.handleUsers([session.user]);
+    }
+
+    private handleUsers(users: User[]): void {
+        users.forEach(newUser => {
+            const oldUser = this.users.get(newUser.id);
+            if (oldUser && oldUser.online !== newUser.online) {
+                this.onlineStatus.emit('changed', newUser);
+            }
+        });
+
+        this.users.set(...users);
     }
 }