From e2e8aeafe7c83fdabbb7c6c096e89506b8755035 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 23 Oct 2021 14:43:21 +0100 Subject: [PATCH] Argument order --- daemon.py | 4 ++-- inbox.py | 2 +- posts.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/daemon.py b/daemon.py index ae431d441..731bc8512 100644 --- a/daemon.py +++ b/daemon.py @@ -3522,7 +3522,7 @@ class PubServer(BaseHTTPRequestHandler): shareActor = shareActor.split('&')[0] adminNickname = getConfigParam(baseDir, 'admin') adminActor = \ - localActorUrl(httpPrefix, domainFull, adminNickname) + localActorUrl(httpPrefix, adminNickname, domainFull) actor = originPathStr actorNickname = getNicknameFromActor(actor) if actor == shareActor or actor == adminActor or \ @@ -3589,7 +3589,7 @@ class PubServer(BaseHTTPRequestHandler): shareActor = shareActor.split('&')[0] adminNickname = getConfigParam(baseDir, 'admin') adminActor = \ - localActorUrl(httpPrefix, domainFull, adminNickname) + localActorUrl(httpPrefix, adminNickname, domainFull) actor = originPathStr actorNickname = getNicknameFromActor(actor) if actor == shareActor or actor == adminActor or \ diff --git a/inbox.py b/inbox.py index 0b278ac05..deac45910 100644 --- a/inbox.py +++ b/inbox.py @@ -172,7 +172,7 @@ def _updateCachedHashtagSwarm(baseDir: str, nickname: str, domain: str, else: print('WARN: no modified date for ' + str(lastModified)) if saveSwarm: - actor = localActorUrl(httpPrefix, domainFull, nickname) + actor = localActorUrl(httpPrefix, nickname, domainFull) newSwarmStr = htmlHashTagSwarm(baseDir, actor, translate) if newSwarmStr: try: diff --git a/posts.py b/posts.py index 060ad6b1d..80711aa6d 100644 --- a/posts.py +++ b/posts.py @@ -1846,7 +1846,7 @@ def createUnlistedPost(baseDir: str, """Unlisted post. This has the #Public and followers links inverted. """ domainFull = getFullDomain(domain, port) - localActor = localActorUrl(httpPrefix, domainFull, nickname) + localActor = localActorUrl(httpPrefix, nickname, domainFull) return _createPostBase(baseDir, nickname, domain, port, localActor + '/followers', 'https://www.w3.org/ns/activitystreams#Public', @@ -1879,7 +1879,7 @@ def createFollowersOnlyPost(baseDir: str, """Followers only post """ domainFull = getFullDomain(domain, port) - localActor = localActorUrl(httpPrefix, domainFull, nickname) + localActor = localActorUrl(httpPrefix, nickname, domainFull) return _createPostBase(baseDir, nickname, domain, port, localActor + '/followers', None,