2 files changed, 7 insertions, 5 deletions

diff --git a/server/lib/activitypub/process/process-accept.ts b/server/lib/activitypub/process/process-accept.ts
index b9d906ec9..551f09ea7 100644
--- a/server/lib/activitypub/process/process-accept.ts
+++ b/server/lib/activitypub/process/process-accept.ts
@@ -23,7 +23,9 @@ async function processAccept (actor: ActorModel, targetActor: ActorModel) {
   const follow = await ActorFollowModel.loadByActorAndTarget(actor.id, targetActor.id)
   if (!follow) throw new Error('Cannot find associated follow.')
 
-  follow.set('state', 'accepted')
-  await follow.save()
-  await addFetchOutboxJob(targetActor, undefined)
+  if (follow.state !== 'accepted') {
+    follow.set('state', 'accepted')
+    await follow.save()
+    await addFetchOutboxJob(targetActor, undefined)
+  }
 }
diff --git a/server/lib/activitypub/process/process-create.ts b/server/lib/activitypub/process/process-create.ts
index 08d61996a..442cd5c0b 100644
--- a/server/lib/activitypub/process/process-create.ts
+++ b/server/lib/activitypub/process/process-create.ts
@@ -147,8 +147,8 @@ async function processCreateView (byActor: ActorModel, activity: ActivityCreate)
 
   const { video } = await getOrCreateAccountAndVideoAndChannel(view.object)
 
-  const account = await ActorModel.loadByUrl(view.actor)
-  if (!account) throw new Error('Unknown account ' + view.actor)
+  const actor = await ActorModel.loadByUrl(view.actor)
+  if (!actor) throw new Error('Unknown actor ' + view.actor)
 
   await video.increment('views')