From bd9292fe190a18bc7274a49ff73b50a8391f5b78 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 6 Nov 2022 20:38:33 -0500 Subject: [PATCH] Convert static methods to dynamic in Module\DFRN\Notify --- src/Module/DFRN/Notify.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Module/DFRN/Notify.php b/src/Module/DFRN/Notify.php index 08ec7340cb..32c11beb77 100644 --- 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);