From: Michael <heluecht@pirati.ca>
Date: Sun, 7 Oct 2018 19:42:04 +0000 (+0000)
Subject: Several fixes
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=93866b477a2ea43ed12b72cf35bb3241e4c133b3;p=friendica.git

Several fixes
---

diff --git a/src/Module/Inbox.php b/src/Module/Inbox.php
index 3b845074d2..c190be4d1f 100644
--- a/src/Module/Inbox.php
+++ b/src/Module/Inbox.php
@@ -26,7 +26,7 @@ class Inbox extends BaseModule
 		}
 
 // Enable for test purposes
-
+/*
 		if (HTTPSignature::getSigner($postdata, $_SERVER)) {
 			$filename = 'signed-activitypub';
 		} else {
@@ -37,7 +37,7 @@ class Inbox extends BaseModule
 		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);
-
+*/
 		if (!empty($a->argv[1])) {
 			$user = DBA::selectFirst('user', ['uid'], ['nickname' => $a->argv[1]]);
 			if (!DBA::isResult($user)) {
diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index b1680178e3..b4668e9154 100644
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -39,8 +39,6 @@ class ActivityPub
 		'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
 		'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag']];
 	const ACCOUNT_TYPES = ['Person', 'Organization', 'Service', 'Group', 'Application'];
-	const CONTENT_TYPES = ['Note', 'Article', 'Video', 'Image'];
-	const ACTIVITY_TYPES = ['Like', 'Dislike', 'Accept', 'Reject', 'TentativeAccept'];
 	/**
 	 * Checks if the web request is done for the AP protocol
 	 *
diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 7d181234fe..32cfcc6cb0 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -272,7 +272,7 @@ class Processor
 	 */
 	public static function followUser($activity)
 	{
-		$uid = User::getIdForURL($activity['object_actor']);
+		$uid = User::getIdForURL($activity['object_id']);
 		if (empty($uid)) {
 			return;
 		}
@@ -326,12 +326,12 @@ class Processor
 	 */
 	public static function deletePerson($activity)
 	{
-		if (empty($activity['object_id']) || empty($activity['object_actor'])) {
+		if (empty($activity['object_id']) || empty($activity['actor'])) {
 			logger('Empty object id or actor.', LOGGER_DEBUG);
 			return;
 		}
 
-		if ($activity['object_id'] != $activity['object_actor']) {
+		if ($activity['object_id'] != $activity['actor']) {
 			logger('Object id does not match actor.', LOGGER_DEBUG);
 			return;
 		}
diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index ba6cd52ba3..ac66aeb6ec 100644
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -166,7 +166,7 @@ class Receiver
 			$object_data = self::processObject($activity);
 			$object_data['name'] = $type;
 			$object_data['author'] = JsonLD::fetchElement($activity, 'as:actor');
-			$object_data['object'] = $object_id;
+			$object_data['object_id'] = $object_id;
 			$object_data['object_type'] = ''; // Since we don't fetch the object, we don't know the type
 		} else {
 			$object_data = [];