From 513bb1e684d4d4801ee656e5059b95ca653b19ac Mon Sep 17 00:00:00 2001
From: Rob Petti <rob.petti@gmail.com>
Date: Sat, 26 Nov 2022 13:48:33 -0700
Subject: [PATCH] fix new item count in slow mode

---
 .../stream-statuses/stream-statuses.component.html     | 10 +++++-----
 .../stream-statuses/stream-statuses.component.ts       |  9 ++++++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/app/components/stream/stream-statuses/stream-statuses.component.html b/src/app/components/stream/stream-statuses/stream-statuses.component.html
index 1c7b949c..f839daf8 100644
--- a/src/app/components/stream/stream-statuses/stream-statuses.component.html
+++ b/src/app/components/stream/stream-statuses/stream-statuses.component.html
@@ -5,18 +5,18 @@
         </a>
     </div>
 
-    <div class="stream-toots__new-notification" 
+    <div class="stream-toots__new-notification"
         [class.stream-toots__new-notification--display]="bufferStream && bufferStream.length > 0 && !streamPositionnedAtTop"></div>
 
-    <div class="stream-toots__content flexcroll" #statusstream (scroll)="onScroll()" tabindex="0">       
+    <div class="stream-toots__content flexcroll" #statusstream (scroll)="onScroll()" tabindex="0">
         <div *ngIf="displayError" class="stream-toots__error">{{displayError}}</div>
 
-        <div *ngIf="timelineLoadingMode === 3 && bufferStream && bufferStream.length > 0">
-            <a href (click)="loadBuffer()" class="stream-toots__load-buffer" title="load new items">{{ bufferStream.length }} new item<span *ngIf="bufferStream.length > 1">s</span></a>
+        <div *ngIf="timelineLoadingMode === 3 && bufferStream && numNewItems > 0">
+            <a href (click)="loadBuffer()" class="stream-toots__load-buffer" title="load new items">{{ numNewItems }} new item<span *ngIf="numNewItems > 1">s</span></a>
         </div>
 
         <div class="stream-toots__status" *ngFor="let statusWrapper of statuses" #status>
-            <app-status 
+            <app-status
                 [statusWrapper]="statusWrapper" [isThreadDisplay]="isThread"
                 (browseAccountEvent)="browseAccount($event)" (browseHashtagEvent)="browseHashtag($event)"
                 (browseThreadEvent)="browseThread($event)"></app-status>
diff --git a/src/app/components/stream/stream-statuses/stream-statuses.component.ts b/src/app/components/stream/stream-statuses/stream-statuses.component.ts
index 64d01f45..bea7c0bb 100644
--- a/src/app/components/stream/stream-statuses/stream-statuses.component.ts
+++ b/src/app/components/stream/stream-statuses/stream-statuses.component.ts
@@ -43,6 +43,8 @@ export class StreamStatusesComponent extends TimelineBase {
     private deleteStatusSubscription: Subscription;
     private streams$: Observable<StreamElement[]>;
 
+    numNewItems: number;
+
     constructor(
         protected readonly settingsService: SettingsService,
         protected readonly store: Store,
@@ -101,6 +103,8 @@ export class StreamStatusesComponent extends TimelineBase {
                 });
             }
         });
+
+        this.numNewItems = 0;
     }
 
     ngOnDestroy() {
@@ -133,6 +137,7 @@ export class StreamStatusesComponent extends TimelineBase {
     private resetStream() {
         this.statuses.length = 0;
         this.bufferStream.length = 0;
+        this.numNewItems = 0;
         if (this.websocketStreaming) this.websocketStreaming.dispose();
     }
 
@@ -154,6 +159,7 @@ export class StreamStatusesComponent extends TimelineBase {
                             this.statuses.unshift(wrapper);
                         } else {
                             this.bufferStream.push(update.status);
+                            this.numNewItems++;
                         }
                     }
                 } else if (update.type === EventEnum.delete) {
@@ -201,6 +207,7 @@ export class StreamStatusesComponent extends TimelineBase {
         }
 
         this.bufferStream.length = 0;
+        this.numNewItems = 0;
         return false;
     }
 
@@ -212,7 +219,7 @@ export class StreamStatusesComponent extends TimelineBase {
                 return status.filter(x => !this.isFiltered(x));
             });
     }
-    
+
     private isFiltered(status: Status): boolean {
         if (this.streamElement.hideBoosts) {
             if (status.reblog) {