bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Don't fetch sugestions for the system user / catch error on contact timeline

Browse source
This commit is contained in:
Michael 2022-12-01 07:07:59 +00:00
parent 146f874c2e
commit 1d00947bcd
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Model/Contact/Relation.php
View file

@ -323,6 +323,10 @@ class Relation
*/ */
static public function getSuggestions(int $uid, int $start = 0, int $limit = 80): array static public function getSuggestions(int $uid, int $start = 0, int $limit = 80): array
{ {
if ($uid == 0) {
return [];
}
$cid = Contact::getPublicIdByUserId($uid); $cid = Contact::getPublicIdByUserId($uid);
$totallimit = $start + $limit; $totallimit = $start + $limit;
$contacts = []; $contacts = [];

5
src/Module/Api/Mastodon/Accounts/Statuses.php
View file

@ -21,6 +21,7 @@
namespace Friendica\Module\Api\Mastodon\Accounts; namespace Friendica\Module\Api\Mastodon\Accounts;
use Friendica\Core\Logger;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
@ -113,7 +114,11 @@ class Statuses extends BaseApi
$statuses = []; $statuses = [];
while ($item = Post::fetch($items)) { while ($item = Post::fetch($items)) {
self::setBoundaries($item['uri-id']); self::setBoundaries($item['uri-id']);
try {
$statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid); $statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid);
} catch (\Throwable $th) {
Logger::info('Post not fetchable', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'error' => $th]);
}
} }
DBA::close($items); DBA::close($items);