diff --git a/webinterface.py b/webinterface.py
index c5c3fe22a..21ada6774 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -2539,18 +2539,25 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \
galleryStr+='
\n'
if not isMuted:
galleryStr+='
\n'
- galleryStr+=' \n'
+ galleryStr+= \
+ ' \n'
galleryStr+=' \n'
if postJsonObject['object'].get('url'):
imagePostUrl=postJsonObject['object']['url']
else:
imagePostUrl=postJsonObject['object']['id']
if imageDescription and not isMuted:
- galleryStr+='
'+imageDescription+'
\n'
+ galleryStr+= \
+ '
'+ \
+ imageDescription+'
\n'
else:
galleryStr+='
--- '
galleryStr+='
\n'
- galleryStr+=' '+replyStr+announceStr+likeStr+bookmarkStr+deleteStr+muteStr+'\n'
+ galleryStr+= \
+ ' '+replyStr+announceStr+likeStr+ \
+ bookmarkStr+deleteStr+muteStr+'\n'
galleryStr+='
\n'
galleryStr+='
\n'
galleryStr+=' '+avatarLink+'\n'
@@ -2558,7 +2565,10 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \
galleryStr+='
\n'
attachmentStr+='
'
- attachmentStr+=' \n'
+ attachmentStr+= \
+ '
\n'
attachmentCtr+=1
elif mediaType=='video/mp4' or \
mediaType=='video/webm' or \
@@ -2576,8 +2586,14 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \
if not isMuted:
galleryStr+='
\n'
galleryStr+=' \n'
- galleryStr+=' '
- galleryStr+=translate['Your browser does not support the video tag.']
+ galleryStr+= \
+ ' '
+ galleryStr+= \
+ translate['Your browser does not support the video tag.']
galleryStr+=' \n'
galleryStr+=' \n'
if postJsonObject['object'].get('url'):
@@ -2585,11 +2601,16 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \
else:
videoPostUrl=postJsonObject['object']['id']
if imageDescription and not isMuted:
- galleryStr+='
'+imageDescription+'
\n'
+ galleryStr+= \
+ '
'+ \
+ imageDescription+'
\n'
else:
galleryStr+='
--- '
galleryStr+='
\n'
- galleryStr+=' '+replyStr+announceStr+likeStr+bookmarkStr+deleteStr+muteStr+'\n'
+ galleryStr+= \
+ ' '+replyStr+announceStr+likeStr+ \
+ bookmarkStr+deleteStr+muteStr+'\n'
galleryStr+='
\n'
galleryStr+='
\n'
galleryStr+=' '+avatarLink+'\n'
@@ -2597,7 +2618,11 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \
galleryStr+='
\n'
attachmentStr+='
'
- attachmentStr+=''
+ attachmentStr+= \
+ ''
attachmentStr+=translate['Your browser does not support the video tag.']
attachmentStr+=' '
attachmentCtr+=1
@@ -2614,8 +2639,14 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \
if not isMuted:
galleryStr+='
\n'
galleryStr+=' \n'
- galleryStr+=' '
- galleryStr+=translate['Your browser does not support the audio tag.']
+ galleryStr+= \
+ ' '
+ galleryStr+= \
+ translate['Your browser does not support the audio tag.']
galleryStr+=' \n'
galleryStr+=' \n'
if postJsonObject['object'].get('url'):
@@ -2623,7 +2654,10 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \
else:
audioPostUrl=postJsonObject['object']['id']
if imageDescription and not isMuted:
- galleryStr+='
'+imageDescription+'
\n'
+ galleryStr+= \
+ '
'+ \
+ imageDescription+'
\n'
else:
galleryStr+='
--- '
galleryStr+='
\n'
@@ -2635,7 +2669,11 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \
galleryStr+='
\n'
attachmentStr+='
'
- attachmentStr+=''
+ attachmentStr+= \
+ ''
attachmentStr+=translate['Your browser does not support the audio tag.']
attachmentStr+=' '
attachmentCtr+=1
@@ -2698,7 +2736,9 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \
contentStr+='
'+postJsonObject['object']['summary']+' '
if isModerationPost:
containerClass='container report'
- contentStr+='
'+translate['SHOW MORE']+' '
+ contentStr+= \
+ '
'+translate['SHOW MORE']+' '
contentStr+='
'
contentStr+=objectContent+attachmentStr
contentStr=addEmbeddedElements(translate,contentStr)
@@ -2707,7 +2747,9 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \
contentStr+='
'
if postJsonObject['object'].get('tag'):
- contentStr=replaceEmojiFromTags(contentStr,postJsonObject['object']['tag'],'content')
+ contentStr= \
+ replaceEmojiFromTags(contentStr, \
+ postJsonObject['object']['tag'],'content')
if isMuted:
contentStr=''
@@ -2984,7 +3026,13 @@ def htmlTimeline(defaultTimeline: str, \
# page up arrow
if pageNumber>1:
- tlStr+='
'
+ tlStr+= \
+ '
'
# show the posts
itemCtr=0
@@ -3030,7 +3078,12 @@ def htmlTimeline(defaultTimeline: str, \
# page down arrow
if itemCtr>2:
- tlStr+='
'
+ tlStr+= \
+ '
'
tlStr+=htmlFooter()
return tlStr
@@ -3186,7 +3239,9 @@ def htmlIndividualPost(recentPostsCache: {},maxRecentPosts: int, \
# show the previous posts
if isinstance(postJsonObject['object'], dict):
while postJsonObject['object'].get('inReplyTo'):
- postFilename=locatePost(baseDir,nickname,domain,postJsonObject['object']['inReplyTo'])
+ postFilename= \
+ locatePost(baseDir,nickname,domain, \
+ postJsonObject['object']['inReplyTo'])
if not postFilename:
break
postJsonObject=loadJson(postFilename)
@@ -3208,7 +3263,8 @@ def htmlIndividualPost(recentPostsCache: {},maxRecentPosts: int, \
if os.path.isfile(repliesFilename):
# get items from the replies file
repliesJson={'orderedItems': []}
- populateRepliesJson(baseDir,nickname,domain,repliesFilename,authorized,repliesJson)
+ populateRepliesJson(baseDir,nickname,domain, \
+ repliesFilename,authorized,repliesJson)
# add items to the html output
for item in repliesJson['orderedItems']:
postStr+= \
@@ -3279,7 +3335,8 @@ def htmlRemoveSharedItem(translate: {},baseDir: str,actor: str,shareName: str) -
if os.path.isfile(baseDir+'/img/shares-background.png'):
if not os.path.isfile(baseDir+'/accounts/shares-background.png'):
- copyfile(baseDir+'/img/shares-background.png',baseDir+'/accounts/shares-background.png')
+ copyfile(baseDir+'/img/shares-background.png', \
+ baseDir+'/accounts/shares-background.png')
cssFilename=baseDir+'/epicyon-follow.css'
if os.path.isfile(baseDir+'/follow.css'):
@@ -3292,12 +3349,18 @@ def htmlRemoveSharedItem(translate: {},baseDir: str,actor: str,shareName: str) -
sharesStr+='
'
if sharedItemImageUrl:
sharesStr+=' '
- sharesStr+=' '+translate['Remove']+' '+sharedItemDisplayName+' ?
'
+ sharesStr+= \
+ ' '+translate['Remove']+ \
+ ' '+sharedItemDisplayName+' ?
'
sharesStr+=' '
sharesStr+=' '
sharesStr+='
'
@@ -3351,12 +3414,21 @@ def htmlDeletePost(recentPostsCache: {},maxRecentPosts: int, \
httpPrefix,projectVersion,'outbox', \
False,False,False,False,False)
deletePostStr+=''
emojiStr+='
'
emojiStr+='
'
- emojiStr+=' '+translate['Enter an emoji name to search for']+'
'
+ emojiStr+= \
+ ' '+ \
+ translate['Enter an emoji name to search for']+'
'
emojiStr+=' '
emojiStr+=' '
emojiStr+='
'
@@ -3710,8 +3837,12 @@ def htmlCalendarDay(translate: {}, \
calendarStr=htmlHeader(cssFilename,calendarStyle)
calendarStr+='
\n'
calendarStr+='\n'
- calendarStr+=' '
- calendarStr+=' '+str(dayNumber)+' '+monthName+' '+str(year)+' \n'
+ calendarStr+= \
+ ' '
+ calendarStr+= \
+ ' '+str(dayNumber)+' '+monthName+ \
+ ' '+str(year)+' \n'
calendarStr+=' \n'
calendarStr+='\n'
@@ -3729,7 +3860,9 @@ def htmlCalendarDay(translate: {}, \
if ev.get('postId'):
postId=ev['postId']
if ev.get('startTime'):
- eventDate=datetime.strptime(ev['startTime'],"%Y-%m-%dT%H:%M:%S%z")
+ eventDate= \
+ datetime.strptime(ev['startTime'], \
+ "%Y-%m-%dT%H:%M:%S%z")
eventTime=eventDate.strftime("%H:%M").strip()
if ev.get('name'):
eventDescription=ev['name'].strip()
@@ -3739,18 +3872,41 @@ def htmlCalendarDay(translate: {}, \
deleteButtonStr=''
if postId:
- deleteButtonStr=' '
+ deleteButtonStr= \
+ ' '
if eventTime and eventDescription and eventPlace:
- calendarStr+=''+eventTime+' '+eventPlace+' '+eventDescription+' '+deleteButtonStr+' \n'
+ calendarStr+= \
+ ''+eventTime+ \
+ ' '+ \
+ eventPlace+' '+eventDescription+ \
+ ' '+deleteButtonStr+' \n'
elif eventTime and eventDescription and not eventPlace:
- calendarStr+=''+eventTime+' '+eventDescription+' '+deleteButtonStr+' \n'
+ calendarStr+= \
+ ''+eventTime+ \
+ ' '+ \
+ eventDescription+' '+deleteButtonStr+' \n'
elif not eventTime and eventDescription and not eventPlace:
- calendarStr+=''+eventDescription+' '+deleteButtonStr+' \n'
+ calendarStr+= \
+ ''+ \
+ eventDescription+' '+deleteButtonStr+' \n'
elif not eventTime and eventDescription and eventPlace:
- calendarStr+=''+eventPlace+' '+eventDescription+' '+deleteButtonStr+' \n'
+ calendarStr+= \
+ ''+ \
+ eventPlace+' '+eventDescription+ \
+ ' '+deleteButtonStr+' \n'
elif eventTime and not eventDescription and eventPlace:
- calendarStr+=''+eventTime+' '+eventPlace+' '+deleteButtonStr+' \n'
+ calendarStr+= \
+ ''+eventTime+ \
+ ' '+ \
+ eventPlace+' '+deleteButtonStr+' \n'
calendarStr+=' \n'
calendarStr+='
\n'
@@ -3801,14 +3957,19 @@ def htmlCalendar(translate: {}, \
if os.path.isfile(baseDir+'/img/calendar-background.png'):
if not os.path.isfile(baseDir+'/accounts/calendar-background.png'):
- copyfile(baseDir+'/img/calendar-background.png',baseDir+'/accounts/calendar-background.png')
+ copyfile(baseDir+'/img/calendar-background.png', \
+ baseDir+'/accounts/calendar-background.png')
- months=('January','February','March','April','May','June','July','August','September','October','November','December')
+ months=('January','February','March','April', \
+ 'May','June','July','August','September', \
+ 'October','November','December')
monthName=translate[months[monthNumber-1]]
if dayNumber:
dayEvents=None
- events=getTodaysEvents(baseDir,nickname,domain,year,monthNumber,dayNumber)
+ events= \
+ getTodaysEvents(baseDir,nickname,domain, \
+ year,monthNumber,dayNumber)
if events:
if events.get(str(dayNumber)):
dayEvents=events[str(dayNumber)]
@@ -3817,7 +3978,8 @@ def htmlCalendar(translate: {}, \
nickname,domain,dayEvents, \
monthName,actor)
- events=getCalendarEvents(baseDir,nickname,domain,year,monthNumber)
+ events= \
+ getCalendarEvents(baseDir,nickname,domain,year,monthNumber)
prevYear=year
prevMonthNumber=monthNumber-1
@@ -3831,7 +3993,8 @@ def htmlCalendar(translate: {}, \
nextMonthNumber=1
nextYear=year+1
- print('Calendar year='+str(year)+' month='+str(monthNumber)+ ' '+str(weekDayOfMonthStart(monthNumber,year)))
+ print('Calendar year='+str(year)+' month='+str(monthNumber)+ \
+ ' '+str(weekDayOfMonthStart(monthNumber,year)))
if monthNumber<12:
daysInMonth=(date(year, monthNumber+1, 1) - date(year, monthNumber, 1)).days
@@ -3847,12 +4010,22 @@ def htmlCalendar(translate: {}, \
calendarStr=htmlHeader(cssFilename,calendarStyle)
calendarStr+='
\n'
calendarStr+='\n'
- calendarStr+=' '
- calendarStr+=' \n'
+ calendarStr+= \
+ ' '
+ calendarStr+= \
+ ' \n'
calendarStr+=' '
calendarStr+=' '+monthName+' \n'
- calendarStr+=' '
- calendarStr+=' \n'
+ calendarStr+= \
+ ' '
+ calendarStr+= \
+ ' \n'
calendarStr+=' \n'
calendarStr+='\n'
calendarStr+='\n'
@@ -3882,7 +4055,8 @@ def htmlCalendar(translate: {}, \
if dayOfMonth==currDate.day:
isToday=True
if events.get(str(dayOfMonth)):
- url=actor+'/calendar?year='+str(year)+'?month='+str(monthNumber)+'?day='+str(dayOfMonth)
+ url=actor+'/calendar?year='+str(year)+'?month='+ \
+ str(monthNumber)+'?day='+str(dayOfMonth)
dayLink=''+str(dayOfMonth)+' '
# there are events for this day
if not isToday: