Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-28 12:24:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

GContact discovery added

Browse source
This commit is contained in:
Michael 2020-03-05 22:03:24 +00:00
parent bf35ff27d3
commit a6e7b5f295
7 changed files with 83 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Protocol/ActivityPub.php
View file

@ -231,13 +231,13 @@ class ActivityPub
$items = $data['orderedItems'];
} elseif (!empty($data['first']['orderedItems'])) {
$items = $data['first']['orderedItems'];
} elseif (!empty($data['first'])) {
} elseif (!empty($data['first']) && is_string($data['first'])) {
return self::fetchItems($data['first'], $uid);
} else {
$items = [];
}
if (!empty($data['next'])) {
if (!empty($data['next']) && is_string($data['next'])) {
$items = array_merge($items, self::fetchItems($data['next'], $uid));
}

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

@ -345,7 +345,7 @@ class Transmitter
continue;
}
if ($receiver == $profile['followers'] && !empty($item_profile['followers'])) {
if (!empty($profile['followers']) && $receiver == $profile['followers'] && !empty($item_profile['followers'])) {
$permissions[$element][] = $item_profile['followers'];
} elseif (!in_array($receiver, $exclude)) {
$permissions[$element][] = $receiver;