','').replace('<\p>','') + contentStr = content.replace('
', '').replace(r'<\p>', '') if '://' not in contentStr: - if len(contentStr)>maxWordLength: + if len(contentStr) > maxWordLength: if '
' in content: - content='
'+contentStr[:maxWordLength]+'<\p>' + content = '
' + contentStr[:maxWordLength] + r'<\p>'
else:
- content=content[:maxWordLength]
+ content = content[:maxWordLength]
return content
- words=content.split(' ')
+ words = content.split(' ')
if not longWordsList:
- longWordsList=[]
+ longWordsList = []
for wordStr in words:
- if len(wordStr)>maxWordLength:
+ if len(wordStr) > maxWordLength:
if wordStr not in longWordsList:
longWordsList.append(wordStr)
for wordStr in longWordsList:
if wordStr.startswith('<'):
continue
- if len(wordStr)==76:
- if wordStr.upper()==wordStr:
+ if len(wordStr) == 76:
+ if wordStr.upper() == wordStr:
# tox address
continue
if '=\"' in wordStr:
@@ -386,130 +396,128 @@ def removeLongWords(content: str,maxWordLength: int,longWordsList: []) -> str:
elif 'dat:' in wordStr:
continue
if '<' in wordStr:
- replaceWord=wordStr.split('<',1)[0]
- content= \
- content.replace(wordStr,replaceWord)
- wordStr=replaceWord
+ replaceWord = wordStr.split('<', 1)[0]
+ content = content.replace(wordStr, replaceWord)
+ wordStr = replaceWord
if '/' in wordStr:
continue
- if len(wordStr[maxWordLength:])
'): return content - maxWordLength=40 - content=content.replace('\n',' --linebreak-- ') - content=addMusicTag(content,'nowplaying') - words=content.replace(',',' ').replace(';',' ').split(' ') + maxWordLength = 40 + content = content.replace('\n', ' --linebreak-- ') + content = addMusicTag(content, 'nowplaying') + words = content.replace(',', ' ').replace(';', ' ').split(' ') # remove . for words which are not mentions - wordCtr=0 - newWords=[] - for wordIndex in range(0,len(words)): - wordStr=words[wordIndex] + newWords = [] + for wordIndex in range(0, len(words)): + wordStr = words[wordIndex] if wordStr.endswith('.'): if not wordStr.startswith('@'): - wordStr=wordStr[:-1] + wordStr = wordStr[:-1] if wordStr.startswith('.'): - wordStr=wordStr[1:] + wordStr = wordStr[1:] newWords.append(wordStr) - words=newWords + words = newWords - replaceMentions={} - replaceHashTags={} - replaceEmoji={} - emojiDict={} - originalDomain=domain + replaceMentions = {} + replaceHashTags = {} + replaceEmoji = {} + emojiDict = {} + originalDomain = domain if ':' in domain: - domain=domain.split(':')[0] - followingFilename= \ - baseDir+'/accounts/'+nickname+'@'+domain+'/following.txt' + domain = domain.split(':')[0] + followingFilename = baseDir + '/accounts/' + \ + nickname + '@' + domain + '/following.txt' # read the following list so that we can detect just @nick # in addition to @nick@domain - following=None + following = None if '@' in words: if os.path.isfile(followingFilename): with open(followingFilename, "r") as f: - following=f.readlines() + following = f.readlines() # extract mentions and tags from words - longWordsList=[] + longWordsList = [] for wordStr in words: - wordLen=len(wordStr) - if wordLen>2: - if wordLen>maxWordLength: + wordLen = len(wordStr) + if wordLen > 2: + if wordLen > maxWordLength: longWordsList.append(wordStr) - firstChar=wordStr[0] - if firstChar=='@': - if addMention(wordStr,httpPrefix,following, \ - replaceMentions,recipients,hashtags): + firstChar = wordStr[0] + if firstChar == '@': + if addMention(wordStr, httpPrefix, following, + replaceMentions, recipients, hashtags): continue - elif firstChar=='#': - if addHashTags(wordStr,httpPrefix,originalDomain, \ - replaceHashTags,hashtags): + elif firstChar == '#': + if addHashTags(wordStr, httpPrefix, originalDomain, + replaceHashTags, hashtags): continue elif ':' in wordStr: - #print('TAG: emoji located - '+wordStr) - wordStr2=wordStr.split(':')[1] + wordStr2 = wordStr.split(':')[1] +# print('TAG: emoji located - '+wordStr) if not emojiDict: # emoji.json is generated so that it can be customized and # the changes will be retained even if default_emoji.json # is subsequently updated - if not os.path.isfile(baseDir+'/emoji/emoji.json'): - copyfile(baseDir+'/emoji/default_emoji.json', \ - baseDir+'/emoji/emoji.json') - emojiDict=loadJson(baseDir+'/emoji/emoji.json') + if not os.path.isfile(baseDir + '/emoji/emoji.json'): + copyfile(baseDir + '/emoji/default_emoji.json', + baseDir + '/emoji/emoji.json') + emojiDict = loadJson(baseDir + '/emoji/emoji.json') - #print('TAG: looking up emoji for :'+wordStr2+':') - addEmoji(baseDir,':'+wordStr2+':',httpPrefix, \ - originalDomain,replaceEmoji,hashtags, \ +# print('TAG: looking up emoji for :'+wordStr2+':') + addEmoji(baseDir, ':' + wordStr2 + ':', httpPrefix, + originalDomain, replaceEmoji, hashtags, emojiDict) # replace words with their html versions - for wordStr,replaceStr in replaceMentions.items(): - content=content.replace(wordStr,replaceStr) - for wordStr,replaceStr in replaceHashTags.items(): - content=content.replace(wordStr,replaceStr) + for wordStr, replaceStr in replaceMentions.items(): + content = content.replace(wordStr, replaceStr) + for wordStr, replaceStr in replaceHashTags.items(): + content = content.replace(wordStr, replaceStr) if not isJsonContent: - for wordStr,replaceStr in replaceEmoji.items(): - content=content.replace(wordStr,replaceStr) + for wordStr, replaceStr in replaceEmoji.items(): + content = content.replace(wordStr, replaceStr) - content=addWebLinks(content) + content = addWebLinks(content) if longWordsList: - content=removeLongWords(content,maxWordLength,longWordsList) - content=content.replace(' --linebreak-- ','
') - return '
'+content+'
' + content = removeLongWords(content, maxWordLength, longWordsList) + content = content.replace(' --linebreak-- ', '') + return '
' + content + '
' -def getMentionsFromHtml(htmlText: str, \ + +def getMentionsFromHtml(htmlText: str, matchStr=" []: """Extracts mentioned actors from the given html content string """ - mentions=[] + mentions = [] if matchStr not in htmlText: return mentions - mentionsList=htmlText.split(matchStr) + mentionsList = htmlText.split(matchStr) for mentionStr in mentionsList: if '"' not in mentionStr: continue - actorStr=mentionStr.split('"')[0] + actorStr = mentionStr.split('"')[0] if actorStr.startswith('http') or \ actorStr.startswith('i2p') or \ actorStr.startswith('dat:'): @@ -517,54 +525,55 @@ def getMentionsFromHtml(htmlText: str, \ mentions.append(actorStr) return mentions -def extractMediaInFormPOST(postBytes,boundary,name: str): + +def extractMediaInFormPOST(postBytes, boundary, name: str): """Extracts the binary encoding for image/video/audio within a http form POST Returns the media bytes and the remaining bytes """ - imageStartBoundary= \ - b'Content-Disposition: form-data; name="'+ \ - name.encode('utf8', 'ignore')+b'";' - imageStartLocation=postBytes.find(imageStartBoundary) - if imageStartLocation==-1: - return None,postBytes + imageStartBoundary = b'Content-Disposition: form-data; name="' + \ + name.encode('utf8', 'ignore') + b'";' + imageStartLocation = postBytes.find(imageStartBoundary) + if imageStartLocation == -1: + return None, postBytes # bytes after the start boundary appears - mediaBytes=postBytes[imageStartLocation:] + mediaBytes = postBytes[imageStartLocation:] # look for the next boundary - imageEndBoundary=boundary.encode('utf8', 'ignore') - imageEndLocation=mediaBytes.find(imageEndBoundary) - if imageEndLocation==-1: + imageEndBoundary = boundary.encode('utf8', 'ignore') + imageEndLocation = mediaBytes.find(imageEndBoundary) + if imageEndLocation == -1: # no ending boundary - return mediaBytes,postBytes[:imageStartLocation] + return mediaBytes, postBytes[:imageStartLocation] # remaining bytes after the end of the image - remainder=mediaBytes[imageEndLocation:] + remainder = mediaBytes[imageEndLocation:] # remove bytes after the end boundary - mediaBytes=mediaBytes[:imageEndLocation] + mediaBytes = mediaBytes[:imageEndLocation] # return the media and the before+after bytes - return mediaBytes,postBytes[:imageStartLocation]+remainder + return mediaBytes, postBytes[:imageStartLocation] + remainder -def saveMediaInFormPOST(mediaBytes,debug: bool, \ - filenameBase=None) -> (str,str): + +def saveMediaInFormPOST(mediaBytes, debug: bool, + filenameBase=None) -> (str, str): """Saves the given media bytes extracted from http form POST Returns the filename and attachment type """ if not mediaBytes: if debug: print('DEBUG: No media found within POST') - return None,None + return None, None - mediaLocation=-1 - searchStr='' - filename=None + mediaLocation = -1 + searchStr = '' + filename = None # directly search the binary array for the beginning # of an image - extensionList= { + extensionList = { 'png': 'image/png', 'jpeg': 'image/jpeg', 'gif': 'image/gif', @@ -574,80 +583,84 @@ def saveMediaInFormPOST(mediaBytes,debug: bool, \ 'mp3': 'audio/mpeg', 'ogg': 'audio/ogg' } - detectedExtension=None - for extension,contentType in extensionList.items(): - searchStr=b'Content-Type: '+contentType.encode('utf8', 'ignore') - mediaLocation=mediaBytes.find(searchStr) - if mediaLocation>-1: - if extension=='jpeg': - extension='jpg' - elif extension=='mpeg': - extension='mp3' - filename=filenameBase+'.'+extension - attachmentMediaType= \ - searchStr.decode().split('/')[0].replace('Content-Type: ','') - detectedExtension=extension + detectedExtension = None + for extension, contentType in extensionList.items(): + searchStr = b'Content-Type: ' + contentType.encode('utf8', 'ignore') + mediaLocation = mediaBytes.find(searchStr) + if mediaLocation > -1: + if extension == 'jpeg': + extension = 'jpg' + elif extension == 'mpeg': + extension = 'mp3' + filename = filenameBase + '.' + extension + attachmentMediaType = \ + searchStr.decode().split('/')[0].replace('Content-Type: ', '') + detectedExtension = extension break if not filename: - return None,None + return None, None # locate the beginning of the image, after any # carriage returns - startPos=mediaLocation+len(searchStr) - for offset in range(1,8): - if mediaBytes[startPos+offset]!=10: - if mediaBytes[startPos+offset]!=13: - startPos+=offset + startPos = mediaLocation + len(searchStr) + for offset in range(1, 8): + if mediaBytes[startPos+offset] != 10: + if mediaBytes[startPos+offset] != 13: + startPos += offset break # remove any existing image files with a different format - extensionTypes=('png','jpg','jpeg','gif','webp') + extensionTypes = ('png', 'jpg', 'jpeg', 'gif', 'webp') for ex in extensionTypes: - if ex==detectedExtension: + if ex == detectedExtension: continue - possibleOtherFormat= \ - filename.replace('.temp','').replace('.'+detectedExtension,'.'+ex) + possibleOtherFormat = \ + filename.replace('.temp', '').replace('.' + + detectedExtension, '.' + + ex) if os.path.isfile(possibleOtherFormat): os.remove(possibleOtherFormat) - fd=open(filename, 'wb') + fd = open(filename, 'wb') fd.write(mediaBytes[startPos:]) fd.close() - return filename,attachmentMediaType + return filename, attachmentMediaType -def extractTextFieldsInPOST(postBytes,boundary,debug: bool) -> {}: + +def extractTextFieldsInPOST(postBytes, boundary, debug: bool) -> {}: """Returns a dictionary containing the text fields of a http form POST The boundary argument comes from the http header """ - msg=email.parser.BytesParser().parsebytes(postBytes) + msg = email.parser.BytesParser().parsebytes(postBytes) if debug: - print('DEBUG: POST arriving '+ \ + print('DEBUG: POST arriving ' + msg.get_payload(decode=True).decode('utf-8')) - messageFields=msg.get_payload(decode=True).decode('utf-8').split(boundary) - fields={} + messageFields = msg.get_payload(decode=True) + messageFields = messageFields.decode('utf-8').split(boundary) + fields = {} # examine each section of the POST, separated by the boundary for f in messageFields: - if f=='--': + if f == '--': continue if ' name="' not in f: continue - postStr=f.split(' name="',1)[1] + postStr = f.split(' name="', 1)[1] if '"' not in postStr: continue - postKey=postStr.split('"',1)[0] - postValueStr=postStr.split('"',1)[1] + postKey = postStr.split('"', 1)[0] + postValueStr = postStr.split('"', 1)[1] if ';' in postValueStr: continue if '\r\n' not in postValueStr: continue - postLines=postValueStr.split('\r\n') - postValue='' - if len(postLines)>2: - for line in range(2,len(postLines)-1): - if line>2: - postValue+='\n' - postValue+=postLines[line] - fields[postKey]=postValue + postLines = postValueStr.split('\r\n') + postValue = '' + if len(postLines) > 2: + for line in range(2, len(postLines)-1): + if line > 2: + postValue += '\n' + postValue += postLines[line] + fields[postKey] = postValue return fields