diff --git a/daemon.py b/daemon.py index 675a205de..2e25d1989 100644 --- a/daemon.py +++ b/daemon.py @@ -2344,15 +2344,15 @@ class PubServer(BaseHTTPRequestHandler): if debug: print('You cannot follow the news actor') else: - if debug: - print('Sending follow request from ' + - followerNickname + ' to ' + followingActor) + print('Sending follow request from ' + + followerNickname + ' to ' + followingActor) sendFollowRequest(self.server.session, baseDir, followerNickname, domain, port, httpPrefix, followingNickname, followingDomain, + followingActor, followingPort, httpPrefix, False, self.server.federationList, self.server.sendThreads, diff --git a/follow.py b/follow.py index 30522720a..cce18f1b2 100644 --- a/follow.py +++ b/follow.py @@ -872,6 +872,7 @@ def followedAccountRejects(session, baseDir: str, httpPrefix: str, def sendFollowRequest(session, baseDir: str, nickname: str, domain: str, port: int, httpPrefix: str, followNickname: str, followDomain: str, + followedActor: str, followPort: int, followHttpPrefix: str, clientToServer: bool, federationList: [], sendThreads: [], postLog: [], cachedWebfingers: {}, @@ -880,6 +881,7 @@ def sendFollowRequest(session, baseDir: str, """Gets the json object for sending a follow request """ if not domainPermitted(followDomain, federationList): + print('You are not permitted to follow the domain ' + followDomain) return None fullDomain = getFullDomain(domain, port) @@ -890,8 +892,7 @@ def sendFollowRequest(session, baseDir: str, statusNumber, published = getStatusNumber() if followNickname: - followedId = followHttpPrefix + '://' + \ - requestDomain + '/users/' + followNickname + followedId = followedActor followHandle = followNickname + '@' + requestDomain else: if debug: diff --git a/tests.py b/tests.py index 284b13678..308e1fb0c 100644 --- a/tests.py +++ b/tests.py @@ -849,10 +849,12 @@ def testFollowBetweenServers(): alicePersonCache = {} aliceCachedWebfingers = {} alicePostLog = [] + bobActor = httpPrefix + '://' + bobAddress + '/users/bob' sendResult = \ sendFollowRequest(sessionAlice, aliceDir, 'alice', aliceDomain, alicePort, httpPrefix, - 'bob', bobDomain, bobPort, httpPrefix, + 'bob', bobDomain, bobActor, + bobPort, httpPrefix, clientToServer, federationList, aliceSendThreads, alicePostLog, aliceCachedWebfingers, alicePersonCache,