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

notifications_client.py

@@ -478,9 +478,21 @@ def _showLocalBox(notifyJson: {}, boxName: str,
 
     sayStr = indent + boxName + ' posts ' + str(startPostIndex + 1) + \
         ' 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)
-
+    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('')
 
 

speaker.py

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