keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Several fixes

Browse source
This commit is contained in:
Michael 2018-10-07 19:42:04 +00:00
parent bd6ba98e8d
commit 93866b477a
4 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Module/Inbox.php
View file

@ -26,7 +26,7 @@ class Inbox extends BaseModule
} }
// Enable for test purposes // Enable for test purposes
/*
if (HTTPSignature::getSigner($postdata, $_SERVER)) { if (HTTPSignature::getSigner($postdata, $_SERVER)) {
$filename = 'signed-activitypub'; $filename = 'signed-activitypub';
} else { } 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)); 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); logger('Incoming message stored under ' . $tempfile);
*/
if (!empty($a->argv[1])) { if (!empty($a->argv[1])) {
$user = DBA::selectFirst('user', ['uid'], ['nickname' => $a->argv[1]]); $user = DBA::selectFirst('user', ['uid'], ['nickname' => $a->argv[1]]);
if (!DBA::isResult($user)) { if (!DBA::isResult($user)) {

2
src/Protocol/ActivityPub.php
View file

@ -39,8 +39,6 @@ class ActivityPub
'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers', 'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag']]; 'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag']];
const ACCOUNT_TYPES = ['Person', 'Organization', 'Service', 'Group', 'Application']; 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 * Checks if the web request is done for the AP protocol
* *

6
src/Protocol/ActivityPub/Processor.php
View file

@ -272,7 +272,7 @@ class Processor
*/ */
public static function followUser($activity) public static function followUser($activity)
{ {
$uid = User::getIdForURL($activity['object_actor']); $uid = User::getIdForURL($activity['object_id']);
if (empty($uid)) { if (empty($uid)) {
return; return;
} }
@ -326,12 +326,12 @@ class Processor
*/ */
public static function deletePerson($activity) 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); logger('Empty object id or actor.', LOGGER_DEBUG);
return; return;
} }
if ($activity['object_id'] != $activity['object_actor']) { if ($activity['object_id'] != $activity['actor']) {
logger('Object id does not match actor.', LOGGER_DEBUG); logger('Object id does not match actor.', LOGGER_DEBUG);
return; return;
} }

2
src/Protocol/ActivityPub/Receiver.php
View file

@ -166,7 +166,7 @@ class Receiver
$object_data = self::processObject($activity); $object_data = self::processObject($activity);
$object_data['name'] = $type; $object_data['name'] = $type;
$object_data['author'] = JsonLD::fetchElement($activity, 'as:actor'); $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 $object_data['object_type'] = ''; // Since we don't fetch the object, we don't know the type
} else { } else {
$object_data = []; $object_data = [];