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

Count number of tags

main
Bob Mottram 2020-02-28 20:50:56 +00:00
parent 4ffd0685d8
commit 666f23ba1d
2 changed files with 21 additions and 6 deletions

3
delete.py
View File

@ -197,7 +197,8 @@ def deletePostPub(session,baseDir: str,federationList: [], \
if ':' not in deletedDomain: if ':' not in deletedDomain:
deletedDomain=deletedDomain+':'+str(deletePort) deletedDomain=deletedDomain+':'+str(deletePort)
objectUrl = deleteHttpsPrefix + '://'+deletedDomain+'/users/'+ \ objectUrl = \
deleteHttpsPrefix + '://'+deletedDomain+'/users/'+ \
deleteNickname+'/statuses/'+str(deleteStatusNumber) deleteNickname+'/statuses/'+str(deleteStatusNumber)
return deletePublic(session,baseDir,federationList, \ return deletePublic(session,baseDir,federationList, \

24
webinterface.py
View File

@ -4797,6 +4797,7 @@ def htmlHashTagSwarm(baseDir: str,actor: str) -> str:
daysSinceEpochStr=str(daysSinceEpoch)+' ' daysSinceEpochStr=str(daysSinceEpoch)+' '
nickname=getNicknameFromActor(actor) nickname=getNicknameFromActor(actor)
tagSwarm=[] tagSwarm=[]
tagSwarmCtr=[]
for subdir, dirs, files in os.walk(baseDir+'/tags'): for subdir, dirs, files in os.walk(baseDir+'/tags'):
for f in files: for f in files:
tagsFilename=os.path.join(baseDir+'/tags',f) tagsFilename=os.path.join(baseDir+'/tags',f)
@ -4807,6 +4808,7 @@ def htmlHashTagSwarm(baseDir: str,actor: str) -> str:
continue continue
if daysSinceEpochStr not in open(tagsFilename).read(): if daysSinceEpochStr not in open(tagsFilename).read():
continue continue
tagCtr=0
with open(tagsFilename, 'r') as tagsFile: with open(tagsFilename, 'r') as tagsFile:
lines=tagsFile.readlines() lines=tagsFile.readlines()
for l in lines: for l in lines:
@ -4819,16 +4821,28 @@ def htmlHashTagSwarm(baseDir: str,actor: str) -> str:
if postDaysSinceEpoch<daysSinceEpoch: if postDaysSinceEpoch<daysSinceEpoch:
break break
if postDaysSinceEpoch==daysSinceEpoch: if postDaysSinceEpoch==daysSinceEpoch:
tagSwarm.append(hashTagName) if tagCtr==0:
break tagSwarm.append(hashTagName)
tagCtr+=1
if tagCtr>3:
break
if tagCtr>0:
tagSwarmCtr.append(tagCtr)
if not tagSwarm: if not tagSwarm:
return '' return ''
tagSwarm.sort() tagSwarm.sort()
tagSwarmStr='' tagSwarmStr=''
ctr=0
for tagName in tagSwarm: for tagName in tagSwarm:
tagSwarmStr+= \ if tagSwarmCtr[ctr]<2:
'<a href="'+actor+'/tags/'+tagName+ \ tagSwarmStr+= \
'" class="hashtagswarm">'+tagName+'</a> ' '<a href="'+actor+'/tags/'+tagName+ \
'" class="hashtagswarm">'+tagName+'</a> '
else:
tagSwarmStr+= \
'<a href="'+actor+'/tags/'+tagName+ \
'" class="hashtagswarm"><b>'+tagName+'</b></a> '
ctr+=1
tagSwarmHtml=tagSwarmStr.strip()+'\n' tagSwarmHtml=tagSwarmStr.strip()+'\n'
return tagSwarmHtml return tagSwarmHtml