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

Don't show feeds / avoiding errors with empty data

Browse source
This commit is contained in:
Michael 2020-03-05 08:13:18 +00:00
parent b6ab8c9e94
commit 4d6953bf79
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -71,7 +71,7 @@ class Transmitter
*/ */
public static function getFollowers($owner, $page = null) public static function getFollowers($owner, $page = null)
{ {
$condition = ['rel' => [Contact::FOLLOWER, Contact::FRIEND], 'network' => Protocol::NATIVE_SUPPORT, 'uid' => $owner['uid'], $condition = ['rel' => [Contact::FOLLOWER, Contact::FRIEND], 'network' => Protocol::FEDERATED, 'uid' => $owner['uid'],
'self' => false, 'deleted' => false, 'hidden' => false, 'archive' => false, 'pending' => false]; 'self' => false, 'deleted' => false, 'hidden' => false, 'archive' => false, 'pending' => false];
$count = DBA::count('contact', $condition); $count = DBA::count('contact', $condition);
@ -120,7 +120,7 @@ class Transmitter
*/ */
public static function getFollowing($owner, $page = null) public static function getFollowing($owner, $page = null)
{ {
$condition = ['rel' => [Contact::SHARING, Contact::FRIEND], 'network' => Protocol::NATIVE_SUPPORT, 'uid' => $owner['uid'], $condition = ['rel' => [Contact::SHARING, Contact::FRIEND], 'network' => Protocol::FEDERATED, 'uid' => $owner['uid'],
'self' => false, 'deleted' => false, 'hidden' => false, 'archive' => false, 'pending' => false]; 'self' => false, 'deleted' => false, 'hidden' => false, 'archive' => false, 'pending' => false];
$count = DBA::count('contact', $condition); $count = DBA::count('contact', $condition);
@ -341,6 +341,10 @@ class Transmitter
} }
foreach ($activity[$element] as $receiver) { foreach ($activity[$element] as $receiver) {
if (empty($receiver)) {
continue;
}
if ($receiver == $profile['followers'] && !empty($item_profile['followers'])) { if ($receiver == $profile['followers'] && !empty($item_profile['followers'])) {
$permissions[$element][] = $item_profile['followers']; $permissions[$element][] = $item_profile['followers'];
} elseif (!in_array($receiver, $exclude)) { } elseif (!in_array($receiver, $exclude)) {
@ -649,7 +653,7 @@ class Transmitter
$blindcopy = in_array($element, ['bto', 'bcc']); $blindcopy = in_array($element, ['bto', 'bcc']);
foreach ($permissions[$element] as $receiver) { foreach ($permissions[$element] as $receiver) {
if (Network::isUrlBlocked($receiver)) { if (empty($receiver) || Network::isUrlBlocked($receiver)) {
continue; continue;
} }