polfan-server-js-client 0.2.93 → 0.2.95

package/build/types/AbstractChatClient.d.ts

@@ -1,4 +1,4 @@
-import { Bye, GetSession, JoinSpace, Session, SpaceJoined, Error as ErrorType, SpaceLeft, SpaceMemberJoined, SpaceMemberLeft, SpaceMemberUpdated, SpaceDeleted, SpaceMembers, SpaceRooms, NewRole, RoomDeleted, RoomJoined, RoomLeft, RoomMemberLeft, RoomMemberJoined, RoomMembers, NewRoom, NewTopic, TopicDeleted, NewMessage, GetPermissionOverwrites, GetComputedPermissions, LeaveSpace, CreateSpace, DeleteSpace, GetSpaceMembers, GetSpaceRooms, CreateRole, DeleteRole, AssignRole, DeassignRole, SetPermissionOverwrites, JoinRoom, LeaveRoom, CreateRoom, DeleteRoom, GetRoomMembers, CreateTopic, DeleteTopic, CreateMessage, Envelope, PermissionOverwrites, PermissionOverwritesUpdated, RoomMemberUpdated, UpdateRole, RoleUpdated, Ack, UserUpdated, UpdateRoom, RoomUpdated, UpdateSpace, SpaceUpdated, PermissionOverwriteTargets, GetPermissionOverwriteTargets, Owners, Ok, GetOwners, CreateOwner, RoleDeleted, FollowedTopicUpdated, TopicFollowed, TopicUnfollowed, FollowedTopics, FollowTopic, UnfollowTopic, GetFollowedTopics, Messages, GetMessages, Topics, GetTopics, TopicUpdated, UpdateTopic, GetDiscoverableSpaces, DiscoverableSpaces, CreateEmoticon, DeleteEmoticon, GetEmoticons, Emoticons, EmoticonDeleted, NewEmoticon, Bans, GetBans, Ban, Unban, Kick, ClientData, GetClientData, SetClientData, GetRoomSummary, GetSpaceSummary, RoomSummaryEvent, SpaceSummaryEvent, UpdateSpaceMember, Relationships, RelationshipDeleted, NewRelationship, DeleteRelationship, CreateRelationship, RoomSummaryUpdated, Pong, Ping, RedactMessages, MessagesRedacted, ReportAbuse, UpdateRoomMember, GetRelationships, GetUserInfo, UserInfo } from "./types/src";
+import { Bye, GetSession, JoinSpace, Session, SpaceJoined, Error as ErrorType, SpaceLeft, SpaceMemberJoined, SpaceMemberLeft, SpaceMemberUpdated, SpaceDeleted, SpaceMembers, SpaceRooms, NewRole, RoomDeleted, RoomJoined, RoomLeft, RoomMemberLeft, RoomMemberJoined, RoomMembers, NewRoom, NewTopic, TopicDeleted, NewMessage, GetPermissionOverwrites, GetComputedPermissions, LeaveSpace, CreateSpace, DeleteSpace, GetSpaceMembers, GetSpaceRooms, CreateRole, DeleteRole, AssignRole, DeassignRole, SetPermissionOverwrites, JoinRoom, LeaveRoom, CreateRoom, DeleteRoom, GetRoomMembers, CreateTopic, DeleteTopic, CreateMessage, Envelope, PermissionOverwrites, PermissionOverwritesUpdated, RoomMemberUpdated, UpdateRole, RoleUpdated, Ack, UserUpdated, UpdateRoom, RoomUpdated, UpdateSpace, SpaceUpdated, PermissionOverwriteTargets, GetPermissionOverwriteTargets, Owners, Ok, GetOwners, CreateOwner, RoleDeleted, FollowedTopicUpdated, TopicFollowed, FollowedTopics, FollowTopic, UpdateFollowedTopic, GetFollowedTopics, Messages, GetMessages, Topics, GetTopics, TopicUpdated, UpdateTopic, GetDiscoverableSpaces, DiscoverableSpaces, CreateEmoticon, DeleteEmoticon, GetEmoticons, Emoticons, EmoticonDeleted, NewEmoticon, Bans, GetBans, Ban, Unban, Kick, ClientData, GetClientData, SetClientData, GetRoomSummary, GetSpaceSummary, RoomSummaryEvent, SpaceSummaryEvent, UpdateSpaceMember, Relationships, RelationshipDeleted, NewRelationship, DeleteRelationship, CreateRelationship, RoomSummaryUpdated, Pong, Ping, RedactMessages, MessagesRedacted, ReportAbuse, UpdateRoomMember, GetRelationships, GetUserInfo, UserInfo, SetSessionData } from "./types/src";
 import { EventTarget } from "./EventTarget";
 type ArrayOfPromiseResolvers = [(value: any) => void, (reason?: any) => void];
 type ExtraEventMap = Record<string, any>;
