Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-29 10:24:23 +02:00
Code Issues 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
Download patch file Download diff file Expand all files Collapse all files

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

@ -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;
}

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

@ -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 = [];