Merge branch '2024.09-rc' into merge-2024.09-rc-into-develop

diff --cc database.sql
Simple merge

diff --cc src/Contact/Avatar.php
Simple merge

diff --cc src/Model/Contact.php
Simple merge

diff --cc src/Model/Item.php
Simple merge

diff --cc src/Model/Photo.php
Simple merge

diff --cc src/Model/Post/Link.php
Simple merge

diff --cc src/Model/Post/Media.php
Simple merge

diff --cc src/Network/Probe.php
Simple merge

diff --cc src/Object/Image.php
index 43b6d916070d72c2a795847bc15e0c0b86e7f640,08ebe4f458d7e91236a085b1943e52b4f4965fcc..0aad761341bdf6dc5d34c0a28ddcbe3befd99536
--- 1/src/Object/Image.php
--- 2/src/Object/Image.php
+++ b/src/Object/Image.php
@@@ -765,12 -765,13 +765,12 @@@ class Imag
        /**
         * Create a blurhash out of a given image string
         *
 -       * @param string $img_str
         * @return string
         */
-       public function getBlurHash(): string
+       public function getBlurHash(string $img_str = ''): string
        {
-               $image = New Image($this->asString(), $this->getType(), $this->filename, false);
+               $image = new Image($img_str ?: $this->asString(), $this->getType(), $this->filename, false);
 -              if (empty($image) || !$this->isValid()) {
 +              if (!$this->isValid()) {
                        return '';
                }
  

diff --cc src/Object/Post.php
Simple merge

diff --cc src/Protocol/ATProtocol.php
Simple merge

diff --cc src/Protocol/ATProtocol/Actor.php
index 18b5fc957d8abc137eb012ef1867559649fdac60,a45bdd297829f9319ef02f873c46d161d1351a2d..2b5cab3fbd45e1f20c7860b7592a477ea11c6d60
--- 1/src/Protocol/ATProtocol/Actor.php
--- 2/src/Protocol/ATProtocol/Actor.php
+++ b/src/Protocol/ATProtocol/Actor.php
@@@ -174,26 -195,29 +195,26 @@@ class Acto
                        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);
+               $this->updateContactByDID($did, $contact_uid);
  
                return Contact::getById($cid);
        }

diff --cc src/Protocol/ATProtocol/Processor.php
Simple merge

diff --cc src/Util/Images.php
Simple merge

diff --cc src/Util/ParseUrl.php
Simple merge