clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11408 from annando/notices 

Fix several notices
This commit is contained in:
Hypolite Petovan 2022-04-11 15:54:48 -04:00 committed by GitHub
parent 3842f02b02 62367923e0
commit 8720561e49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Model/GServer.php
View File

@ -493,9 +493,13 @@ class GServer
// Detect the directory type
$serverdata['directory-type'] = self::DT_NONE;
$serverdata = self::checkPoCo($url, $serverdata);
$serverdata = self::checkMastodonDirectory($url, $serverdata);
if ($serverdata['directory-type'] == self::DT_NONE) {
$serverdata = self::checkPoCo($url, $serverdata);
}
// We can't detect the network type. Possibly it is some system that we don't know yet
if (empty($serverdata['network'])) {
$serverdata['network'] = Protocol::PHANTOM;
@ -1350,7 +1354,7 @@ class GServer
$contact = Contact::selectFirst(['id'], ['uid' => 0, 'failed' => false, 'gsid' => $gserver['id']]);
// Via probing we can be sure that the server is responding
if (Contact::updateFromProbe($contact['id'])) {
if (!empty($contact['id']) && Contact::updateFromProbe($contact['id'])) {
$contact = Contact::selectFirst(['network', 'failed'], ['id' => $contact['id']]);
if (!$contact['failed'] && in_array($contact['network'], Protocol::FEDERATED)) {
$serverdata['network'] = $contact['network'];

2
src/Protocol/ActivityPub/Processor.php
View File

@ -1002,6 +1002,8 @@ class Processor
$posts = Post\Collection::selectToArrayForContact($pcid, Post\Collection::FEATURED);
if (!empty($posts)) {
$old_featured = array_column($posts, 'uri-id');
} else {
$old_featured = [];
}
$featured = ActivityPub::fetchItems($apcontact['featured']);

8
src/Protocol/Diaspora.php
View File

@ -4101,10 +4101,10 @@ class Diaspora
'author-id' => $author,
'owner-id' => $author,
'body' => $post,
'allow_cid' => $owner['allow_cid'],
'allow_gid' => $owner['allow_gid'],
'deny_cid' => $owner['deny_cid'],
'deny_gid' => $owner['deny_gid'],
'allow_cid' => $owner['allow_cid'] ?? '',
'allow_gid' => $owner['allow_gid']?? '',
'deny_cid' => $owner['deny_cid'] ?? '',
'deny_gid' => $owner['deny_gid'] ?? '',
];
if (!empty($item['allow_cid'] . $item['allow_gid'] . $item['deny_cid'] . $item['deny_gid'])) {