@@ -74,7 +74,6 @@ export type EventsMap = {
     NewMessage: NewMessage;
     UserUpdated: UserUpdated;
     TopicFollowed: TopicFollowed;
-    TopicUnfollowed: TopicUnfollowed;
     FollowedTopics: FollowedTopics;
     FollowedTopicUpdated: FollowedTopicUpdated;
     Messages: Messages;
@@ -109,6 +108,7 @@ export type CommandsMap = {
     Ping: CommandDefinition<Ping, EventsMap['Pong']>;
     ReportAbuse: CommandDefinition<ReportAbuse, EventsMap['Ok']>;
     GetUserInfo: CommandDefinition<GetUserInfo, EventsMap['UserInfo']>;
+    SetSessionData: CommandDefinition<SetSessionData, EventsMap['Ok']>;
     GetDiscoverableSpaces: CommandDefinition<GetDiscoverableSpaces, EventsMap['DiscoverableSpaces']>;
     JoinSpace: CommandDefinition<JoinSpace, EventsMap['SpaceJoined']>;
     LeaveSpace: CommandDefinition<LeaveSpace, EventsMap['SpaceLeft']>;
@@ -137,7 +137,7 @@ export type CommandsMap = {
     CreateMessage: CommandDefinition<CreateMessage, EventsMap['NewMessage']>;
     Ack: CommandDefinition<Ack, EventsMap['FollowedTopicUpdated'] | EventsMap['Ok']>;
     FollowTopic: CommandDefinition<FollowTopic, EventsMap['TopicFollowed']>;
-    UnfollowTopic: CommandDefinition<UnfollowTopic, EventsMap['TopicUnfollowed']>;
+    UpdateFollowedTopic: CommandDefinition<UpdateFollowedTopic, EventsMap['FollowedTopicUpdated']>;
     GetFollowedTopics: CommandDefinition<GetFollowedTopics, EventsMap['FollowedTopics']>;
     GetMessages: CommandDefinition<GetMessages, EventsMap['Messages']>;
     GetTopics: CommandDefinition<GetTopics, EventsMap['Topics']>;

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

@@ -8,6 +8,7 @@ export declare class MessagesManager {
     private readonly followedTopics;
     private readonly followedTopicsPromises;
     private readonly deferredSession;
+    private readonly unreadSummariesCache;
     constructor(tracker: ChatStateTracker);
     /**
      * Get history manager for given room ID.
@@ -25,14 +26,17 @@ export declare class MessagesManager {
      */
     getRoomFollowedTopics(roomId: string): Promise<ObservableIndexedObjectCollection<FollowedTopic> | undefined>;
     /**
-     * Batch acknowledge all missed messages from any topics in given room.
+     * Batch acknowledge all messages for given room.
      */
-    ackRoomFollowedTopics(roomId: string): Promise<void>;
+    ackRoom(roomId: string): Promise<void>;
     /**
-     * Calculate missed messages from any topic in given room.
+     * Calculate missed messages with mentions from any topic in given room.
      * @return Undefined if you are not in room.
      */
-    calculateRoomMissedMessages(roomId: string): Promise<number | undefined>;
+    summarizeUnreadMessages(location: ChatLocation): Promise<{
+        mentionCount: number;
+        isUnread: boolean;
+    }>;
     /**
      * For internal use. If you want to delete the message, execute a proper command on client object.
      * @internal
@@ -43,11 +47,15 @@ export declare class MessagesManager {
      * @internal
      */
     _resolveLastMessage(location: ChatLocation): Promise<Message | null>;
+    /**
+     * Wyczyść cache celowo, tylko dla lokalizacji których dotyczy zmiana.
+     */
+    private invalidateUnreadSummaries;
+    private invalidateUnreadSummariesForRooms;
     private createHistoryForNewRoom;
     private handleNewMessage;
     private handleFollowedTopicUpdated;
     private handleTopicFollowed;
-    private handleTopicUnfollowed;
     private handleRoomDeleted;
     private handleRoomJoin;
     private handleRoomLeft;

package/build/types/types/src/index.d.ts

@@ -77,9 +77,8 @@ import { Owners } from "./schemes/events/Owners";
 import { Ok } from "./schemes/events/Ok";
 import { FollowTopic } from "./schemes/commands/FollowTopic";
 import { FollowedTopics } from "./schemes/events/FollowedTopics";
-import { FollowedTopic } from "./schemes/FollowedTopic";
-import { UnfollowTopic } from "./schemes/commands/UnfollowTopic";
-import { TopicUnfollowed } from "./schemes/events/TopicUnfollowed";
+import { FollowedTopic, NotificationLevel } from "./schemes/FollowedTopic";
+import { UpdateFollowedTopic } from "./schemes/commands/UpdateFollowedTopic";
 import { TopicFollowed } from "./schemes/events/TopicFollowed";
 import { GetFollowedTopics } from "./schemes/commands/GetFollowedTopics";
 import { FollowedTopicUpdated } from "./schemes/events/FollowedTopicUpdated";
@@ -134,4 +133,5 @@ import { GetRelationships } from "./schemes/commands/GetRelationships";
 import { GetUserInfo } from "./schemes/commands/GetUserInfo";
 import { UserInfo } from "./schemes/events/UserInfo";
 import { UserInformation } from "./schemes/UserInformation";
-export { Envelope, Message, MessageType, MessageAuthor, Role, Room, RoomType, RoomStream, RoomStreamType, RoomHistory, RoomHistoryMode, RoomMember, RoomSummary, RoomSummaryExtras, Space, SpaceMember, Topic, FollowedTopic, User, UserState, PermissionOverwritesValue, ChatLocation, SpaceSummary, SpaceDiscoverable, Emoticon, PermissionOverwritesTarget, BanObject, LeaveReason, UserRelationship, UserRelationshipType, CreateTopicInitialMessage, UserInformation, Bye, Error, Messages, NewMessage, NewRole, NewRoom, NewTopic, TopicFollowed, TopicUnfollowed, FollowedTopics, FollowedTopicUpdated, ComputedPermissions, PermissionOverwrites, PermissionOverwritesUpdated, RoleDeleted, RoleUpdated, RoomDeleted, RoomUpdated, RoomJoined, RoomLeft, RoomMemberJoined, RoomMemberLeft, RoomMembers, RoomMemberUpdated, UserUpdated, Session, SpaceDeleted, SpaceUpdated, SpaceJoined, SpaceLeft, SpaceMemberJoined, SpaceMemberLeft, SpaceMembers, SpaceMemberUpdated, SpaceRooms, TopicDeleted, TopicUpdated, PermissionOverwriteTargets, Owners, Ok, DiscoverableSpaces, Emoticons, EmoticonDeleted, NewEmoticon, Bans, ClientData, SpaceSummaryEvent, RoomSummaryEvent, NewRelationship, RelationshipDeleted, Relationships, RoomSummaryUpdated, Pong, MessagesRedacted, UserInfo, AssignRole, GetMessages, CreateMessage, Ack, CreateRole, CreateRoom, CreateSpace, CreateTopic, FollowTopic, UnfollowTopic, GetFollowedTopics, DeassignRole, DeleteRole, DeleteRoom, DeleteSpace, DeleteTopic, SetPermissionOverwrites, GetPermissionOverwrites, GetComputedPermissions, GetRoomMembers, GetSession, GetSpaceMembers, GetSpaceRooms, JoinRoom, JoinSpace, LeaveRoom, LeaveSpace, UpdateRole, UpdateSpace, UpdateRoom, UpdateTopic, GetPermissionOverwriteTargets, CreateOwner, DeleteOwner, GetOwners, Topics, GetTopics, GetDiscoverableSpaces, GetEmoticons, CreateEmoticon, DeleteEmoticon, Ban, Unban, GetBans, Kick, GetClientData, SetClientData, GetSpaceSummary, GetRoomSummary, UpdateSpaceMember, CreateRelationship, DeleteRelationship, GetRelationships, UpdateRoomMember, Ping, ReportAbuse, RedactMessages, GetUserInfo, };
+import { SetSessionData, SessionPush } from "./schemes/commands/SetSessionData";
+export { Envelope, Message, MessageType, MessageAuthor, Role, Room, RoomType, RoomStream, RoomStreamType, RoomHistory, RoomHistoryMode, RoomMember, RoomSummary, RoomSummaryExtras, Space, SpaceMember, Topic, FollowedTopic, NotificationLevel, User, UserState, PermissionOverwritesValue, ChatLocation, SpaceSummary, SpaceDiscoverable, Emoticon, PermissionOverwritesTarget, BanObject, LeaveReason, UserRelationship, UserRelationshipType, CreateTopicInitialMessage, UserInformation, SessionPush, Bye, Error, Messages, NewMessage, NewRole, NewRoom, NewTopic, TopicFollowed, FollowedTopics, FollowedTopicUpdated, ComputedPermissions, PermissionOverwrites, PermissionOverwritesUpdated, RoleDeleted, RoleUpdated, RoomDeleted, RoomUpdated, RoomJoined, RoomLeft, RoomMemberJoined, RoomMemberLeft, RoomMembers, RoomMemberUpdated, UserUpdated, Session, SpaceDeleted, SpaceUpdated, SpaceJoined, SpaceLeft, SpaceMemberJoined, SpaceMemberLeft, SpaceMembers, SpaceMemberUpdated, SpaceRooms, TopicDeleted, TopicUpdated, PermissionOverwriteTargets, Owners, Ok, DiscoverableSpaces, Emoticons, EmoticonDeleted, NewEmoticon, Bans, ClientData, SpaceSummaryEvent, RoomSummaryEvent, NewRelationship, RelationshipDeleted, Relationships, RoomSummaryUpdated, Pong, MessagesRedacted, UserInfo, AssignRole, GetMessages, CreateMessage, Ack, CreateRole, CreateRoom, CreateSpace, CreateTopic, FollowTopic, UpdateFollowedTopic, GetFollowedTopics, DeassignRole, DeleteRole, DeleteRoom, DeleteSpace, DeleteTopic, SetPermissionOverwrites, GetPermissionOverwrites, GetComputedPermissions, GetRoomMembers, GetSession, GetSpaceMembers, GetSpaceRooms, JoinRoom, JoinSpace, LeaveRoom, LeaveSpace, UpdateRole, UpdateSpace, UpdateRoom, UpdateTopic, GetPermissionOverwriteTargets, CreateOwner, DeleteOwner, GetOwners, Topics, GetTopics, GetDiscoverableSpaces, GetEmoticons, CreateEmoticon, DeleteEmoticon, Ban, Unban, GetBans, Kick, GetClientData, SetClientData, GetSpaceSummary, GetRoomSummary, UpdateSpaceMember, CreateRelationship, DeleteRelationship, GetRelationships, UpdateRoomMember, Ping, ReportAbuse, RedactMessages, GetUserInfo, SetSessionData, };

package/build/types/types/src/schemes/FollowedTopic.d.ts

@@ -1,6 +1,10 @@
 import { ChatLocation } from "./ChatLocation";
+export type NotificationLevel = 'All' | 'Mentions' | 'None';
 export interface FollowedTopic {
     location: ChatLocation;
     lastAckMessageId: string | null;
+    notificationLevel: NotificationLevel;
     missed: number | null;
+    isUnread: boolean;
+    mentionCount: number;
 }

package/build/types/types/src/schemes/commands/SetSessionData.d.ts

@@ -0,0 +1,8 @@
+export interface SessionPush {
+    token: string;
+    platform: 'ios' | 'android' | 'web';
+}
+export interface SetSessionData {
+    clientFocused?: boolean;
+    push?: SessionPush;
+}

package/build/types/types/src/schemes/commands/UpdateFollowedTopic.d.ts

@@ -0,0 +1,6 @@
+import { ChatLocation } from "../ChatLocation";
+import { NotificationLevel } from "../FollowedTopic";
+export interface UpdateFollowedTopic {
+    location: ChatLocation;
+    notificationLevel?: NotificationLevel;
+}

package/package.json

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

package/src/AbstractChatClient.ts

@@ -64,10 +64,9 @@ import {
     RoleDeleted,
     FollowedTopicUpdated,
     TopicFollowed,
-    TopicUnfollowed,
     FollowedTopics,
     FollowTopic,
-    UnfollowTopic,
+    UpdateFollowedTopic,
     GetFollowedTopics,
     Messages,
     GetMessages,
@@ -110,7 +109,7 @@ import {
     UpdateRoomMember,
     GetRelationships,
     GetUserInfo,
-    UserInfo,
+    UserInfo, SetSessionData,
 } from "./types/src";
 import {EventTarget} from "./EventTarget";
 
@@ -224,7 +223,6 @@ export type CommandResponse<CommandType extends keyof CommandsMap> = CommandsMap
     NewMessage: NewMessage,
     UserUpdated: UserUpdated,
     TopicFollowed: TopicFollowed,
-    TopicUnfollowed: TopicUnfollowed,
     FollowedTopics: FollowedTopics,
     FollowedTopicUpdated: FollowedTopicUpdated,
     Messages: Messages,
@@ -261,6 +259,7 @@ export type CommandsMap = {
     Ping: CommandDefinition<Ping, EventsMap['Pong']>,
     ReportAbuse: CommandDefinition<ReportAbuse, EventsMap['Ok']>,
     GetUserInfo: CommandDefinition<GetUserInfo, EventsMap['UserInfo']>,
+    SetSessionData: CommandDefinition<SetSessionData, EventsMap['Ok']>,
      // Space commands
     GetDiscoverableSpaces: CommandDefinition<GetDiscoverableSpaces, EventsMap['DiscoverableSpaces']>,
     JoinSpace: CommandDefinition<JoinSpace, EventsMap['SpaceJoined']>,
@@ -292,7 +291,7 @@ export type CommandsMap = {
     CreateMessage: CommandDefinition<CreateMessage, EventsMap['NewMessage']>,
     Ack: CommandDefinition<Ack, EventsMap['FollowedTopicUpdated'] | EventsMap['Ok']>,
     FollowTopic: CommandDefinition<FollowTopic, EventsMap['TopicFollowed']>,
-    UnfollowTopic: CommandDefinition<UnfollowTopic, EventsMap['TopicUnfollowed']>,
+    UpdateFollowedTopic: CommandDefinition<UpdateFollowedTopic, EventsMap['FollowedTopicUpdated']>,
     GetFollowedTopics: CommandDefinition<GetFollowedTopics, EventsMap['FollowedTopics']>,
     GetMessages: CommandDefinition<GetMessages, EventsMap['Messages']>,
     GetTopics: CommandDefinition<GetTopics, EventsMap['Topics']>,

package/src/state-tracker/MessagesManager.ts

@@ -3,7 +3,6 @@ import {
     NewMessage,
     FollowedTopic,
     TopicFollowed,
-    TopicUnfollowed,
     RoomDeleted,
     RoomLeft,
     TopicDeleted,
@@ -26,6 +25,7 @@ export class MessagesManager {
     private readonly followedTopics = new IndexedCollection<string, ObservableIndexedObjectCollection<FollowedTopic>>();
     private readonly followedTopicsPromises = new PromiseRegistry();
     private readonly deferredSession = new DeferredTask();
+    private readonly unreadSummariesCache = new Map<string, { mentionCount: number, isUnread: boolean }>();
 
     public constructor(private tracker: ChatStateTracker) {
         this.tracker.client.on('Session', ev => this.handleSession(ev));
@@ -33,7 +33,6 @@ export class MessagesManager {
         this.tracker.client.on('NewTopic', ev => this.handleNewTopic(ev));
         this.tracker.client.on('FollowedTopicUpdated', ev => this.handleFollowedTopicUpdated(ev));
         this.tracker.client.on('TopicFollowed', ev => this.handleTopicFollowed(ev));
-        this.tracker.client.on('TopicUnfollowed', ev => this.handleTopicUnfollowed(ev));
         this.tracker.client.on('NewMessage', ev => this.handleNewMessage(ev));
         this.tracker.client.on('RoomDeleted', ev => this.handleRoomDeleted(ev));
         this.tracker.client.on('RoomLeft', ev => this.handleRoomLeft(ev));
@@ -107,9 +106,9 @@ export class MessagesManager {
     }
 
     /**
-     * Batch acknowledge all missed messages from any topics in given room.
+     * Batch acknowledge all messages for given room.
      */
-    public async ackRoomFollowedTopics(roomId: string): Promise<void> {
+    public async ackRoom(roomId: string): Promise<void> {
         const collection = await this.getRoomFollowedTopics(roomId);
 
         if (! collection) {
@@ -117,27 +116,75 @@ export class MessagesManager {
         }
 
         for (const followedTopic of collection.items) {
-            if (followedTopic.missed) {
+            if (followedTopic.isUnread) {
                 await this.tracker.client.send('Ack', {location: followedTopic.location});
             }
         }
     }
 
     /**
-     * Calculate missed messages from any topic in given room.
+     * Calculate missed messages with mentions from any topic in given room.
      * @return Undefined if you are not in room.
      */
-    public async calculateRoomMissedMessages(roomId: string): Promise<number | undefined> {
-        const collection = await this.getRoomFollowedTopics(roomId);
+    public async summarizeUnreadMessages(location: ChatLocation): Promise<{ mentionCount: number, isUnread: boolean }> {
+        const cacheKey = location.topicId
+            ? `topic:${location.roomId}:${location.topicId}`
+            : location.roomId
+                ? `room:${location.roomId}`
+                : location.spaceId
+                    ? `space:${location.spaceId}`
+                    : 'spaceless';
+
+        if (this.unreadSummariesCache.has(cacheKey)) {
+            return this.unreadSummariesCache.get(cacheKey)!;
+        }
+
+        let roomIds: string[] = [];
+        let targetTopicId: string | undefined;
+        const rooms = await this.tracker.rooms.get();
 
-        if (collection) {
-            return collection.items.reduce(
-                (previousValue: number, currentValue) => previousValue + (currentValue.missed ?? 0),
-                0,
-            ) as number;
+        if (location.topicId) {
+            if (!location.roomId) {
+                throw new Error("roomId is required when querying by topicId");
+            }
+            roomIds = [location.roomId];
+            targetTopicId = location.topicId;
+        } else if (location.roomId) {
+            roomIds = [location.roomId];
+        } else if (location.spaceId) {
+            await this.cacheSpaceFollowedTopics(location.spaceId);
+            roomIds = rooms.findBy('spaceId', location.spaceId).items.map(r => r.id);
+        } else {
+            roomIds = rooms.items.filter(r => !r.spaceId).map(r => r.id);
         }
 
-        return undefined;
+        let mentionCount = 0;
+        let isUnread = false;
+
+        for (const roomId of roomIds) {
+            const collection = await this.getRoomFollowedTopics(roomId);
+
+            if (!collection) {
+                continue;
+            }
+
+            for (const topic of collection.items) {
+                if (targetTopicId && topic.location.topicId !== targetTopicId) {
+                    continue;
+                }
+
+                if (topic.isUnread) {
+                    isUnread = true;
+                }
+
+                mentionCount += (topic.mentionCount ?? 0);
+            }
+        }
+
+        const result = { mentionCount, isUnread };
+        this.unreadSummariesCache.set(cacheKey, result);
+
+        return result;
     }
 
     /**
@@ -146,6 +193,7 @@ export class MessagesManager {
      */
     public _deleteByTopicIds(roomId: string, ...topicIds: string[]): void {
         this.followedTopics.get(roomId)?.delete(...topicIds);
+        topicIds.forEach(topicId => this.invalidateUnreadSummaries(roomId, topicId));
     }
 
     /**
@@ -172,24 +220,70 @@ export class MessagesManager {
         return message || null;
     }
 
+    /**
+     * Wyczyść cache celowo, tylko dla lokalizacji których dotyczy zmiana.
+     */
+    private invalidateUnreadSummaries(roomId?: string, topicId?: string): void {
+        if (!roomId) {
+            this.unreadSummariesCache.clear();
+            return;
+        }
+
+        this.unreadSummariesCache.delete(`room:${roomId}`);
+
+        if (topicId) {
+            this.unreadSummariesCache.delete(`topic:${roomId}:${topicId}`);
+        } else {
+            for (const key of this.unreadSummariesCache.keys()) {
+                if (key.startsWith(`topic:${roomId}:`)) {
+                    this.unreadSummariesCache.delete(key);
+                }
+            }
+        }
+
+        for (const key of this.unreadSummariesCache.keys()) {
+            if (key.startsWith('space:') || key === 'spaceless') {
+                this.unreadSummariesCache.delete(key);
+            }
+        }
+    }
+
+    private invalidateUnreadSummariesForRooms(roomIds: string[]): void {
+        const roomIdsSet = new Set(roomIds);
+        roomIds.forEach(roomId => {
+            this.unreadSummariesCache.delete(`room:${roomId}`);
+        });
+
+        for (const key of this.unreadSummariesCache.keys()) {
+            if (key.startsWith('space:') || key === 'spaceless') {
+                this.unreadSummariesCache.delete(key);
+                continue;
+            }
+            if (key.startsWith('topic:')) {
+                const parts = key.split(':');
+                if (parts.length >= 2 && roomIdsSet.has(parts[1])) {
+                    this.unreadSummariesCache.delete(key);
+                }
+            }
+        }
+    }
+
     private createHistoryForNewRoom(room: Room): void {
         this.roomHistories.set([room.id, new RoomMessagesHistory(room, this.tracker)]);
     }
 
     private handleNewMessage(ev: NewMessage): void {
-        this.updateLocallyFollowedTopicOnNewMessage(ev);
+        void this.updateLocallyFollowedTopicOnNewMessage(ev);
     }
 
     private handleFollowedTopicUpdated(ev: FollowedTopicUpdated): void {
         this.followedTopics.get(ev.followedTopic.location.roomId)?.set(ev.followedTopic);
+        this.invalidateUnreadSummaries(ev.followedTopic.location.roomId, ev.followedTopic.location.topicId);
     }
 
     private handleTopicFollowed(ev: TopicFollowed): void {
         this.setFollowedTopicsArray([ev.followedTopic.location.roomId], [ev.followedTopic]);
-    }
-
-    private handleTopicUnfollowed(ev: TopicUnfollowed): void {
-        this.followedTopics.get(ev.location.roomId)?.delete(ev.location.topicId);
+        this.invalidateUnreadSummaries(ev.followedTopic.location.roomId, ev.followedTopic.location.topicId);
     }
 
     private handleRoomDeleted(ev: RoomDeleted): void {
@@ -218,23 +312,26 @@ export class MessagesManager {
             const followedTopic = result.data.followedTopics[0];
             if (followedTopic) {
                 this.followedTopics.get(ev.roomId).set(followedTopic);
+                this.invalidateUnreadSummaries(ev.roomId, ev.topic.id);
             }
         }
     }
 
     private handleTopicDeleted(ev: TopicDeleted): void {
         this.followedTopics.get(ev.location.roomId)?.delete(ev.location.topicId);
+        this.invalidateUnreadSummaries(ev.location.roomId, ev.location.topicId);
     }
 
     private handleSession(ev: Session): void {
         this.followedTopics.deleteAll();
         this.followedTopicsPromises.forgetAll();
+        this.invalidateUnreadSummaries();
         this.roomHistories.deleteAll();
         ev.state.rooms.forEach(room => this.createHistoryForNewRoom(room));
         this.deferredSession.resolve();
     }
 
-    private updateLocallyFollowedTopicOnNewMessage(ev: NewMessage): void {
+    private async updateLocallyFollowedTopicOnNewMessage(ev: NewMessage): Promise<void> {
         const roomFollowedTopics = this.followedTopics.get(ev.message.location.roomId);
         const followedTopic = roomFollowedTopics?.get(ev.message.location.topicId);
 
@@ -250,12 +347,31 @@ export class MessagesManager {
         if (isMe) {
             // Reset missed messages count if new message is authored by me
             update = {missed: 0, lastAckMessageId: ev.message.id};
+        } else if (ev.message.type === 'Text') {
+            // ...check for mentions if it's text message...
+            const member = await this.tracker.rooms.getMe(ev.message.location.roomId);
+            const roleIds = [...(member.spaceMember?.roles ?? []), ...member.roles];
+            const mentionHandlers = [
+                ...roleIds.map(id => `<@&${id}>`),
+                `<@${ev.message.author.user.id}>`,
+            ];
+            const mentionExists = mentionHandlers.some(handler => ev.message.content.includes(handler));
+
+            update = {
+                missed: followedTopic.missed === null ? null : followedTopic.missed + 1,
+                isUnread: true,
+                mentionCount: followedTopic.mentionCount + (mentionExists ? 1 : 0),
+            };
         } else {
-            // ...add 1 otherwise
-            update = {missed: followedTopic.missed === null ? null : followedTopic.missed + 1};
+            // ...or just mark as unread.
+            update = {
+                missed: followedTopic.missed === null ? null : followedTopic.missed + 1,
+                isUnread: true,
+            };
         }
 
         roomFollowedTopics.set({...followedTopic, ...update});
+        this.invalidateUnreadSummaries(ev.message.location.roomId, ev.message.location.topicId);
     }
 
     private setFollowedTopicsArray(roomIds: string[], followedTopics: FollowedTopic[]): void {
@@ -278,10 +394,13 @@ export class MessagesManager {
                 this.followedTopics.get(roomId).set(...roomToTopics[roomId]);
             }
         });
+
+        this.invalidateUnreadSummariesForRooms(roomIds);
     }
 
     private clearRoomFollowedTopicsStructures(roomId: string): void {
         this.followedTopics.delete(roomId);
         this.followedTopicsPromises.forget(roomId);
+        this.invalidateUnreadSummaries(roomId);
     }
 }

package/src/types/src/index.ts

@@ -77,9 +77,8 @@ import { Owners } from "./schemes/events/Owners";
 import { Ok } from "./schemes/events/Ok";
 import {FollowTopic} from "./schemes/commands/FollowTopic";
 import {FollowedTopics} from "./schemes/events/FollowedTopics";
-import {FollowedTopic} from "./schemes/FollowedTopic";
-import {UnfollowTopic} from "./schemes/commands/UnfollowTopic";
-import {TopicUnfollowed} from "./schemes/events/TopicUnfollowed";
+import {FollowedTopic, NotificationLevel} from "./schemes/FollowedTopic";
+import {UpdateFollowedTopic} from "./schemes/commands/UpdateFollowedTopic";
 import {TopicFollowed} from "./schemes/events/TopicFollowed";
 import {GetFollowedTopics} from "./schemes/commands/GetFollowedTopics";
 import {FollowedTopicUpdated} from "./schemes/events/FollowedTopicUpdated";
@@ -134,6 +133,7 @@ import {GetRelationships} from "./schemes/commands/GetRelationships";
 import {GetUserInfo} from "./schemes/commands/GetUserInfo";
 import {UserInfo} from "./schemes/events/UserInfo";
 import {UserInformation} from "./schemes/UserInformation";
+import {SetSessionData, SessionPush} from "./schemes/commands/SetSessionData";
 
 export {
     // objects
@@ -155,6 +155,7 @@ export {
     SpaceMember,
     Topic,
     FollowedTopic,
+    NotificationLevel,
     User,
     UserState,
     PermissionOverwritesValue,
@@ -169,6 +170,7 @@ export {
     UserRelationshipType,
     CreateTopicInitialMessage,
     UserInformation,
+    SessionPush,
     // events
     Bye,
     Error,
@@ -178,7 +180,6 @@ export {
     NewRoom,
     NewTopic,
     TopicFollowed,
-    TopicUnfollowed,
     FollowedTopics,
     FollowedTopicUpdated,
     ComputedPermissions,
@@ -235,7 +236,7 @@ export {
     CreateSpace,
     CreateTopic,
     FollowTopic,
-    UnfollowTopic,
+    UpdateFollowedTopic,
     GetFollowedTopics,
     DeassignRole,
     DeleteRole,
@@ -284,4 +285,5 @@ export {
     ReportAbuse,
     RedactMessages,
     GetUserInfo,
+    SetSessionData,
 };

package/src/types/src/schemes/FollowedTopic.ts

@@ -1,7 +1,12 @@
 import {ChatLocation} from "./ChatLocation";
 
+export type NotificationLevel = 'All' | 'Mentions' | 'None';
+
 export interface FollowedTopic {
     location: ChatLocation;
     lastAckMessageId: string | null;
+    notificationLevel: NotificationLevel;
     missed: number | null;
+    isUnread: boolean;
+    mentionCount: number;
 }

package/src/types/src/schemes/commands/SetSessionData.ts

@@ -0,0 +1,9 @@
+export interface SessionPush {
+    token: string;
+    platform: 'ios' | 'android' | 'web';
+}
+
+export interface SetSessionData {
+    clientFocused?: boolean;
+    push?: SessionPush;
+}

package/src/types/src/schemes/commands/UpdateFollowedTopic.ts

@@ -0,0 +1,7 @@
+import {ChatLocation} from "../ChatLocation";
+import {NotificationLevel} from "../FollowedTopic";
+
+export interface UpdateFollowedTopic {
+    location: ChatLocation;
+    notificationLevel?: NotificationLevel;
+}

package/tsconfig.json

@@ -1,17 +1,17 @@
-{
-    "compilerOptions": {
-      "noImplicitAny": true,
-      "outDir": "build/types",
-      "module": "esnext",
-      "target": "es5",
-      "allowJs": true,
-      "sourceMap": true,
-      "declaration": true,
-      "emitDeclarationOnly": true,
-      "suppressImplicitAnyIndexErrors": true,
-      "lib": ["es2018", "dom"],
-      "moduleResolution": "node",
-    },
-    "include": ["src"],
-    "exclude": ["src/**/tests"],
+{
+    "compilerOptions": {
+      "noImplicitAny": true,
+      "outDir": "build/types",
+      "module": "esnext",
+      "target": "es2015",
+      "allowJs": true,
+      "sourceMap": true,
+      "declaration": true,
+      "emitDeclarationOnly": true,
+      "suppressImplicitAnyIndexErrors": true,
+      "lib": ["es2018", "dom"],
+      "moduleResolution": "node",
+    },
+    "include": ["src"],
+    "exclude": ["src/**/tests"],
 }

package/src/types/src/schemes/commands/UnfollowTopic.ts

@@ -1,5 +0,0 @@
-import {ChatLocation} from "../ChatLocation";
-
-export interface UnfollowTopic {
-    location: ChatLocation;
-}