From: Michael Date: Wed, 18 Dec 2019 06:36:43 +0000 (+0000) Subject: Issue 7664: Don't notify every time a contact posted something X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3a6a78ca46000f11fd2873483cef5ae315c92b7d;p=friendica.git Issue 7664: Don't notify every time a contact posted something --- diff --git a/include/enotify.php b/include/enotify.php index 391ba5014a..da469b99b3 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -11,6 +11,7 @@ use Friendica\Core\Logger; use Friendica\Core\Renderer; use Friendica\Core\System; use Friendica\Database\DBA; +use Friendica\Model\Contact; use Friendica\Model\Item; use Friendica\Model\User; use Friendica\Protocol\Activity; @@ -775,17 +776,18 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { if ($item["parent-uri"] === $item["uri"]) { // Send a notification for every new post? + // Either the contact had posted something directly $send_notification = DBA::exists('contact', ['id' => $item['contact-id'], 'notify_new_posts' => true]); + // Or the contact is a mentioned forum if (!$send_notification) { $tags = q("SELECT `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` = %d AND `uid` = %d", intval(TERM_OBJ_POST), intval($itemid), intval(TERM_MENTION), intval($uid)); if (DBA::isResult($tags)) { foreach ($tags AS $tag) { - $condition = ['nurl' => Strings::normaliseLink($tag["url"]), 'uid' => $uid, 'notify_new_posts' => true]; - $r = DBA::exists('contact', $condition); - if ($r) { + $condition = ['nurl' => Strings::normaliseLink($tag["url"]), 'uid' => $uid, 'notify_new_posts' => true, 'contact-type' => Contact::TYPE_COMMUNITY]; + if (DBA::exists('contact', $condition)) { $send_notification = true; } }