mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't show repeat icon on DMs

master
Bob Mottram 2019-08-25 18:28:42 +01:00
parent 7019bd86da
commit 88a320603b
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
webinterface.py
View File

@ -266,7 +266,7 @@ def htmlHashtagSearch(baseDir: str,hashtag: str,pageNumber: int,postsPerPage: in
nickname,domain,port,postJsonObject, \ nickname,domain,port,postJsonObject, \
None,True,False, \ None,True,False, \
httpPrefix,projectVersion, \ httpPrefix,projectVersion, \
False) False,False)
index-=1 index-=1
if endIndex>0: if endIndex>0:
@ -736,7 +736,7 @@ def htmlProfilePosts(baseDir: str,httpPrefix: str, \
individualPostAsHtml(baseDir,session,wfRequest,personCache, \ individualPostAsHtml(baseDir,session,wfRequest,personCache, \
nickname,domain,port,item,None,True,False, \ nickname,domain,port,item,None,True,False, \
httpPrefix,projectVersion, \ httpPrefix,projectVersion, \
False) False,False)
return profileStr return profileStr
def htmlProfileFollowing(baseDir: str,httpPrefix: str, \ def htmlProfileFollowing(baseDir: str,httpPrefix: str, \
@ -1088,6 +1088,7 @@ def individualPostAsHtml(baseDir: str, \
avatarUrl: str, showAvatarDropdown: bool, avatarUrl: str, showAvatarDropdown: bool,
allowDeletion: bool, \ allowDeletion: bool, \
httpPrefix: str, projectVersion: str, \ httpPrefix: str, projectVersion: str, \
showRepeats=True,
showIcons=False) -> str: showIcons=False) -> str:
""" Shows a single post as html """ Shows a single post as html
""" """
@ -1160,7 +1161,7 @@ def individualPostAsHtml(baseDir: str, \
else: else:
titleStr+='<a href="'+messageId+'">@'+actorNickname+'@'+actorDomain+'</a>' titleStr+='<a href="'+messageId+'">@'+actorNickname+'@'+actorDomain+'</a>'
if not isDM(postJsonObject): if showRepeats:
if isAnnounced: if isAnnounced:
if postJsonObject['object'].get('attributedTo'): if postJsonObject['object'].get('attributedTo'):
announceNickname=getNicknameFromActor(postJsonObject['object']['attributedTo']) announceNickname=getNicknameFromActor(postJsonObject['object']['attributedTo'])
@ -1262,7 +1263,7 @@ def individualPostAsHtml(baseDir: str, \
footerStr='<span class="'+timeClass+'">'+publishedStr+'</span>\n' footerStr='<span class="'+timeClass+'">'+publishedStr+'</span>\n'
announceStr='' announceStr=''
if not isModerationPost: if not isModerationPost and showRepeats:
# don't allow announce/repeat of your own posts # don't allow announce/repeat of your own posts
announceIcon='repeat_inactive.png' announceIcon='repeat_inactive.png'
announceLink='repeat' announceLink='repeat'
@ -1446,6 +1447,7 @@ def htmlTimeline(pageNumber: int,itemsPerPage: int,session,baseDir: str, \
nickname,domain,port,item,avatarUrl,True, \ nickname,domain,port,item,avatarUrl,True, \
allowDeletion, \ allowDeletion, \
httpPrefix,projectVersion, httpPrefix,projectVersion,
boxName!='dm',
showIndividualPostIcons) showIndividualPostIcons)
# page down arrow # page down arrow
@ -1496,7 +1498,7 @@ def htmlIndividualPost(baseDir: str,session,wfRequest: {},personCache: {}, \
postStr+= \ postStr+= \
individualPostAsHtml(baseDir,session,wfRequest,personCache, \ individualPostAsHtml(baseDir,session,wfRequest,personCache, \
nickname,domain,port,postJsonObject,None,True,False, \ nickname,domain,port,postJsonObject,None,True,False, \
httpPrefix,projectVersion,False) httpPrefix,projectVersion,False,False)
messageId=postJsonObject['id'].replace('/activity','') messageId=postJsonObject['id'].replace('/activity','')
# show the previous posts # show the previous posts
@ -1511,7 +1513,7 @@ def htmlIndividualPost(baseDir: str,session,wfRequest: {},personCache: {}, \
nickname,domain,port,postJsonObject, \ nickname,domain,port,postJsonObject, \
None,True,False, \ None,True,False, \
httpPrefix,projectVersion, \ httpPrefix,projectVersion, \
False)+postStr False,False)+postStr
# show the following posts # show the following posts
postFilename=locatePost(baseDir,nickname,domain,messageId) postFilename=locatePost(baseDir,nickname,domain,messageId)
@ -1527,7 +1529,7 @@ def htmlIndividualPost(baseDir: str,session,wfRequest: {},personCache: {}, \
postStr+= \ postStr+= \
individualPostAsHtml(baseDir,session,wfRequest,personCache, \ individualPostAsHtml(baseDir,session,wfRequest,personCache, \
nickname,domain,port,item,None,True,False, \ nickname,domain,port,item,None,True,False, \
httpPrefix,projectVersion,False) httpPrefix,projectVersion,False,False)
return htmlHeader()+postStr+htmlFooter() return htmlHeader()+postStr+htmlFooter()
def htmlPostReplies(baseDir: str,session,wfRequest: {},personCache: {}, \ def htmlPostReplies(baseDir: str,session,wfRequest: {},personCache: {}, \
@ -1540,7 +1542,7 @@ def htmlPostReplies(baseDir: str,session,wfRequest: {},personCache: {}, \
for item in repliesJson['orderedItems']: for item in repliesJson['orderedItems']:
repliesStr+=individualPostAsHtml(baseDir,session,wfRequest,personCache, \ repliesStr+=individualPostAsHtml(baseDir,session,wfRequest,personCache, \
nickname,domain,port,item,None,True,False, \ nickname,domain,port,item,None,True,False, \
httpPrefix,projectVersion,False) httpPrefix,projectVersion,False,False)
return htmlHeader()+repliesStr+htmlFooter() return htmlHeader()+repliesStr+htmlFooter()
@ -1908,7 +1910,8 @@ def htmlProfileAfterSearch(baseDir: str,path: str,httpPrefix: str, \
session,wfRequest,personCache, \ session,wfRequest,personCache, \
nickname,domain,port, \ nickname,domain,port, \
item,avatarUrl,False,False, \ item,avatarUrl,False,False, \
httpPrefix,projectVersion,False) httpPrefix,projectVersion, \
False,False)
i+=1 i+=1
if i>=20: if i>=20:
break break