diff --git a/webinterface.py b/webinterface.py index 85a19386..1d4975e7 100644 --- a/webinterface.py +++ b/webinterface.py @@ -1644,7 +1644,8 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \ galleryStr='' isAnnounced=False if postJsonObject['type']=='Announce': - postJsonAnnounce=downloadAnnounce(session,baseDir,httpPrefix,nickname,domain,postJsonObject,projectVersion) + postJsonAnnounce= \ + downloadAnnounce(session,baseDir,httpPrefix,nickname,domain,postJsonObject,projectVersion) if not postJsonAnnounce: return '' postJsonObject=postJsonAnnounce @@ -1796,8 +1797,7 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \ '\n' + ' \n\n' attachmentStr+= \ '' \ ''+imageDescription+'\n' @@ -2126,19 +2126,24 @@ def htmlTimeline(translate: {},pageNumber: int, \ if pageNumber>1: tlStr+='
' tlStr+='
\n' + prevStr='' for item in timelineJson['orderedItems']: if item['type']=='Create' or item['type']=='Announce': itemCtr+=1 avatarUrl=getPersonAvatarUrl(baseDir,item['actor'],personCache) - tlStr+= \ - individualPostAsHtml(iconsDir,translate,pageNumber, \ - baseDir,session,wfRequest,personCache, \ - nickname,domain,port,item,avatarUrl,True, \ - allowDeletion, \ - httpPrefix,projectVersion,boxName, \ - boxName!='dm', \ - showIndividualPostIcons, \ - manuallyApproveFollowers,False) + currTlStr= \ + individualPostAsHtml(iconsDir,translate,pageNumber, \ + baseDir,session,wfRequest,personCache, \ + nickname,domain,port,item,avatarUrl,True, \ + allowDeletion, \ + httpPrefix,projectVersion,boxName, \ + boxName!='dm', \ + showIndividualPostIcons, \ + manuallyApproveFollowers,False) + # avoid repeated posts + if currTlStr!=prevStr: + tlStr+=currTlStr + prevStr=currTlStr if boxName=='tlmedia': tlStr+='
\n'