Automatically fetch a page of backlog if the channel doesn't have eno…

…ugh events downloaded
irccloud · Sep 9, 2019 · c679ceb · c679ceb
1 parent 663926c
commit c679ceb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/IRCCloud/Classes/EventsTableView.h b/IRCCloud/Classes/EventsTableView.h
@@ -67,7 +67,7 @@
     NSTimeInterval _maxEid, _minEid, _currentCollapsedEid, _earliestEid, _eidToOpen, _lastCollapsedEid;
     NSInteger _newMsgs, _newHighlights, _lastSeenEidPos, _bottomRow;
     NSString *_lastCollpasedDay;
-    BOOL _requestingBacklog, _ready;
+    BOOL _requestingBacklog, _ready, _shouldAutoFetch;
     NSTimer *_heartbeatTimer;
     NSTimer *_scrollTimer;
     NSTimer *_reloadTimer;

diff --git a/IRCCloud/Classes/EventsTableView.m b/IRCCloud/Classes/EventsTableView.m
@@ -1977,6 +1977,8 @@ - (void)refresh {
         __timestampWidth += 8;
 
         NSArray *events = [[EventsDataSource sharedInstance] eventsForBuffer:self->_buffer.bid];
+        _shouldAutoFetch = !_requestingBacklog && events.count < 50;
+
         if(events.count) {
             NSMutableDictionary *uuids = [[NSMutableDictionary alloc] init];
             for(int i = 0; i < events.count; i++) {
@@ -2087,6 +2089,9 @@ - (void)refresh {
             self->_tableView.tableHeaderView = nil;
         }
 
+        if(_earliestEid == _buffer.min_eid)
+            self->_shouldAutoFetch = NO;
+
         @try {
             if(self->_requestingBacklog && backlogEid > 0 && _buffer.scrolledUp) {
                 int markerPos = -1;
@@ -2176,7 +2181,7 @@ - (void)refresh {
             [self scrollViewDidScroll:self->_tableView];
             [self->_tableView flashScrollIndicators];
 
-            if(self->_buffer.deferred && self->_conn.state == kIRCCloudStateConnected && self->_conn.ready) {
+            if((self->_buffer.deferred || (self->_shouldAutoFetch && (rows.count == 0 || [[rows objectAtIndex:0] row] == 0))) && self->_conn.state == kIRCCloudStateConnected && self->_conn.ready) {
                 [self loadMoreBacklogButtonPressed:nil];
             }
 

diff --git a/build-scripts/BUILD b/build-scripts/BUILD
@@ -1 +1 @@
-49
+50