indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Merge branch 'main' of ssh://code.freedombone.net:2222/bashrc/epicyon into main

main
Bob Mottram 2021-03-15 20:36:43 +00:00
parent 238540d081 28a30728cf
commit c476f38e90
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
notifications_client.py
View File

@ -478,9 +478,21 @@ def _showLocalBox(notifyJson: {}, boxName: str,
sayStr = indent + boxName + ' posts ' + str(startPostIndex + 1) + \ sayStr = indent + boxName + ' posts ' + str(startPostIndex + 1) + \
' to ' + str(startPostIndex + ctr) + '. ' ' to ' + str(startPostIndex + ctr) + '. '
sayStr += 'Use the \33[3mnext\33[0m and \33[3mprev\33[0m commands to navigate.' sayStr += \
'Use the \33[3mnext\33[0m and \33[3mprev\33[0m commands to navigate.'
_sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak)
if notifyJson:
if notifyJson.get('followRequestsList'):
if len(notifyJson['followRequestsList']) > 0:
print('')
sayStr = indent + 'You have a follow request from ' + \
'\33[7m' + notifyJson['followRequestsList'][0] + '\33[0m'
_sayCommand(sayStr, sayStr, screenreader, systemLanguage,
espeak)
sayStr = indent + 'Use the \33[3maccept\33[0m or ' + \
'\33[3mreject\33[0m commands to respond.'
_sayCommand(sayStr, sayStr, screenreader, systemLanguage,
espeak)
print('') print('')

5
speaker.py
View File

@ -290,6 +290,7 @@ def _speakerEndpointJson(displayName: str, summary: str,
links: [], gender: str, postId: str, links: [], gender: str, postId: str,
postDM: bool, postReply: bool, postDM: bool, postReply: bool,
followRequestsExist: bool, followRequestsExist: bool,
followRequestsList: [],
likedBy: str, published: str, postCal: bool, likedBy: str, published: str, postCal: bool,
postShare: bool, themeName: str, postShare: bool, themeName: str,
isDirect: bool) -> {}: isDirect: bool) -> {}:
@ -310,6 +311,7 @@ def _speakerEndpointJson(displayName: str, summary: str,
"dm": postDM, "dm": postDM,
"reply": postReply, "reply": postReply,
"followRequests": followRequestsExist, "followRequests": followRequestsExist,
"followRequestsList": followRequestsList,
"likedBy": likedBy, "likedBy": likedBy,
"calendar": postCal, "calendar": postCal,
"share": postShare "share": postShare
@ -492,6 +494,7 @@ def _postToSpeakerJson(baseDir: str, httpPrefix: str,
postId = postJsonObject['object']['id'] postId = postJsonObject['object']['id']
followRequestsExist = False followRequestsExist = False
followRequestsList = []
accountsDir = baseDir + '/accounts/' + nickname + '@' + domainFull accountsDir = baseDir + '/accounts/' + nickname + '@' + domainFull
approveFollowsFilename = accountsDir + '/followrequests.txt' approveFollowsFilename = accountsDir + '/followrequests.txt'
if os.path.isfile(approveFollowsFilename): if os.path.isfile(approveFollowsFilename):
@ -499,6 +502,7 @@ def _postToSpeakerJson(baseDir: str, httpPrefix: str,
follows = fp.readlines() follows = fp.readlines()
if len(follows) > 0: if len(follows) > 0:
followRequestsExist = True followRequestsExist = True
followRequestsList = follows.split('\n')
postDM = False postDM = False
dmFilename = accountsDir + '/.newDM' dmFilename = accountsDir + '/.newDM'
if os.path.isfile(dmFilename): if os.path.isfile(dmFilename):
@ -522,6 +526,7 @@ def _postToSpeakerJson(baseDir: str, httpPrefix: str,
detectedLinks, gender, postId, detectedLinks, gender, postId,
postDM, postReply, postDM, postReply,
followRequestsExist, followRequestsExist,
followRequestsList,
likedBy, published, likedBy, published,
postCal, postShare, themeName, postCal, postShare, themeName,
isDirect) isDirect)