Convert static methods to dynamic in Module\DFRN\Notify

diff --git a/src/Module/DFRN/Notify.php b/src/Module/DFRN/Notify.php
index 08ec7340cbe0f40ea6a438f6c6b304e3e60f841f..32c11beb77189b65ec5f4221b657ada6b758a5d8 100644 (file)
--- a/src/Module/DFRN/Notify.php
+++ b/src/Module/DFRN/Notify.php
@@ -52,37 +52,37 @@ class Notify extends BaseModule
                        if (empty($user)) {
                                throw new \Friendica\Network\HTTPException\InternalServerErrorException();
                        }
-                       self::dispatchPrivate($user, $postdata);
-               } elseif (!self::dispatchPublic($postdata)) {
+                       $this->dispatchPrivate($user, $postdata);
+               } elseif (!$this->dispatchPublic($postdata)) {
                        require_once 'mod/salmon.php';
                        salmon_post(DI::app(), $postdata);
                }
        }
 
-       private static function dispatchPublic(string $postdata): bool
+       private function dispatchPublic(string $postdata): bool
        {
                $msg = Diaspora::decodeRaw($postdata, '', true);
                if (!is_array($msg)) {
                        // We have to fail silently to be able to hand it over to the salmon parser
-                       Logger::warning('Diaspora::decodeRaw() has failed for some reason.');
+                       $this->logger->warning('Diaspora::decodeRaw() has failed for some reason.');
                        return false;
                }
 
                // Fetch the corresponding public contact
                $contact_id = Contact::getIdForURL($msg['author']);
                if (empty($contact_id)) {
-                       Logger::notice('Contact not found', ['address' => $msg['author']]);
+                       $this->logger->notice('Contact not found', ['address' => $msg['author']]);
                        System::xmlExit(3, 'Contact ' . $msg['author'] . ' not found');
                }
 
                // Fetch the importer (Mixture of sender and receiver)
                $importer = DFRN::getImporter($contact_id);
                if (empty($importer)) {
-                       Logger::notice('Importer contact not found', ['address' => $msg['author']]);
+                       $this->logger->notice('Importer contact not found', ['address' => $msg['author']]);
                        System::xmlExit(3, 'Contact ' . $msg['author'] . ' not found');
                }
 
-               Logger::debug('Importing post with the public envelope.', ['transmitter' => $msg['author']]);
+               $this->logger->debug('Importing post with the public envelope.', ['transmitter' => $msg['author']]);
 
                // Now we should be able to import it
                $ret = DFRN::import($msg['message'], $importer, Conversation::PARCEL_DIASPORA_DFRN, Conversation::RELAY);
@@ -91,7 +91,7 @@ class Notify extends BaseModule
                return true;
        }
 
-       private static function dispatchPrivate(array $user, string $postdata)
+       private function dispatchPrivate(array $user, string $postdata)
        {
                $msg = Diaspora::decodeRaw($postdata, $user['prvkey'] ?? '');
                if (!is_array($msg)) {
@@ -101,23 +101,23 @@ class Notify extends BaseModule
                // Fetch the contact
                $contact = Contact::getByURLForUser($msg['author'], $user['uid'], null, ['id', 'blocked', 'pending']);
                if (empty($contact['id'])) {
-                       Logger::notice('Contact not found', ['address' => $msg['author']]);
+                       $this->logger->notice('Contact not found', ['address' => $msg['author']]);
                        System::xmlExit(3, 'Contact ' . $msg['author'] . ' not found');
                }
 
                if ($contact['pending'] || $contact['blocked']) {
-                       Logger::notice('Contact is blocked or pending', ['address' => $msg['author'], 'contact' => $contact]);
+                       $this->logger->notice('Contact is blocked or pending', ['address' => $msg['author'], 'contact' => $contact]);
                        System::xmlExit(3, 'Contact ' . $msg['author'] . ' not found');
                }
 
                // Fetch the importer (Mixture of sender and receiver)
                $importer = DFRN::getImporter($contact['id'], $user['uid']);
                if (empty($importer)) {
-                       Logger::notice('Importer contact not found for user', ['uid' => $user['uid'], 'cid' => $contact['id'], 'address' => $msg['author']]);
+                       $this->logger->notice('Importer contact not found for user', ['uid' => $user['uid'], 'cid' => $contact['id'], 'address' => $msg['author']]);
                        System::xmlExit(3, 'Contact ' . $msg['author'] . ' not found');
                }
 
-               Logger::debug('Importing post with the private envelope.', ['transmitter' => $msg['author'], 'receiver' => $user['nickname']]);
+               $this->logger->debug('Importing post with the private envelope.', ['transmitter' => $msg['author'], 'receiver' => $user['nickname']]);
 
                // Now we should be able to import it
                $ret = DFRN::import($msg['message'], $importer, Conversation::PARCEL_DIASPORA_DFRN, Conversation::PUSH);