aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/lib/activitypub/actor.ts2
-rw-r--r--server/lib/job-queue/handlers/activitypub-follow.ts4
2 files changed, 3 insertions, 3 deletions
diff --git a/server/lib/activitypub/actor.ts b/server/lib/activitypub/actor.ts
index 7f2fc3236..b67d9f08b 100644
--- a/server/lib/activitypub/actor.ts
+++ b/server/lib/activitypub/actor.ts
@@ -41,7 +41,7 @@ async function getOrCreateActorAndServerAndModel (activityActor: string | Activi
41 41
42 let actor = await ActorModel.loadByUrl(actorUrl) 42 let actor = await ActorModel.loadByUrl(actorUrl)
43 // Orphan actor (not associated to an account of channel) so recreate it 43 // Orphan actor (not associated to an account of channel) so recreate it
44 if (!actor.Account && !actor.VideoChannel) { 44 if (actor && (!actor.Account && !actor.VideoChannel)) {
45 await actor.destroy() 45 await actor.destroy()
46 actor = null 46 actor = null
47 } 47 }
diff --git a/server/lib/job-queue/handlers/activitypub-follow.ts b/server/lib/job-queue/handlers/activitypub-follow.ts
index 2c1b4f49d..393c6936c 100644
--- a/server/lib/job-queue/handlers/activitypub-follow.ts
+++ b/server/lib/job-queue/handlers/activitypub-follow.ts
@@ -58,7 +58,7 @@ function follow (fromActor: ActorModel, targetActor: ActorModel) {
58 actorFollow.ActorFollowing = targetActor 58 actorFollow.ActorFollowing = targetActor
59 actorFollow.ActorFollower = fromActor 59 actorFollow.ActorFollower = fromActor
60 60
61 // Send a notification to remote server 61 // Send a notification to remote server if our follow is not already accepted
62 await sendFollow(actorFollow) 62 if (actorFollow.state !== 'accepted') await sendFollow(actorFollow)
63 }) 63 })
64} 64}