Re-engineering desktop client to be more ActivityPub compatible

desktop_client.py

@@ -12,8 +12,10 @@ import time
 import sys
 import select
 import webbrowser
+import urllib.parse
 from pathlib import Path
 from random import randint
+from utils import removeHtml
 from utils import getStatusNumber
 from utils import loadJson
 from utils import saveJson
@@ -22,7 +24,6 @@ from utils import getDomainFromActor
 from utils import getFullDomain
 from utils import isPGPEncrypted
 from session import createSession
-from speaker import getSpeakerFromServer
 from speaker import getSpeakerPitch
 from speaker import getSpeakerRate
 from speaker import getSpeakerRange
@@ -31,6 +32,7 @@ from like import sendUndoLikeViaServer
 from follow import sendFollowRequestViaServer
 from follow import sendUnfollowRequestViaServer
 from posts import sendPostViaServer
+from posts import c2sBoxJson
 from announce import sendAnnounceViaServer
 from pgp import pgpDecrypt
 from pgp import hasLocalPGPkey
@@ -391,48 +393,74 @@ def _safeMessage(content: str) -> str:
     return content.replace('`', '').replace('$(', '$ (')
 
 
-def _readLocalBoxPost(boxName: str, index: int,
+def _timelineIsEmpty(boxJson: {}) -> bool:
+    """Returns true if the given timeline is empty
+    """
+    empty = False
+    if not boxJson:
+        empty = True
+    else:
+        if not isinstance(boxJson, dict):
+            empty = True
+        elif not boxJson.get('orderedItems'):
+            empty = True
+    return empty
+
+
+def _getFirstItemId(boxJson: {}) -> str:
+    """Returns the id of the first item in the timeline
+    """
+    if _timelineIsEmpty(boxJson):
+        return
+    if len(boxJson['orderedItems']) == 0:
+        return
+    return boxJson['orderedItems'][0]['id']
+
+
+def _textOnlyContent(content: str) -> str:
+    """Remove formatting from the given string
+    """
+    content = urllib.parse.unquote_plus(content)
+    content = html.unescape(content)
+    return removeHtml(content)
+
+
+def _readLocalBoxPost(boxName: str,
+                      pageNumber: int, index: int, boxJson: {},
                       systemLanguage: str,
                       screenreader: str, espeak) -> {}:
     """Reads a post from the given timeline
     Returns the speaker json
     """
-    speakerJson = _getSpeakerJsonFromIndex(boxName, index)
+    if _timelineIsEmpty(boxJson):
-    if not speakerJson:
         return
 
-    nameStr = speakerJson['name']
+    postJsonObject = _desktopGetBoxPostObject(boxJson, index)
+    if not postJsonObject:
+        return
+    actor = postJsonObject['object']['attributedTo']
+    nameStr = getNicknameFromActor(actor)
     gender = 'They/Them'
-    if speakerJson.get('gender'):
-        gender = speakerJson['gender']
 
-    # append image description if needed
+    content = _textOnlyContent(postJsonObject['object']['content'])
-    if not speakerJson.get('imageDescription'):
+    sayStr = 'Reading ' + boxName + ' post ' + str(index) + \
-        messageStr = speakerJson['say']
+        ' from page ' + str(pageNumber) + '.'
-    else:
-        messageStr = speakerJson['say'] + '. ' + \
-            speakerJson['imageDescription']
-
-    content = messageStr
-    if speakerJson.get('content'):
-        content = speakerJson['content']
-
-    sayStr = 'Reading ' + boxName + ' post ' + str(index) + '.'
     sayStr2 = sayStr.replace(' dm ', ' DM ')
     _sayCommand(sayStr, sayStr2, screenreader, systemLanguage, espeak)
 
-    if speakerJson.get('id') and isPGPEncrypted(content):
+    if isPGPEncrypted(content):
         sayStr = 'Encrypted message. Please enter your passphrase.'
         _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak)
