polfan-server-js-client 0.1.94 → 0.1.96

package/build/index.js

@@ -654,8 +654,14 @@ var MessagesManager = /*#__PURE__*/function () {
     this.tracker = tracker;
     MessagesManager_defineProperty(this, "list", new IndexedCollection());
     MessagesManager_defineProperty(this, "followedTopics", new IndexedCollection());
-    this.tracker.client.on('NewMessage', function (ev) {
-      return _this.handleNewMessage(ev);
+    this.tracker.client.on('Session', function (ev) {
+      return _this.handleSession(ev);
+    });
+    this.tracker.client.on('RoomJoined', function (ev) {
+      return _this.handleRoomJoin(ev);
+    });
+    this.tracker.client.on('NewTopic', function (ev) {
+      return _this.handleNewTopic(ev);
     });
     this.tracker.client.on('FollowedTopicUpdated', function (ev) {
       return _this.handleFollowedTopicUpdated(ev);
@@ -666,24 +672,18 @@ var MessagesManager = /*#__PURE__*/function () {
     this.tracker.client.on('TopicUnfollowed', function (ev) {
       return _this.handleTopicUnfollowed(ev);
     });
+    this.tracker.client.on('NewMessage', function (ev) {
+      return _this.handleNewMessage(ev);
+    });
     this.tracker.client.on('RoomDeleted', function (ev) {
       return _this.handleRoomDeleted(ev);
     });
-    this.tracker.client.on('RoomJoined', function (ev) {
-      return _this.handleRoomJoin(ev);
-    });
     this.tracker.client.on('RoomLeft', function (ev) {
       return _this.handleRoomLeft(ev);
     });
-    this.tracker.client.on('NewTopic', function (ev) {
-      return _this.handleNewTopic(ev);
-    });
     this.tracker.client.on('TopicDeleted', function (ev) {
       return _this.handleTopicDeleted(ev);
     });
-    this.tracker.client.on('Session', function (ev) {
-      return _this.handleSession(ev);
-    });
   }
 
   /**
@@ -835,8 +835,8 @@ var MessagesManager = /*#__PURE__*/function () {
       (_this$followedTopics$ = this.followedTopics.get(roomId)) === null || _this$followedTopics$ === void 0 ? void 0 : _this$followedTopics$["delete"].apply(_this$followedTopics$, topicIds);
     }
   }, {
-    key: "handleNewTopics",
-    value: function handleNewTopics(roomId) {
+    key: "createHistoryForNewTopic",
+    value: function createHistoryForNewTopic(roomId) {
       for (var _len2 = arguments.length, newTopics = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
         newTopics[_key2 - 1] = arguments[_key2];
       }
@@ -898,7 +898,7 @@ var MessagesManager = /*#__PURE__*/function () {
     key: "handleRoomJoin",
     value: function handleRoomJoin(ev) {
       if (ev.room.defaultTopic) {
-        this.handleNewTopics(ev.room.id, ev.room.defaultTopic);
+        this.createHistoryForNewTopic(ev.room.id, ev.room.defaultTopic);
       }
     }
   }, {
@@ -908,9 +908,43 @@ var MessagesManager = /*#__PURE__*/function () {
     }
   }, {
     key: "handleNewTopic",
-    value: function handleNewTopic(ev) {
-      this.handleNewTopics(ev.roomId, ev.topic);
-    }
+    value: function () {
+      var _handleNewTopic = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(ev) {
+        var result, followedTopic;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) {
+            switch (_context4.prev = _context4.next) {
+              case 0:
+                this.createHistoryForNewTopic(ev.roomId, ev.topic);
+                if (!this.followedTopics.has(ev.roomId)) {
+                  _context4.next = 7;
+                  break;
+                }
+                _context4.next = 4;
+                return this.tracker.client.send('GetFollowedTopics', {
+                  location: {
+                    roomId: ev.roomId,
+                    topicId: ev.topic.id
+                  }
+                });
+              case 4:
+                result = _context4.sent;
+                followedTopic = result.data.followedTopics[0];
+                if (followedTopic) {
+                  this.followedTopics.get(ev.roomId).set(followedTopic);
+                }
+              case 7:
+              case "end":
+                return _context4.stop();
+            }
+          }
+        }, _callee4, this);
+      }));
+      function handleNewTopic(_x4) {
+        return _handleNewTopic.apply(this, arguments);
+      }
+      return handleNewTopic;
+    }()
   }, {
     key: "handleTopicDeleted",
     value: function handleTopicDeleted(ev) {
@@ -923,7 +957,7 @@ var MessagesManager = /*#__PURE__*/function () {
       var _this2 = this;
       ev.state.rooms.forEach(function (room) {
         if (room.defaultTopic) {
-          _this2.handleNewTopics(room.id, room.defaultTopic);
+          _this2.createHistoryForNewTopic(room.id, room.defaultTopic);
         }
       });
     }
@@ -931,13 +965,13 @@ var MessagesManager = /*#__PURE__*/function () {
     key: "updateLocallyFollowedTopicOnNewMessage",
     value: function updateLocallyFollowedTopicOnNewMessage(ev) {
       var _this$tracker$me;
-      var followedTopic = this.followedTopics.get(ev.location.roomId);
-      if (!followedTopic) {
-        // If we don't follow ack reports for this room, skip
+      var roomFollowedTopics = this.followedTopics.get(ev.location.roomId);
+      var followedTopic = roomFollowedTopics.get(ev.location.topicId);
+      if (!roomFollowedTopics || !followedTopic) {
+        // Skip if we don't follow this room or targeted topic
         return;
       }
       var isMe = ev.message.author.id === ((_this$tracker$me = this.tracker.me) === null || _this$tracker$me === void 0 ? void 0 : _this$tracker$me.id);
-      var currentFollowedTopic = followedTopic.get(ev.location.topicId);
       var update;
       if (isMe) {
         // Reset missed messages count if new message is authored by me
@@ -949,11 +983,11 @@ var MessagesManager = /*#__PURE__*/function () {
       } else {
         // ...add 1 otherwise
         update = {
-          missed: currentFollowedTopic.missed === null ? null : currentFollowedTopic.missed + 1,
-          missedMoreThan: currentFollowedTopic.missedMoreThan === null ? null : currentFollowedTopic.missedMoreThan
+          missed: followedTopic.missed === null ? null : followedTopic.missed + 1,
+          missedMoreThan: followedTopic.missedMoreThan === null ? null : followedTopic.missedMoreThan
         };
       }
-      followedTopic.set(_objectSpread(_objectSpread({}, currentFollowedTopic), update));
+      roomFollowedTopics.set(_objectSpread(_objectSpread({}, followedTopic), update));
     }
   }, {
     key: "setFollowedTopicsArray",