From bc8f671eb18413e642db7704187d6aef281120be Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 8 Aug 2019 09:38:40 +0100
Subject: [PATCH] Multi-line

---
 posts.py        | 4 ++--
 webinterface.py | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/posts.py b/posts.py
index b80ce7f1c..8a3a41f9a 100644
--- a/posts.py
+++ b/posts.py
@@ -358,8 +358,8 @@ def savePostToBox(baseDir: str,httpPrefix: str,postId: str, \
 
     if not postId:
         statusNumber,published = getStatusNumber()
-        postId=httpPrefix+'://'+originalDomain+'/users/'+nickname+ \
-            '/statuses/'+statusNumber
+        postId=httpPrefix+'://'+originalDomain+'/users/'+ \
+            nickname+'/statuses/'+statusNumber
         postJsonObject['id']=postId+'/activity'
     if postJsonObject.get('object'):
         if isinstance(postJsonObject['object'], dict):
diff --git a/webinterface.py b/webinterface.py
index 467217fca..c146037c7 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -349,7 +349,7 @@ def htmlProfileFollowing(baseDir: str,httpPrefix: str, \
     for item in followingJson['orderedItems']:
         profileStr+= \
             individualFollowAsHtml(session,wfRequest,personCache, \
-                                   domain,item,authorized,buttons)
+                                   domain,item,authorized,nickname,buttons)
     return profileStr
 
 def htmlProfileRoles(nickname: str,domain: str,rolesJson: {}) -> str:
@@ -543,6 +543,7 @@ def individualFollowAsHtml(session,wfRequest: {}, \
                            personCache: {},domain: str, \
                            followUrl: str, \
                            authorized: bool, \
+                           actorNickname: str, \
                            buttons=[]) -> str:
     nickname=getNicknameFromActor(followUrl)
     domain,port=getDomainFromActor(followUrl)
@@ -560,9 +561,9 @@ def individualFollowAsHtml(session,wfRequest: {}, \
     if authorized:
         for b in buttons:
             if b=='block':
-                buttonsStr+='<a href="/inbox"><button class="buttonunfollow">Block</button></a>'
+                buttonsStr+='<a href="/users/'+actorNickname+'?block='+followUrl+';'+avatarUrl+'"><button class="buttonunfollow">Block</button></a>'
             if b=='unfollow':
-                buttonsStr+='<a href="/inbox"><button class="buttonunfollow">Unfollow</button></a>'
+                buttonsStr+='<a href="/users/'+actorNickname+'?unfollow='+followUrl+';'+avatarUrl+'"><button class="buttonunfollow">Unfollow</button></a>'
 
     return \
         '<div class="container">\n' \