Merge pull request #1665 from hippware/1651

Addresses #1651

Author: Eric Kirkham

src/store/eventStore.js

@@ -30,17 +30,14 @@ const EVENT_LIST_MAX_SIZE = 50;
 export class EventStore {
   notifications = xmpp.message.filter(msg => msg.notification);
   @observable loading: boolean = false;
-  processedEvents: number = 0;
 
   constructor() {
     this.notifications.onValue(this.onNotification);
   }
 
   async start() {
     this.loading = true;
-    if (!model.events.version) {
-      await this.accumulateItems();
-    }
+    await this.accumulateItems(model.events.version);
     autorun(() => {
       if (model.connected) this.request();
     });
@@ -49,7 +46,7 @@ export class EventStore {
   }
 
   request() {
-    home.request(model.events.version);
+    home.request(model.events.nextVersion || model.events.version);
   }
 
   @action
@@ -104,8 +101,7 @@ export class EventStore {
             }
           }
 
-          const eventMessage = bot ? new EventBotShare(id, botFactory.create({id: bot.id, server: bot.server}), time, msg) : new EventMessage(id, msg.from, msg);
-          return eventMessage;
+          return bot ? new EventBotShare(id, botFactory.create({id: bot.id, server: bot.server}), time, msg) : new EventMessage(id, msg.from, msg);
         } else {
           log.log('& UNSUPPORTED ITEM!', item, {level: log.levels.WARNING});
         }
@@ -124,22 +120,29 @@ export class EventStore {
   nextVersion: ?string = null;
 
   async onNotification({notification, delay}) {
-    log.log('Notification', notification);
+    log.log('onNotification', notification);
     let item;
     if (notification['reference-changed']) {
       const {id, server} = notification['reference-changed'].bot;
       const bot = botFactory.create({id, server});
       // don't download posts for the bot (it will be loaded later)
       await botStore.download(bot, false);
     } else if (notification.item) {
-      item = notification.item;
+      const {item} = notification;
       const newItem = this.processItem(item, delay);
       if (!newItem) {
         return;
       }
-      model.events.listToAdd.push(newItem);
       if (newItem.bot) {
-        await botStore.download(newItem.bot);
+        if (!model.eventBots.get(newItem.bot.id)) {
+          botStore.download(newItem.bot, false).then(() => {
+            model.eventBots.add(newItem.bot);
+            model.events.listToAdd.push(newItem);
+          });
+        } else {
+          log.log(`Bot ${newItem.bot.id} already exists!`);
+          model.events.listToAdd.push(newItem);
+        }
       }
       if (item.version) model.events.nextVersion = item.version;
       else log.log('item has no version!', item);
@@ -154,7 +157,6 @@ export class EventStore {
   }
 
   finish() {
-    this.processedEvents = 0;
     this.loading = false;
   }
 
@@ -172,28 +174,37 @@ export class EventStore {
   }
 
   @action
-  async accumulateItems(count: number = EVENT_PAGE_SIZE, current: number = 0): Promise<void> {
+  async accumulateItems(version, count: number = EVENT_PAGE_SIZE, current: number = 0): Promise<void> {
     const {earliestId} = model.events;
-    const data = await home.items(earliestId, count, true);
-    if (!data.items.length) {
+    const data = version ? await home.items(null, count, true, version) : await home.items(earliestId, count, true);
+    if (!version && !data.items.length) {
       model.events.finished = true;
       return;
     }
     data.bots.forEach(bot => model.eventBots.add(botFactory.create(bot)));
     let newEventCount = 0;
     data.items.map(this.processItem).forEach((p) => {
       if (p) {
-        model.events.add(p);
+        if (version) {
+          model.events.listToAdd.push(p);
+        } else {
+          model.events.add(p);
+        }
         newEventCount += 1;
       }
     });
-    const latest = data.version;
-    if (latest) model.events.version = latest;
+    if (data.version) {
+      if (version) {
+        model.events.nextVersion = data.version;
+      } else if (!model.events.version) {
+        model.events.version = data.version;
+      }
+    }
 
-    if (newEventCount + current < count && this.processedEvents < data.count) {
+    if (newEventCount + current < count && data.count) {
       // account for the case where none are processed and earliestId remains the same
       if (newEventCount === 0 && model.events.earliestId === earliestId) count += EVENT_PAGE_SIZE;
-      await this.accumulateItems(count, newEventCount + current);
+      await this.accumulateItems(version, count, newEventCount + current);
     }
   }
 
@@ -222,10 +233,6 @@ export class EventStore {
       listToAdd.forEach((e) => {
         try {
           model.events.add(e);
-          // we must add referenced bot to 'eventBots' for serialization (HS contains only references!)
-          if (e.bot) {
-            model.eventBots.add(e.bot);
-          }
         } catch (err) {
           log.log('Incorporate updates error, could not add', e, err);
         }

src/store/xmpp/homeService.js

@@ -13,9 +13,14 @@ import * as log from '../../utils/log';
 
 @autobind
 class HomeService {
-  async items(before?: string, limit: number = 3, excludeDeleted: boolean = false): Promise<Object> {
-    log.log('REQUEST HS EVENTS', before, limit, {level: log.levels.VERBOSE});
-    const iq = $iq({type: 'get', to: xmpp.provider.username}).c('items', {xmlns: NS, node: 'home_stream'});
+  async items(before?: string, limit: number = 3, excludeDeleted: boolean = false, version): Promise<Object> {
+    log.log('REQUEST HS EVENTS', before, limit, excludeDeleted, version, {level: log.levels.VERBOSE});
+    const iq = $iq({type: 'get', to: xmpp.provider.username});
+    if (version) {
+      iq.c('catchup', {xmlns: NS, node: 'home_stream', version});
+    } else {
+      iq.c('items', {xmlns: NS, node: 'home_stream'});
+    }
     if (excludeDeleted) {
       iq.c('exclude-deleted').up();
     }
@@ -49,7 +54,7 @@ class HomeService {
     if (!Array.isArray(items)) {
       items = [items];
     }
-    return data.items ? {items, bots, version: data.items.version, count: parseInt(data.items.set.count)} : {items, bots};
+    return data.items ? {items, bots, version: data.items.version, count: data.items.set ? parseInt(data.items.set.count) : 0} : {items, bots};
   }
 
   request(version: string): void {