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

Merge pull request #12952 from MrPetovan/bug/fatal-errors

Browse source 
Address a few fatal errors
This commit is contained in:
Philipp 2023-03-31 14:35:37 +02:00 • committed by GitHub
commit c77266de98
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 51 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/Module/Contact/Follow.php
View file

@ -40,6 +40,7 @@ use Friendica\Network\HTTPException\ForbiddenException;
use Friendica\Network\Probe;
use Friendica\Util\Profiler;
use Friendica\Util\Strings;
use GuzzleHttp\Psr7\Uri;
use Psr\Log\LoggerInterface;
class Follow extends BaseModule
@ -223,17 +224,26 @@ class Follow extends BaseModule
protected function followRemoteItem(string $url)
{
$itemId = Item::fetchByLink($url, $this->session->getLocalUserId());
if (!$itemId) {
// If the user-specific search failed, we search and probe a public post
$itemId = Item::fetchByLink($url);
}
if (!empty($itemId)) {
$item = Post::selectFirst(['guid'], ['id' => $itemId]);
if (!empty($item['guid'])) {
$this->baseUrl->redirect('display/' . $item['guid']);
try {
$uri = new Uri($url);
if (!$uri->getScheme()) {
return;
}
$itemId = Item::fetchByLink($url, $this->session->getLocalUserId());
if (!$itemId) {
// If the user-specific search failed, we search and probe a public post
$itemId = Item::fetchByLink($url);
}
if (!empty($itemId)) {
$item = Post::selectFirst(['guid'], ['id' => $itemId]);
if (!empty($item['guid'])) {
$this->baseUrl->redirect('display/' . $item['guid']);
}
}
} catch (\InvalidArgumentException $e) {
return;
}
}
}

5
src/Module/Profile/Contacts.php
View file

@ -121,11 +121,14 @@ class Contacts extends Module\BaseProfile
['uri-id' => $contact['uri-id'], 'uid' => [0, $this->userSession->getLocalUserId()]],
['order' => ['uid' => 'DESC']]
);
return Module\Contact::getContactTemplateVars($contact);
return $contact ? Module\Contact::getContactTemplateVars($contact) : null;
},
Model\Contact::selectToArray(['uri-id'], $condition, $params)
);
// Remove nonexistent contacts
$contacts = array_filter($contacts);
$desc = '';
switch ($type) {
case 'followers':