indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Lookup actor during migrations

merge-requests/30/head
Bob Mottram 2021-07-03 22:42:26 +01:00
parent 9194d95b17
commit 6f10986407
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
migrate.py
View File

@ -13,9 +13,9 @@ from utils import getNicknameFromActor
from utils import getDomainFromActor from utils import getDomainFromActor
from webfinger import webfingerHandle from webfinger import webfingerHandle
from blocking import isBlocked from blocking import isBlocked
from session import getJson
from posts import getUserUrl from posts import getUserUrl
from follow import unfollowAccount from follow import unfollowAccount
from person import getActorJson
def _moveFollowingHandlesForAccount(baseDir: str, nickname: str, domain: str, def _moveFollowingHandlesForAccount(baseDir: str, nickname: str, domain: str,
@ -73,22 +73,16 @@ def _updateMovedHandle(baseDir: str, nickname: str, domain: str,
print('wfRequest error: ' + str(wfRequest['errors'])) print('wfRequest error: ' + str(wfRequest['errors']))
return ctr return ctr
profileStr = 'https://www.w3.org/ns/activitystreams'
asHeader = {
'Accept': 'application/activity+json; profile="' + profileStr + '"'
}
if not personUrl: if not personUrl:
personUrl = getUserUrl(wfRequest, 0, debug) personUrl = getUserUrl(wfRequest, 0, debug)
if not personUrl: if not personUrl:
return ctr return ctr
profileStr = 'https://www.w3.org/ns/activitystreams' gnunet = False
asHeader = { if httpPrefix == 'gnunet':
'Accept': 'application/ld+json; profile="' + profileStr + '"' gnunet = True
}
personJson = \ personJson = \
getJson(session, personUrl, asHeader, None, getActorJson(domain, personUrl, httpPrefix, gnunet, debug)
debug, __version__, httpPrefix, None)
if not personJson: if not personJson:
return ctr return ctr
if not personJson.get('movedTo'): if not personJson.get('movedTo'):