friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-06-07 05:40:15 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #11261 from annando/notices

Browse source 
Avoid warning and notice
This commit is contained in:
Tobias Diekershoff 2022-02-20 07:23:53 +01:00 committed by GitHub
parent d5373c583b 311c1fdd81
commit 446775cdc8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Model/Post/UserNotification.php
View file

@ -200,11 +200,16 @@ class UserNotification
$profiles = self::getProfileForUser($uid); $profiles = self::getProfileForUser($uid);
// Fetch all contacts for the given profiles // Fetch all contacts for the given profiles
$contacts = []; $contacts = [];
$iscommunity = false;
$ret = DBA::select('contact', ['id'], ['uid' => 0, 'nurl' => $profiles]); $ret = DBA::select('contact', ['id', 'contact-type'], ['uid' => 0, 'nurl' => $profiles]);
while ($contact = DBA::fetch($ret)) { while ($contact = DBA::fetch($ret)) {
$contacts[] = $contact['id']; $contacts[] = $contact['id'];
if ($contact['contact-type'] == Contact::TYPE_COMMUNITY) {
$iscommunity = true;
}
} }
DBA::close($ret); DBA::close($ret);
@ -237,7 +242,7 @@ class UserNotification
} }
} }
if (($contact['contact-type'] != Contact::TYPE_COMMUNITY) && self::checkDirectCommentedThread($item, $contacts)) { if (!$iscommunity && self::checkDirectCommentedThread($item, $contacts)) {
$notification_type = $notification_type | self::TYPE_DIRECT_THREAD_COMMENT; $notification_type = $notification_type | self::TYPE_DIRECT_THREAD_COMMENT;
if (!$notified) { if (!$notified) {
self::insertNotificationByItem(self::TYPE_DIRECT_THREAD_COMMENT, $uid, $item); self::insertNotificationByItem(self::TYPE_DIRECT_THREAD_COMMENT, $uid, $item);

1
src/Protocol/OStatus.php
View file

@ -1731,6 +1731,7 @@ class OStatus
if ($owner['contact-type'] == Contact::TYPE_COMMUNITY) { if ($owner['contact-type'] == Contact::TYPE_COMMUNITY) {
$contact = Contact::getByURL($item['author-link']) ?: $owner; $contact = Contact::getByURL($item['author-link']) ?: $owner;
$contact['nickname'] = $contact['nickname'] ?? $contact['nick'];
$author = self::addAuthor($doc, $contact, false); $author = self::addAuthor($doc, $contact, false);
$entry->appendChild($author); $entry->appendChild($author);
} }