Move Config::get() to DI::config()->get()

[friendica.git] / src / Worker / Delivery.php

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index a2088fde5dcbb3c28fb69d148bff5b60c8fb24bc..19035ac0a3bbd03efa55e358f7da7ef88c840c01 100644 (file)
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -5,7 +5,6 @@
 namespace Friendica\Worker;
 
 use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
@@ -197,6 +196,11 @@ class Delivery
                        $contact['network'] = Protocol::DIASPORA;
                }
 
+               // Ensure that local contacts are delivered locally
+               if (Model\Contact::isLocal($contact['url'])) {
+                       $contact['network'] = Protocol::DFRN;
+               }
+
                Logger::notice('Delivering', ['cmd' => $cmd, 'target' => $target_id, 'followup' => $followup, 'network' => $contact['network']]);
 
                switch ($contact['network']) {
@@ -235,7 +239,7 @@ class Delivery
        }
 
        /**
-        * @brief Deliver content via DFRN
+        * Deliver content via DFRN
         *
         * @param string  $cmd            Command
         * @param array   $contact        Contact record of the receiver
@@ -287,11 +291,8 @@ class Delivery
 
                Logger::debug('Notifier entry: ' . $contact["url"] . ' ' . (($target_item['guid'] ?? '') ?: $target_item['id']) . ' entry: ' . $atom);
 
-               $basepath =  implode('/', array_slice(explode('/', $contact['url']), 0, 3));
-
                // perform local delivery if we are on the same site
-
-               if (Strings::compareLink($basepath, DI::baseUrl())) {
+               if (Model\Contact::isLocal($contact['url'])) {
                        $condition = ['nurl' => Strings::normaliseLink($contact['url']), 'self' => true];
                        $target_self = DBA::selectFirst('contact', ['uid'], $condition);
                        if (!DBA::isResult($target_self)) {
@@ -387,7 +388,7 @@ class Delivery
        }
 
        /**
-        * @brief Deliver content via Diaspora
+        * Deliver content via Diaspora
         *
         * @param string  $cmd            Command
         * @param array   $contact        Contact record of the receiver
@@ -413,7 +414,7 @@ class Delivery
 
                Logger::notice('Deliver via Diaspora', ['target' => $target_item['id'], 'guid' => $target_item['guid'], 'to' => $loc]);
 
-               if (Config::get('system', 'dfrn_only') || !Config::get('system', 'diaspora_enabled')) {
+               if (DI::config()->get('system', 'dfrn_only') || !DI::config()->get('system', 'diaspora_enabled')) {
                        return;
                }
 
@@ -482,7 +483,7 @@ class Delivery
        }
 
        /**
-        * @brief Deliver content via mail
+        * Deliver content via mail
         *
         * @param string $cmd         Command
         * @param array  $contact     Contact record of the receiver
@@ -494,7 +495,7 @@ class Delivery
         */
        private static function deliverMail($cmd, $contact, $owner, $target_item, $thr_parent)
        {
-               if (Config::get('system','dfrn_only')) {
+               if (DI::config()->get('system','dfrn_only')) {
                        return;
                }
 
@@ -535,7 +536,7 @@ class Delivery
                        $reply_to = $mailacct['reply_to'];
                }
 
-               $subject  = ($target_item['title'] ? Email::encodeHeader($target_item['title'], 'UTF-8') : L10n::t("\x28no subject\x29"));
+               $subject  = ($target_item['title'] ? Email::encodeHeader($target_item['title'], 'UTF-8') : DI::l10n()->t("\x28no subject\x29"));
 
                // only expose our real email address to true friends