Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-25 17:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Issue 9015: Reducing load of remote systems

Browse source
This commit is contained in:
Michael 2020-08-15 20:05:08 +00:00
parent 6dff5fa562
commit 1f9b365f3b
6 changed files with 34 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Model/Item.php
View file

@ -1355,7 +1355,7 @@ class Item
* @param array $item
* @return boolean item is valid
*/
private static function isValid(array $item)
public static function isValid(array $item)
{
// When there is no content then we don't post it
if ($item['body'].$item['title'] == '') {
@ -1384,7 +1384,7 @@ class Item
}
}
if (Contact::isBlocked($item['author-id'])) {
if (!empty($item['author-id']) && Contact::isBlocked($item['author-id'])) {
Logger::notice('Author is blocked node-wide', ['author-link' => $item['author-link'], 'item-uri' => $item['uri']]);
return false;
}
@ -1394,12 +1394,12 @@ class Item
return false;
}
if (!empty($item['uid']) && Contact\User::isBlocked($item['author-id'], $item['uid'])) {
if (!empty($item['uid']) && !empty($item['author-id']) && Contact\User::isBlocked($item['author-id'], $item['uid'])) {
Logger::notice('Author is blocked by user', ['author-link' => $item['author-link'], 'uid' => $item['uid'], 'item-uri' => $item['uri']]);
return false;
}
if (Contact::isBlocked($item['owner-id'])) {
if (!empty($item['owner-id']) && Contact::isBlocked($item['owner-id'])) {
Logger::notice('Owner is blocked node-wide', ['owner-link' => $item['owner-link'], 'item-uri' => $item['uri']]);
return false;
}
@ -1409,7 +1409,7 @@ class Item
return false;
}
if (!empty($item['uid']) && Contact\User::isBlocked($item['owner-id'], $item['uid'])) {
if (!empty($item['uid']) && !empty($item['owner-id']) && Contact\User::isBlocked($item['owner-id'], $item['uid'])) {
Logger::notice('Owner is blocked by user', ['owner-link' => $item['owner-link'], 'uid' => $item['uid'], 'item-uri' => $item['uri']]);
return false;
}