Use the follower collection

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

diff --git a/src/Module/Inbox.php b/src/Module/Inbox.php
index dafc418f69ef7eb39f3a044cc19fba477b9bbdcc..891211186aa9d667f7d59c4ff1ff2976e08429bb 100644 (file)
--- a/src/Module/Inbox.php
+++ b/src/Module/Inbox.php
@@ -7,6 +7,8 @@ namespace Friendica\Module;
 use Friendica\BaseModule;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Core\System;
+use Friendica\Database\DBA;
+use Friendica\Util\HTTPSignature;
 
 /**
  * ActivityPub Inbox
@@ -23,18 +25,28 @@ class Inbox extends BaseModule
                        System::httpExit(400);
                }
 
-               if (ActivityPub::verifySignature($postdata, $_SERVER)) {
+               if (HTTPSignature::getSigner($postdata, $_SERVER)) {
                        $filename = 'signed-activitypub';
                } else {
                        $filename = 'failed-activitypub';
                }
 
                $tempfile = tempnam(get_temppath(), $filename);
-               file_put_contents($tempfile, json_encode(['header' => $_SERVER, 'body' => $postdata]));
+               file_put_contents($tempfile, json_encode(['argv' => $a->argv, 'header' => $_SERVER, 'body' => $postdata], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
 
                logger('Incoming message stored under ' . $tempfile);
 
-               ActivityPub::processInbox($postdata, $_SERVER);
+               if (!empty($a->argv[1])) {
+                       $user = DBA::selectFirst('user', ['uid'], ['nickname' => $a->argv[1]]);
+                       if (!DBA::isResult($user)) {
+                               System::httpExit(404);
+                       }
+                       $uid = $user['uid'];
+               } else {
+                       $uid = 0;
+               }
+
+               ActivityPub::processInbox($postdata, $_SERVER, $uid);
 
                System::httpExit(202);
        }