From 8a29d5510cba26c20f27cb01f5e3ad67a81dcad8 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 18 Nov 2019 12:40:38 +0000
Subject: [PATCH] Revert "Always test timeline post type"

This reverts commit fc1878d72a2b7497ff8a3f614b7f2df00fda3117.
---
 posts.py | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/posts.py b/posts.py
index 515bc353..baa6f478 100644
--- a/posts.py
+++ b/posts.py
@@ -2295,9 +2295,8 @@ def isTimelinePost(filePath: str,boxname: str,postsInBox: []) -> bool:
                 if '"Create"' in postStr:
                     if 'mediaType' not in postStr or 'image/' not in postStr:
                         return False
-            if postsInBox!=None:
-                # add the post to the dictionary
-                postsInBox.append(postStr)
+            # add the post to the dictionary
+            postsInBox.append(postStr)
             return True
     return False
 
@@ -2369,24 +2368,24 @@ def createBoxIndexed(session,baseDir: str,boxname: str, \
         with open(indexFilename, 'r') as indexFile:
             while postsCtr<maxPostCtr:
                 postFilename=indexFile.readline()
+
+                # Skip through any posts previous to the current page
+                if postsCtr<int((pageNumber-1)*itemsPerPage):                    
+                    if postFilename:
+                        postsCtr+=1
+                    continue
+                    
                 if not postFilename:
                     continue
 
-                postOnThisTimeline=False
                 # filename of the post without any extension or path
                 postUrl=postFilename.replace('\n','').replace('.json','')
                 # get the full path of the post
                 fullPostFilename= \
                     locatePost(baseDir,nickname,domain,postUrl,False)
                 if fullPostFilename:
-                    if postsCtr<int((pageNumber-1)*itemsPerPage):                    
-                        if isTimelinePost(fullPostFilename,boxname,None):
-                            postOnThisTimeline=True
-                    else:
-                        if isTimelinePost(fullPostFilename,boxname,postsInBox):
-                            postOnThisTimeline=True
-
-                if postOnThisTimeline:
+                    if not isTimelinePost(fullPostFilename,boxname,postsInBox):
+                        continue
                     postsCtr+=1
 
     # Generate first and last entries within header