OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix deleting not found remote actors

pull/1567/head
Chocobozzz 2019-01-14 12:11:06 +01:00
parent b5487ff4a5
commit 699b059e2d
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/lib/activitypub/actor.ts
View File

@ -211,7 +211,14 @@ async function refreshActorIfNeeded (
const actor = fetchedType === 'all' ? actorArg : await ActorModel.loadByUrlAndPopulateAccountAndChannel(actorArg.url)
try {
const actorUrl = await getUrlFromWebfinger(actor.preferredUsername + '@' + actor.getHost())
let actorUrl: string
try {
actorUrl = await getUrlFromWebfinger(actor.preferredUsername + '@' + actor.getHost())
} catch (err) {
logger.warn('Cannot get actor URL from webfinger, keeping the old one.', err)
actorUrl = actor.url
}
const { result, statusCode } = await fetchRemoteActor(actorUrl)
if (statusCode === 404) {
@ -429,5 +436,3 @@ async function saveVideoChannel (actor: ActorModel, result: FetchRemoteActorResu
return videoChannelCreated
}