master
Bob Mottram 2019-08-10 17:55:17 +01:00
parent 904cb793ce
commit 220f5683b9
2 changed files with 13 additions and 14 deletions

View File

@ -147,20 +147,19 @@ def addHtmlTags(baseDir: str,httpPrefix: str, \
if ':' in domain: if ':' in domain:
domain=domain.split(':')[0] domain=domain.split(':')[0]
followingFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/following.txt' followingFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/following.txt'
if not os.path.isfile(followingFilename):
content=content.replace('\n','</p><p>')
content='<p>'+content+'</p>'
return content.replace('<p></p>','')
# read the following list so that we can detect just @nick # read the following list so that we can detect just @nick
# in addition to @nick@domain # in addition to @nick@domain
with open(followingFilename, "r") as f: following=None
following = f.readlines() if os.path.isfile(followingFilename):
with open(followingFilename, "r") as f:
following = f.readlines()
# extract mentions and tags from words # extract mentions and tags from words
for wordStr in words: for wordStr in words:
if addMention(wordStr,httpPrefix,following,replaceMentions,recipients): if following:
continue if addMention(wordStr,httpPrefix,following,replaceMentions,recipients):
continue
if addHashTags(wordStr,httpPrefix,originalDomain,replaceHashTags,hashtags): if addHashTags(wordStr,httpPrefix,originalDomain,replaceHashTags,hashtags):
continue continue
if len(wordStr)>2 and wordStr.startswith(':') and wordStr.endswith(':') and not emojiDict: if len(wordStr)>2 and wordStr.startswith(':') and wordStr.endswith(':') and not emojiDict:

View File

@ -433,13 +433,13 @@ def createPostBase(baseDir: str,nickname: str, domain: str, port: int, \
# create a list of hashtags # create a list of hashtags
if hashtagsDict: if hashtagsDict:
isPublic=False
for recipient in toRecipients:
if recipient.endswith('#Public'):
isPublic=True
break
for tagName,tag in hashtagsDict.items(): for tagName,tag in hashtagsDict.items():
tags.append(tag) tags.append(tag)
isPublic=False
for recipient in toRecipients:
if recipient.endswith('#Public'):
isPublic=True
break
if isPublic: if isPublic:
updateHashtagsIndex(baseDir,tag,newPostId) updateHashtagsIndex(baseDir,tag,newPostId)