Merge branch 'develop' into phpstan-level-1

diff --cc src/Module/BaseApi.php
Simple merge

diff --cc src/Module/Item/Display.php
Simple merge

diff --cc src/Module/Magic.php
index c3b9a2b4db152b6bb4a6549f5b81150e36ca22d8,24e6374f5a2125732009e1256929d144715507fa..c06cbd6f4e858f2ad5cd13a27eb4a3a685ede670
--- 1/src/Module/Magic.php
--- 2/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@@ -76,15 -80,18 +78,15 @@@ class Magic extends BaseModul
  
                $target = $dest ?: $addr;
  
 -              if ($addr ?: $dest) {
 -                      $contact = Contact::getByURL($addr ?: $dest);
 +              $contact = Contact::getByURL($addr ?: $dest);
 +              if ($contact === [] && $owa === 0) {
 +                      $this->logger->info('No contact record found, no oWA, redirecting to destination.', ['request' => $request, 'server' => $_SERVER, 'dest' => $dest]);
-                       $this->app->redirect($dest);
++                      $this->appHelper->redirect($dest);
                }
  
 -              if (empty($contact)) {
 -                      if (!$owa) {
 -                              $this->logger->info('No contact record found, no oWA, redirecting to destination.', ['request' => $request, 'server' => $_SERVER, 'dest' => $dest]);
 -                              $this->appHelper->redirect($dest);
 -                      }
 -              } else {
 +              if ($contact !== []) {
                        // Redirect if the contact is already authenticated on this site.
-                       if ($this->app->getContactId() && strpos($contact['nurl'], Strings::normaliseLink($this->baseUrl)) !== false) {
+                       if ($this->appHelper->getContactId() && strpos($contact['nurl'], Strings::normaliseLink($this->baseUrl)) !== false) {
                                $this->logger->info('Contact is already authenticated, redirecting to destination.', ['dest' => $dest]);
                                System::externalRedirect($dest);
                        }
@@@ -92,9 -99,9 +94,9 @@@
                        $this->logger->debug('Contact found', ['url' => $contact['url']]);
                }
  
 -              if (!$this->userSession->getLocalUserId() || !$owa) {
 +              if (!$this->userSession->getLocalUserId() || $owa === 0) {
                        $this->logger->notice('Not logged in or not OWA, redirecting to destination.', ['uid' => $this->userSession->getLocalUserId(), 'owa' => $owa, 'dest' => $dest]);
-                       $this->app->redirect($dest);
+                       $this->appHelper->redirect($dest);
                }
  
                $dest = Network::removeUrlParameter($dest, 'zid');

diff --cc src/Module/Profile/Photos.php
Simple merge

diff --cc src/Module/Security/TwoFactor/Trust.php
Simple merge

diff --cc src/Protocol/ActivityPub/Queue.php
Simple merge

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

diff --cc view/theme/frio/config.php
Simple merge