From 3b3ded52120d77b2ca8b58acc9a3bfa13c24a1af Mon Sep 17 00:00:00 2001
From: tsmethurst <tobi.smethurst@protonmail.com>
Date: Thu, 20 Oct 2022 14:23:13 +0200
Subject: [PATCH] [PLUGIN][ActivityPub] Fix incorrect use of
 `ActivityPubActor::create`, should be `::createOrUpdate`

---
 plugins/ActivityPub/Util/Model/Actor.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/ActivityPub/Util/Model/Actor.php b/plugins/ActivityPub/Util/Model/Actor.php
index 0d239f3c8a..7f2071ae22 100644
--- a/plugins/ActivityPub/Util/Model/Actor.php
+++ b/plugins/ActivityPub/Util/Model/Actor.php
@@ -118,7 +118,7 @@ class Actor extends Model
             'modified' => new DateTime(),
         ];
         if (isset($options['objects']['Actor'])) {
-            $actor = GSActor::create($actor_map, $options['objects']['Actor']);
+            $actor = GSActor::createOrUpdate($options['objects']['Actor'], $actor_map);
         } else {
             $actor = GSActor::create($actor_map);
             DB::persist($actor);
@@ -133,7 +133,7 @@ class Actor extends Model
             'url'              => $object->get('url') ?? null,
         ];
         if (isset($options['objects']['ActivitypubActor'])) {
-            $ap_actor = ActivitypubActor::create($ap_actor_map, $options['objects']['ActivitypubActor']);
+            $ap_actor = ActivitypubActor::createOrUpdate($options['objects']['ActivitypubActor'], $ap_actor_map);
         } else {
             $ap_actor = ActivitypubActor::create($ap_actor_map);
             DB::persist($ap_actor);
@@ -145,7 +145,7 @@ class Actor extends Model
             'public_key' => ($object->has('publicKey') && isset($object->get('publicKey')['publicKeyPem'])) ? $object->get('publicKey')['publicKeyPem'] : null,
         ];
         if (isset($options['objects']['ActivitypubRsa'])) {
-            $apRSA = ActivitypubRsa::create($ap_rsa_map, $options['objects']['ActivitypubRsa']);
+            $apRSA = ActivitypubRsa::createOrUpdate($options['objects']['ActivitypubRsa'], $ap_rsa_map);
         } else {
             $apRSA = ActivitypubRsa::create($ap_rsa_map);
             DB::persist($apRSA);