From e7b7651f4892f1d89c572420dd64d33218d54470 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Tue, 23 Mar 2021 14:16:44 +0000
Subject: [PATCH] Show who liked a post

---
 README_commandline.md |  2 +
 desktop_client.py     | 96 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+)

diff --git a/README_commandline.md b/README_commandline.md
index 57388b8ab..14e54a9ee 100644
--- a/README_commandline.md
+++ b/README_commandline.md
@@ -458,6 +458,8 @@ like                                  Like the last post
 unlike                                Unlike the last post
 bookmark                              Bookmark the last post
 unbookmark                            Unbookmark the last post
+block [post number|handle]            Block someone via post number or handle
+unblock [handle]                      Unblock someone
 mute                                  Mute the last post
 unmute                                Unmute the last post
 reply                                 Reply to the last post
diff --git a/desktop_client.py b/desktop_client.py
index 19f96c169..9fe2d3f0a 100644
--- a/desktop_client.py
+++ b/desktop_client.py
@@ -31,6 +31,8 @@ from like import sendLikeViaServer
 from like import sendUndoLikeViaServer
 from follow import sendFollowRequestViaServer
 from follow import sendUnfollowRequestViaServer
+from posts import sendBlockViaServer
+from posts import sendUndoBlockViaServer
 from posts import sendMuteViaServer
 from posts import sendUndoMuteViaServer
 from posts import sendPostViaServer
@@ -78,6 +80,10 @@ def _desktopHelp() -> None:
           'Bookmark the last post')
     print(indent + 'unbookmark                            ' +
           'Unbookmark the last post')
+    print(indent + 'block [post number|handle]            ' +
+          'Block someone via post number or handle')
+    print(indent + 'unblock [handle]                      ' +
+          'Unblock someone')
     print(indent + 'mute                                  ' +
           'Mute the last post')
     print(indent + 'unmute                                ' +
@@ -674,6 +680,16 @@ def _readLocalBoxPost(session, nickname: str, domain: str,
     _sayCommand(content, messageStr, screenreader,
                 systemLanguage, espeak, nameStr, gender)
 
+    if postJsonObject['object'].get('likes'):
+        if postJsonObject['object']['likes'].get('items'):
+            print('')
+            ctr = 0
+            for item in postJsonObject['object']['likes']['items']:
+                print('  ❤ ' + str(item['actor']))
+                ctr += 1
+                if ctr >= 10:
+                    break
+
     # if the post is addressed to you then mark it as read
     if _postIsToYou(yourActor, postJsonObject):
         if isDM(postJsonObject):
@@ -1627,6 +1643,86 @@ def runDesktopClient(baseDir: str, proxyType: str, httpPrefix: str,
                                               False, __version__)
                         refreshTimeline = True
                 print('')
+            elif (commandStr.startswith('undo block ') or
+                  commandStr.startswith('remove block ') or
+                  commandStr.startswith('rm block ') or
+                  commandStr.startswith('unblock ')):
+                currIndex = 0
+                if ' ' in commandStr:
+                    postIndex = commandStr.split(' ')[-1].strip()
+                    if postIndex.isdigit():
+                        currIndex = int(postIndex)
+                if currIndex > 0 and boxJson:
+                    postJsonObject = \
+                        _desktopGetBoxPostObject(boxJson, currIndex)
+                if postJsonObject:
+                    if postJsonObject.get('id') and \
+                       postJsonObject.get('object'):
+                        if isinstance(postJsonObject['object'], dict):
+                            if postJsonObject['object'].get('attributedTo'):
+                                blockActor = \
+                                    postJsonObject['object']['attributedTo']
+                                sayStr = 'Unblocking ' + \
+                                    getNicknameFromActor(blockActor)
+                                _sayCommand(sayStr, sayStr,
+                                            screenreader,
+                                            systemLanguage, espeak)
+                                sessionBlock = createSession(proxyType)
+                                sendUndoBlockViaServer(baseDir, sessionBlock,
+                                                       nickname, password,
+                                                       domain, port,
+                                                       httpPrefix,
+                                                       blockActor,
+                                                       cachedWebfingers,
+                                                       personCache,
+                                                       False, __version__)
+                refreshTimeline = True
+                print('')
+            elif commandStr.startswith('block '):
+                blockActor = None
+                currIndex = 0
+                if ' ' in commandStr:
+                    postIndex = commandStr.split(' ')[-1].strip()
+                    if postIndex.isdigit():
+                        currIndex = int(postIndex)
+                    else:
+                        if '@' in postIndex:
+                            blockHandle = postIndex
+                            if blockHandle.startswith('@'):
+                                blockHandle = blockHandle[1:]
+                            if '@' in blockHandle:
+                                blockDomain = blockHandle.split('@')[1]
+                                blockNickname = blockHandle.split('@')[0]
+                                blockActor = \
+                                    httpPrefix + '://' + blockDomain + \
+                                    '/users/' + blockNickname
+                if currIndex > 0 and boxJson and not blockActor:
+                    postJsonObject = \
+                        _desktopGetBoxPostObject(boxJson, currIndex)
+                if postJsonObject and not blockActor:
+                    if postJsonObject.get('id') and \
+                       postJsonObject.get('object'):
+                        if isinstance(postJsonObject['object'], dict):
+                            if postJsonObject['object'].get('attributedTo'):
+                                blockActor = \
+                                    postJsonObject['object']['attributedTo']
+                if blockActor:
+                    sayStr = 'Blocking ' + \
+                        getNicknameFromActor(blockActor)
+                    _sayCommand(sayStr, sayStr,
+                                screenreader,
+                                systemLanguage, espeak)
+                    sessionBlock = createSession(proxyType)
+                    sendBlockViaServer(baseDir, sessionBlock,
+                                       nickname, password,
+                                       domain, port,
+                                       httpPrefix,
+                                       blockActor,
+                                       cachedWebfingers,
+                                       personCache,
+                                       False, __version__)
+                refreshTimeline = True
+                print('')
             elif commandStr == 'unlike' or commandStr == 'undo like':
                 currIndex = 0
                 if ' ' in commandStr: