From 9867bdfcff7c5f9c6b76545004620e351fe3c099 Mon Sep 17 00:00:00 2001 From: Art4 Date: Mon, 9 Dec 2024 22:26:24 +0000 Subject: [PATCH] Fix errors from #14578 --- src/Protocol/ATProtocol/Actor.php | 39 +++++++++++++-------------- src/Protocol/ATProtocol/Processor.php | 8 +++--- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/src/Protocol/ATProtocol/Actor.php b/src/Protocol/ATProtocol/Actor.php index e3fdd7e185..18b5fc957d 100755 --- a/src/Protocol/ATProtocol/Actor.php +++ b/src/Protocol/ATProtocol/Actor.php @@ -174,27 +174,24 @@ class Actor return $contact; } - if (empty($contact)) { - $fields = [ - 'uid' => $contact_uid, - 'network' => Protocol::BLUESKY, - 'priority' => 1, - 'writable' => true, - 'blocked' => false, - 'readonly' => false, - 'pending' => false, - 'url' => $did, - 'nurl' => $did, - 'alias' => ATProtocol::WEB . '/profile/' . $did, - 'name' => $did, - 'nick' => $did, - 'addr' => $did, - 'rel' => Contact::NOTHING, - ]; - $cid = Contact::insert($fields); - } else { - $cid = $contact['id']; - } + $fields = [ + 'uid' => $contact_uid, + 'network' => Protocol::BLUESKY, + 'priority' => 1, + 'writable' => true, + 'blocked' => false, + 'readonly' => false, + 'pending' => false, + 'url' => $did, + 'nurl' => $did, + 'alias' => ATProtocol::WEB . '/profile/' . $did, + 'name' => $did, + 'nick' => $did, + 'addr' => $did, + 'rel' => Contact::NOTHING, + ]; + + $cid = Contact::insert($fields); $this->updateContactByDID($did); diff --git a/src/Protocol/ATProtocol/Processor.php b/src/Protocol/ATProtocol/Processor.php index 9416ef7a2f..a66c6a3e7b 100755 --- a/src/Protocol/ATProtocol/Processor.php +++ b/src/Protocol/ATProtocol/Processor.php @@ -125,6 +125,8 @@ class Processor public function createPost(stdClass $data, array $uids, bool $dont_fetch) { + $parent = ''; + if (!empty($data->commit->record->reply)) { $root = $this->getUri($data->commit->record->reply->root); $parent = $this->getUri($data->commit->record->reply->parent); @@ -166,7 +168,7 @@ class Processor return; } } - $item = $this->addMedia($post->thread->post->embed, $item, 0, 0, 0); + $item = $this->addMedia($post->thread->post->embed, $item, 0); } $id = Item::insert($item); @@ -295,7 +297,7 @@ class Processor } if (!empty($post->embed)) { - $item = $this->addMedia($post->embed, $item, $uid, $level); + $item = $this->addMedia($post->embed, $item, $level); } $item['restrictions'] = $this->getRestrictionsForUser($post, $item, $post_reason); @@ -819,7 +821,7 @@ class Processor } $elements = explode(':', $uri); - if (empty($elements) || ($elements[0] != 'at')) { + if ($elements[0] !== 'at') { $post = Post::selectFirstPost(['extid'], ['uri' => $uri]); return $this->getUriClass($post['extid'] ?? ''); }