From 311c1fdd81b24c1a9afd70a8213d4b79b118e0d2 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 20 Feb 2022 05:14:36 +0000 Subject: [PATCH] Avoid warning and notice --- src/Model/Post/UserNotification.php | 11 ++++++++--- src/Protocol/OStatus.php | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Model/Post/UserNotification.php b/src/Model/Post/UserNotification.php index 604e8efe55..806dfe26e5 100644 --- a/src/Model/Post/UserNotification.php +++ b/src/Model/Post/UserNotification.php @@ -200,11 +200,16 @@ class UserNotification $profiles = self::getProfileForUser($uid); // 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)) { $contacts[] = $contact['id']; + + if ($contact['contact-type'] == Contact::TYPE_COMMUNITY) { + $iscommunity = true; + } } 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; if (!$notified) { self::insertNotificationByItem(self::TYPE_DIRECT_THREAD_COMMENT, $uid, $item); diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index 835dc4bde8..a2c9a84473 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -1731,6 +1731,7 @@ class OStatus if ($owner['contact-type'] == Contact::TYPE_COMMUNITY) { $contact = Contact::getByURL($item['author-link']) ?: $owner; + $contact['nickname'] = $contact['nickname'] ?? $contact['nick']; $author = self::addAuthor($doc, $contact, false); $entry->appendChild($author); }