-        content = pgpDecrypt(content, speakerJson['id'])
+        content = pgpDecrypt(content, actor)
         if isPGPEncrypted(content):
             sayStr = 'Message could not be decrypted'
             _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak)
             return
 
     content = _safeMessage(content)
-    messageStr = _safeMessage(messageStr)
+    messageStr = content
 
+    if screenreader:
         time.sleep(2)
 
     # say the speaker's name
@@ -440,13 +468,14 @@ def _readLocalBoxPost(boxName: str, index: int,
                 systemLanguage, espeak,
                 nameStr, gender)
 
+    if screenreader:
         time.sleep(2)
 
     # speak the post content
     _sayCommand(content, messageStr, screenreader,
                 systemLanguage, espeak,
                 nameStr, gender)
-    return speakerJson
+    return postJsonObject
 
 
 def _desktopShowBox(notifyJson: {}, boxName: str,
@@ -591,6 +620,114 @@ def _desktopShowBox(notifyJson: {}, boxName: str,
     return True
 
 
+def _desktopGetBoxPostObject(boxJson: {}, index: int) -> {}:
+    """Gets the post with the given index from the timeline
+    """
+    ctr = 0
+    for postJsonObject in boxJson['orderedItems']:
+        if not postJsonObject.get('object'):
+            continue
+        if not isinstance(postJsonObject['object'], dict):
+            continue
+        if not postJsonObject['object'].get('published'):
+            continue
+        if not postJsonObject['object'].get('content'):
+            continue
+        ctr += 1
+        if ctr == index:
+            return postJsonObject
+    return None
+
+
+def _desktopShowBoxJson(boxName: str, boxJson: {},
+                        screenreader: str, systemLanguage: str, espeak,
+                        pageNumber=1,
+                        newReplies=False,
+                        newDMs=False) -> bool:
+    """Shows online timeline
+    """
+    indent = '   '
+
+    # title
+    _desktopClearScreen()
+    _desktopShowBanner()
+
+    notificationIcons = ''
+    titleStr = '\33[7m' + boxName.upper() + '\33[0m'
+    # titleStr += ' page ' + str(pageNumber)
+    if notificationIcons:
+        while len(titleStr) < 95 - len(notificationIcons):
+            titleStr += ' '
+        titleStr += notificationIcons
+    print(indent + titleStr + '\n')
+
+    if _timelineIsEmpty(boxJson):
+        boxStr = boxName
+        if boxName == 'dm':
+            boxStr = 'DM'
+        sayStr = indent + 'You have no ' + boxStr + ' posts yet.'
+        _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak)
+        print('')
+        return False
+
+    ctr = 1
+    for postJsonObject in boxJson['orderedItems']:
+        if not postJsonObject.get('object'):
+            continue
+        if not isinstance(postJsonObject['object'], dict):
+            continue
+        if not postJsonObject['object'].get('published'):
+            continue
+        if not postJsonObject['object'].get('content'):
+            continue
+        published = postJsonObject['published'].replace('T', ' ')
+        posStr = str(ctr) + '.'
+        while len(posStr) < 3:
+            posStr += ' '
+        authorActor = postJsonObject['object']['attributedTo']
+        name = getNicknameFromActor(authorActor)
+        if len(name) > 16:
+            name = name[:16]
+        else:
+            while len(name) < 16:
+                name += ' '
+        content = _textOnlyContent(postJsonObject['object']['content'])
+        if isPGPEncrypted(content):
+            content = '🔒' + content
+        elif '://' in content:
+            content = '🔗' + content
+        if len(content) > 40:
+            content = content[:40]
+        else:
+            while len(content) < 40:
+                content += ' '
+        print(indent + str(posStr) + ' | ' + name + ' | ' +
+              published + ' | ' + content)
+        ctr += 1
+
+    print('')
+
+    # say the post number range
+    sayStr = indent + boxName + ' page ' + str(pageNumber) + \
+        ' containing ' + str(ctr - 1) + ' posts. '
+    if newDMs and boxName != 'dm':
+        sayStr += \
+            'Use \33[3mshow dm\33[0m to view direct messages.'
+    elif newReplies and boxName != 'replies':
+        sayStr += \
+            'Use \33[3mshow replies\33[0m to view reply posts.'
+    else:
+        sayStr += \
+            'Use the \33[3mnext\33[0m and ' + \
+            '\33[3mprev\33[0m commands to navigate.'
+    sayStr2 = sayStr.replace('\33[3m', '').replace('\33[0m', '')
+    sayStr2 = sayStr2.replace('show dm', 'show DM')
+    sayStr2 = sayStr2.replace('dm post', 'Direct message post')
+    _sayCommand(sayStr, sayStr2, screenreader, systemLanguage, espeak)
+    print('')
+    return True
+
+
 def _desktopNewDM(session, toHandle: str,
                   baseDir: str, nickname: str, password: str,
                   domain: str, port: int, httpPrefix: str,
@@ -811,50 +948,41 @@ def runDesktopClient(baseDir: str, proxyType: str, httpPrefix: str,
     _sayCommand(sayStr, sayStr, screenreader,
                 systemLanguage, espeak)
 
-    currTimeline = ''
-    currInboxIndex = 0
-    if not showNewPosts:
-        print('')
-        currInboxIndex = 0
-        _desktopShowBox(None, 'inbox',
-                        screenreader, systemLanguage, espeak,
-                        currInboxIndex, 10)
     currTimeline = 'inbox'
-    print('')
+    pageNumber = 1
-    commandStr = _desktopWaitForCmd(2, debug)
-    nextCommandStr = None
 
+    postJsonObject = {}
     originalScreenReader = screenreader
-    domainFull = getFullDomain(domain, port)
+    # domainFull = getFullDomain(domain, port)
-    actor = httpPrefix + '://' + domainFull + '/users/' + nickname
+    # actor = httpPrefix + '://' + domainFull + '/users/' + nickname
-    prevSay = ''
+    # prevSay = ''
-    prevCalendar = False
+    # prevCalendar = False
-    prevFollow = False
+    # prevFollow = False
-    prevLike = ''
+    # prevLike = ''
-    prevShare = False
+    # prevShare = False
-    dmSoundFilename = 'dm.ogg'
+    # dmSoundFilename = 'dm.ogg'
-    replySoundFilename = 'reply.ogg'
+    # replySoundFilename = 'reply.ogg'
-    calendarSoundFilename = 'calendar.ogg'
+    # calendarSoundFilename = 'calendar.ogg'
-    followSoundFilename = 'follow.ogg'
+    # followSoundFilename = 'follow.ogg'
-    likeSoundFilename = 'like.ogg'
+    # likeSoundFilename = 'like.ogg'
-    shareSoundFilename = 'share.ogg'
+    # shareSoundFilename = 'share.ogg'
-    player = 'ffplay'
+    # player = 'ffplay'
     nameStr = None
     gender = None
     messageStr = None
     content = None
     cachedWebfingers = {}
     personCache = {}
-    currDMIndex = 0
-    currRepliesIndex = 0
-    currSentIndex = 0
     newRepliesExist = False
     newDMsExist = False
-    currPostId = ''
     pgpKeyUpload = False
-    while (1):
-        session = createSession(proxyType)
 
+    sayStr = indent + 'Connecting...'
+    _sayCommand(sayStr, sayStr, screenreader,
+                systemLanguage, espeak)
+    session = createSession(proxyType)
+    prevTimelineFirstId = ''
+    while (1):
         if not pgpKeyUpload:
             pgpKey = \
                 pgpPublicKeyUpload(baseDir, session,
@@ -866,164 +994,26 @@ def runDesktopClient(baseDir: str, proxyType: str, httpPrefix: str,
                 print('PGP public key uploaded')
             pgpKeyUpload = True
 
-        notifyJson = None
+        boxJson = c2sBoxJson(baseDir, session,
-        speakerJson = \
+                             nickname, password,
-            getSpeakerFromServer(baseDir, session, nickname, password,
+                             domain, port, httpPrefix,
-                                 domain, port, httpPrefix, True, __version__)
+                             currTimeline, pageNumber,
-        if speakerJson:
+                             debug)
-            if speakerJson.get('notify') and speakerJson.get('id'):
-                notifyJson = speakerJson['notify']
-                title = 'Epicyon'
-                if speakerJson['notify'].get('title'):
-                    title = speakerJson['notify']['title']
-                soundsDir = 'theme/default/sounds'
-                if speakerJson['notify'].get('theme'):
-                    if isinstance(speakerJson['notify']['theme'], str):
-                        soundsDir = \
-                            'theme/' + \
-                            speakerJson['notify']['theme'] + '/sounds'
-                        if not os.path.isdir(soundsDir):
-                            soundsDir = 'theme/default/sounds'
 
-                indicatorDM = False
+        if boxJson:
-                if speakerJson.get('direct'):
+            timelineFirstId = _getFirstItemId(boxJson)
-                    if speakerJson['direct'] is True:
+            if timelineFirstId != prevTimelineFirstId:
-                        indicatorDM = True
-                indicatorReplies = False
-                if speakerJson.get('replyToYou'):
-                    if speakerJson['replyToYou'] is True:
-                        indicatorReplies = True
-
-                if indicatorDM:
-                    if currPostId != speakerJson['id']:
-                        if notificationSounds:
-                            _playNotificationSound(soundsDir + '/' +
-                                                   dmSoundFilename, player)
-                        _desktopNotification(notificationType, title,
-                                             'New direct message ' +
-                                             actor + '/dm')
-                elif indicatorReplies:
-                    if currPostId != speakerJson['id']:
-                        if notificationSounds:
-                            _playNotificationSound(soundsDir + '/' +
-                                                   replySoundFilename,
-                                                   player)
-                        _desktopNotification(notificationType, title,
-                                             'New reply ' +
-                                             actor + '/tlreplies')
-                elif speakerJson['notify']['calendar'] != prevCalendar:
-                    if speakerJson['notify']['calendar'] is True:
-                        if notificationSounds:
-                            _playNotificationSound(soundsDir + '/' +
-                                                   calendarSoundFilename,
-                                                   player)
-                        _desktopNotification(notificationType, title,
-                                             'New calendar event ' +
-                                             actor + '/calendar')
-                    prevCalendar = speakerJson['notify']['calendar']
-                elif speakerJson['notify']['followRequests'] != prevFollow:
-                    if speakerJson['notify']['followRequests'] is True:
-                        if notificationSounds:
-                            _playNotificationSound(soundsDir + '/' +
-                                                   followSoundFilename,
-                                                   player)
-                        _desktopNotification(notificationType, title,
-                                             'New follow request ' +
-                                             actor + '/followers#buttonheader')
-                    prevFollow = speakerJson['notify']['followRequests']
-                elif speakerJson['notify']['likedBy'] != prevLike:
-                    if '##sent##' not in speakerJson['notify']['likedBy']:
-                        if notificationSounds:
-                            _playNotificationSound(soundsDir + '/' +
-                                                   likeSoundFilename, player)
-                        _desktopNotification(notificationType, title,
-                                             'New like ' +
-                                             speakerJson['notify']['likedBy'])
-                    prevLike = speakerJson['notify']['likedBy']
-                elif speakerJson['notify']['share'] != prevShare:
-                    if speakerJson['notify']['share'] is True:
-                        if notificationSounds:
-                            _playNotificationSound(soundsDir + '/' +
-                                                   shareSoundFilename,
-                                                   player)
-                        _desktopNotification(notificationType, title,
-                                             'New shared item ' +
-                                             actor + '/shares')
-                    prevShare = speakerJson['notify']['share']
-
-            if speakerJson.get('say'):
-                if speakerJson['say'] != prevSay:
-                    if speakerJson.get('name'):
-                        nameStr = speakerJson['name']
-                        gender = 'They/Them'
-                        if speakerJson.get('gender'):
-                            gender = speakerJson['gender']
-
-                        # append image description if needed
-                        if not speakerJson.get('imageDescription'):
-                            messageStr = speakerJson['say']
-                        else:
-                            messageStr = speakerJson['say'] + '. ' + \
-                                speakerJson['imageDescription']
-                        encryptedMessage = False
-                        if speakerJson.get('id') and \
-                           isPGPEncrypted(messageStr):
-                            encryptedMessage = True
-
-                        content = messageStr
-                        if speakerJson.get('content'):
-                            if not encryptedMessage:
-                                content = speakerJson['content']
-                            else:
-                                content = '🔒 Encrypted message'
-
-                        if showNewPosts:
-                            # say the speaker's name
-                            _sayCommand(nameStr, nameStr, screenreader,
-                                        systemLanguage, espeak,
-                                        nameStr, gender)
-
-                            time.sleep(2)
-
-                            # speak the post content
-                            content = _safeMessage(content)
-                            messageStr = _safeMessage(messageStr)
-                            _sayCommand(content, messageStr, screenreader,
-                                        systemLanguage, espeak,
-                                        nameStr, gender)
-
-                        # store incoming post
-                        speakerJson['decrypted'] = False
-                        if speakerJson.get('replyToYou'):
-                            newRepliesExist = True
-                            _desktopStoreMsg(speakerJson, 'replies')
-                        if speakerJson.get('direct'):
-                            newDMsExist = True
-                            _desktopStoreMsg(speakerJson, 'dm')
-                        if storeInboxPosts:
-                            _desktopStoreMsg(speakerJson, 'inbox')
-
-                        if not showNewPosts:
                 _desktopClearScreen()
-                            _desktopShowBox(notifyJson, currTimeline,
+                _desktopShowBoxJson(currTimeline, boxJson,
                                     None, systemLanguage, espeak,
-                                            currInboxIndex, 10,
+                                    pageNumber,
                                     newRepliesExist,
                                     newDMsExist)
-                        else:
+            prevTimelineFirstId = timelineFirstId
-                            print('')
-
-                    prevSay = speakerJson['say']
-            if speakerJson.get('id'):
-                currPostId = speakerJson['id']
 
         # wait for a while, or until a key is pressed
         if noKeyPress:
             time.sleep(10)
-        else:
-            if nextCommandStr:
-                commandStr = nextCommandStr
-                nextCommandStr = None
         else:
             commandStr = _desktopWaitForCmd(30, debug)
         if commandStr:
@@ -1039,127 +1029,113 @@ def runDesktopClient(baseDir: str, proxyType: str, httpPrefix: str,
                     commandStr = _desktopWaitForCmd(2, debug)
                 break
             elif commandStr.startswith('show dm'):
-                currDMIndex = 0
+                pageNumber = 1
-                _desktopShowBox(notifyJson, 'dm',
+                prevTimelineFirstId = ''
-                                screenreader, systemLanguage, espeak,
-                                currDMIndex, 10,
-                                newRepliesExist, newDMsExist)
                 currTimeline = 'dm'
+                boxJson = c2sBoxJson(baseDir, session,
+                                     nickname, password,
+                                     domain, port, httpPrefix,
+                                     currTimeline, pageNumber,
+                                     debug)
+                if boxJson:
+                    _desktopShowBoxJson(currTimeline, boxJson,
+                                        screenreader, systemLanguage, espeak,
+                                        pageNumber,
+                                        newRepliesExist, newDMsExist)
                 newDMsExist = False
             elif commandStr.startswith('show rep'):
-                currRepliesIndex = 0
+                pageNumber = 1
-                _desktopShowBox(notifyJson, 'replies',
+                prevTimelineFirstId = ''
-                                screenreader, systemLanguage, espeak,
-                                currRepliesIndex, 10,
-                                newRepliesExist, newDMsExist)
                 currTimeline = 'replies'
+                boxJson = c2sBoxJson(baseDir, session,
+                                     nickname, password,
+                                     domain, port, httpPrefix,
+                                     currTimeline, pageNumber,
+                                     debug)
+                if boxJson:
+                    _desktopShowBoxJson(currTimeline, boxJson,
+                                        screenreader, systemLanguage, espeak,
+                                        pageNumber,
+                                        newRepliesExist, newDMsExist)
                 # Turn off the replies indicator
                 newRepliesExist = False
             elif commandStr.startswith('show sen'):
-                currSentIndex = 0
+                pageNumber = 1
-                _desktopShowBox(notifyJson, 'sent',
+                prevTimelineFirstId = ''
+                currTimeline = 'outbox'
+                boxJson = c2sBoxJson(baseDir, session,
+                                     nickname, password,
+                                     domain, port, httpPrefix,
+                                     currTimeline, pageNumber,
+                                     debug)
+                if boxJson:
+                    _desktopShowBoxJson(currTimeline, boxJson,
                                         screenreader, systemLanguage, espeak,
-                                currSentIndex, 10,
+                                        pageNumber,
                                         newRepliesExist, newDMsExist)
-                currTimeline = 'sent'
             elif (commandStr == 'show' or commandStr.startswith('show in') or
                   commandStr == 'clear'):
-                currInboxIndex = 0
+                pageNumber = 1
-                _desktopShowBox(notifyJson, 'inbox',
+                prevTimelineFirstId = ''
-                                screenreader, systemLanguage, espeak,
-                                currInboxIndex, 10,
-                                newRepliesExist, newDMsExist)
                 currTimeline = 'inbox'
+                boxJson = c2sBoxJson(baseDir, session,
+                                     nickname, password,
+                                     domain, port, httpPrefix,
+                                     currTimeline, pageNumber,
+                                     debug)
+                if boxJson:
+                    _desktopShowBoxJson(currTimeline, boxJson,
+                                        screenreader, systemLanguage, espeak,
+                                        pageNumber,
+                                        newRepliesExist, newDMsExist)
             elif commandStr.startswith('next'):
-                if currTimeline == 'dm':
+                pageNumber += 1
-                    currDMIndex += 10
+                prevTimelineFirstId = ''
-                    _desktopShowBox(notifyJson, 'dm',
+                boxJson = c2sBoxJson(baseDir, session,
+                                     nickname, password,
+                                     domain, port, httpPrefix,
+                                     currTimeline, pageNumber,
+                                     debug)
+                if boxJson:
+                    _desktopShowBoxJson(currTimeline, boxJson,
                                         screenreader, systemLanguage, espeak,
-                                    currDMIndex, 10,
+                                        pageNumber,
-                                    newRepliesExist, newDMsExist)
-                elif currTimeline == 'replies':
-                    currRepliesIndex += 10
-                    _desktopShowBox(notifyJson, 'replies',
-                                    screenreader, systemLanguage, espeak,
-                                    currRepliesIndex, 10,
-                                    newRepliesExist, newDMsExist)
-                elif currTimeline == 'sent':
-                    currSentIndex += 10
-                    _desktopShowBox(notifyJson, 'sent',
-                                    screenreader, systemLanguage, espeak,
-                                    currSentIndex, 10,
-                                    newRepliesExist, newDMsExist)
-                elif currTimeline == 'inbox':
-                    currInboxIndex += 10
-                    _desktopShowBox(notifyJson, 'inbox',
-                                    screenreader, systemLanguage, espeak,
-                                    currInboxIndex, 10,
                                         newRepliesExist, newDMsExist)
             elif commandStr.startswith('prev'):
-                if currTimeline == 'dm':
+                pageNumber -= 1
-                    currDMIndex -= 10
+                if pageNumber < 1:
-                    if currDMIndex < 0:
+                    pageNumber = 1
-                        currDMIndex = 0
+                prevTimelineFirstId = ''
-                    _desktopShowBox(notifyJson, 'dm',
+                boxJson = c2sBoxJson(baseDir, session,
+                                     nickname, password,
+                                     domain, port, httpPrefix,
+                                     currTimeline, pageNumber,
+                                     debug)
+                if boxJson:
+                    _desktopShowBoxJson(currTimeline, boxJson,
                                         screenreader, systemLanguage, espeak,
-                                    currDMIndex, 10,
+                                        pageNumber,
-                                    newRepliesExist, newDMsExist)
-                elif currTimeline == 'replies':
-                    currRepliesIndex -= 10
-                    if currRepliesIndex < 0:
-                        currRepliesIndex = 0
-                    _desktopShowBox(notifyJson, 'replies',
-                                    screenreader, systemLanguage, espeak,
-                                    currRepliesIndex, 10,
-                                    newRepliesExist, newDMsExist)
-                elif currTimeline == 'sent':
-                    currSentIndex -= 10
-                    if currSentIndex < 0:
-                        currSentIndex = 0
-                    _desktopShowBox(notifyJson, 'sent',
-                                    screenreader, systemLanguage, espeak,
-                                    currSentIndex, 10,
-                                    newRepliesExist, newDMsExist)
-                elif currTimeline == 'inbox':
-                    currInboxIndex -= 10
-                    if currInboxIndex < 0:
-                        currInboxIndex = 0
-                    _desktopShowBox(notifyJson, 'inbox',
-                                    screenreader, systemLanguage, espeak,
-                                    currInboxIndex, 10,
                                         newRepliesExist, newDMsExist)
             elif commandStr.startswith('read ') or commandStr == 'read':
                 if commandStr == 'read':
                     postIndexStr = '1'
                 else:
                     postIndexStr = commandStr.split('read ')[1]
-                if postIndexStr.isdigit():
+                if boxJson and postIndexStr.isdigit():
                     postIndex = int(postIndexStr)
-                    speakerJson = \
+                    postJsonObject = \
-                        _readLocalBoxPost(currTimeline, postIndex,
+                        _readLocalBoxPost(currTimeline,
+                                          pageNumber, postIndex, boxJson,
                                           systemLanguage, screenreader,
                                           espeak)
-                    # if we are on a busy timeline then wait for the post
-                    # to be read because otherwise it could potentially be
-                    # immediately overwritten as the timeline refreshes
-                    if speakerJson and not noKeyPress:
-                        # average reading speed is said to be 800 chars/min
-                        # so this allows some overhead
-                        readingSpeedCharsPerMin = 600
-                        displayTimeSec = \
-                            int(len(speakerJson['say']) * 60 /
-                                readingSpeedCharsPerMin)
-                        if displayTimeSec < 10:
-                            displayTimeSec = 10
-                        nextCommandStr = \
-                            _desktopWaitForCmd(displayTimeSec, debug)
                 print('')
             elif commandStr == 'reply' or commandStr == 'r':
-                if speakerJson.get('id'):
+                if postJsonObject:
-                    postId = speakerJson['id']
+                    if postJsonObject.get('id'):
+                        postId = postJsonObject['id']
                         subject = None
-                    if speakerJson.get('summary'):
+                        if postJsonObject['object'].get('summary'):
-                        subject = speakerJson['summary']
+                            subject = postJsonObject['object']['summary']
                         sessionReply = createSession(proxyType)
                         _desktopReplyToPost(sessionReply, postId,
                                             baseDir, nickname, password,
@@ -1212,39 +1188,50 @@ def runDesktopClient(baseDir: str, proxyType: str, httpPrefix: str,
                                     espeak)
                 print('')
             elif commandStr == 'like':
-                if speakerJson.get('id'):
+                if postJsonObject:
-                    sayStr = 'Liking post by ' + speakerJson['name']
+                    if postJsonObject.get('id'):
+                        likeActor = postJsonObject['object']['attributedTo']
+                        sayStr = 'Liking post by ' + \
+                            getNicknameFromActor(likeActor)
                         _sayCommand(sayStr, sayStr,
                                     screenreader,
                                     systemLanguage, espeak)
                         sessionLike = createSession(proxyType)
                         sendLikeViaServer(baseDir, sessionLike,
                                           nickname, password,
-                                      domain, port,
+                                          domain, port, httpPrefix,
-                                      httpPrefix, speakerJson['id'],
+                                          postJsonObject['id'],
                                           cachedWebfingers, personCache,
                                           False, __version__)
                 print('')
             elif commandStr == 'unlike' or commandStr == 'undo like':
-                if speakerJson.get('id'):
+                if postJsonObject:
-                    sayStr = 'Undoing like of post by ' + speakerJson['name']
+                    if postJsonObject.get('id'):
+                        unlikeActor = postJsonObject['object']['attributedTo']
+                        sayStr = \
+                            'Undoing like of post by ' + \
+                            getNicknameFromActor(unlikeActor)
                         _sayCommand(sayStr, sayStr,
                                     screenreader,
                                     systemLanguage, espeak)
                         sessionUnlike = createSession(proxyType)
                         sendUndoLikeViaServer(baseDir, sessionUnlike,
                                               nickname, password,
-                                          domain, port,
+                                              domain, port, httpPrefix,
-                                          httpPrefix, speakerJson['id'],
+                                              postJsonObject['id'],
                                               cachedWebfingers, personCache,
                                               False, __version__)
                 print('')
             elif (commandStr == 'announce' or
                   commandStr == 'boost' or
                   commandStr == 'retweet'):
-                if speakerJson.get('id'):
+                if postJsonObject:
-                    postId = speakerJson['id']
+                    if postJsonObject.get('id'):
-                    sayStr = 'Announcing post by ' + speakerJson['name']
+                        postId = postJsonObject['id']
+                        announceActor = \
+                            postJsonObject['object']['attributedTo']
+                        sayStr = 'Announcing post by ' + \
+                            getNicknameFromActor(announceActor)
                         _sayCommand(sayStr, sayStr,
                                     screenreader,
                                     systemLanguage, espeak)
@@ -1394,31 +1381,5 @@ def runDesktopClient(baseDir: str, proxyType: str, httpPrefix: str,
                     _sayCommand(sayStr, sayStr, originalScreenReader,
                                 systemLanguage, espeak)
                 print('')
-            elif commandStr.startswith('accept'):
-                if notifyJson:
-                    if notifyJson.get('followRequestsList'):
-                        if len(notifyJson['followRequestsList']) > 0:
-                            sayStr = 'Accepting follow request for ' + \
-                                notifyJson['followRequestsList'][0]
-                            _sayCommand(sayStr, sayStr, originalScreenReader,
-                                        systemLanguage, espeak)
-                            # TODO
-                            sayStr = 'This command is not yet implemented'
-                            _sayCommand(sayStr, sayStr, originalScreenReader,
-                                        systemLanguage, espeak)
-                print('')
-            elif commandStr.startswith('reject'):
-                if notifyJson:
-                    if notifyJson.get('followRequestsList'):
-                        if len(notifyJson['followRequestsList']) > 0:
-                            sayStr = 'Rejecting follow request for ' + \
-                                notifyJson['followRequestsList'][0]
-                            _sayCommand(sayStr, sayStr, originalScreenReader,
-                                        systemLanguage, espeak)
-                            # TODO
-                            sayStr = 'This command is not yet implemented'
-                            _sayCommand(sayStr, sayStr, originalScreenReader,
-                                        systemLanguage, espeak)
-                print('')
             elif commandStr.startswith('h'):
                 _desktopHelp()