Revert logic change in query in NotificationsManager->setSeen

[friendica.git] / src / Module / Inbox.php

diff --git a/src/Module/Inbox.php b/src/Module/Inbox.php
index d47419a415c4d08a74ca7a453f5be5124a4975cd..1bc127b7c9a76c65c2188a402d3b5a80ef28271a 100644 (file)
--- a/src/Module/Inbox.php
+++ b/src/Module/Inbox.php
@@ -2,19 +2,23 @@
 /**
  * @file src/Module/Inbox.php
  */
+
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
+use Friendica\Core\Logger;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\Util\HTTPSignature;
+use Friendica\Core\Config;
 
 /**
  * ActivityPub Inbox
  */
 class Inbox extends BaseModule
 {
-       public static function init()
+       public static function rawContent()
        {
                $a = self::getApp();
 
@@ -24,17 +28,17 @@ class Inbox extends BaseModule
                        System::httpExit(400);
                }
 
-               if (ActivityPub::verifySignature($postdata, $_SERVER)) {
-                       $filename = 'signed-activitypub';
-               } else {
-                       $filename = 'failed-activitypub';
+               if (Config::get('debug', 'ap_inbox_log')) {
+                       if (HTTPSignature::getSigner($postdata, $_SERVER)) {
+                               $filename = 'signed-activitypub';
+                       } else {
+                               $filename = 'failed-activitypub';
+                       }
+                       $tempfile = tempnam(get_temppath(), $filename);
+                       file_put_contents($tempfile, json_encode(['argv' => $a->argv, 'header' => $_SERVER, 'body' => $postdata], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
+                       Logger::log('Incoming message stored under ' . $tempfile);
                }
 
-               $tempfile = tempnam(get_temppath(), $filename);
-               file_put_contents($tempfile, json_encode(['argv' => $a->argv, 'header' => $_SERVER, 'body' => $postdata]));
-
-               logger('Incoming message stored under ' . $tempfile);
-
                if (!empty($a->argv[1])) {
                        $user = DBA::selectFirst('user', ['uid'], ['nickname' => $a->argv[1]]);
                        if (!DBA::isResult($user)) {
@@ -45,7 +49,7 @@ class Inbox extends BaseModule
                        $uid = 0;
                }
 
-               ActivityPub::processInbox($postdata, $_SERVER, $uid);
+               ActivityPub\Receiver::processInbox($postdata, $_SERVER, $uid);
 
                System::httpExit(202);
        }