Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-19 03:03:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Issue 7664: Don't notify every time a contact posted something

Browse source
This commit is contained in:
Michael 2019-12-18 06:36:43 +00:00
parent 1525e9dde3
commit 3a6a78ca46
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/enotify.php
View file

@ -11,6 +11,7 @@ use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
@ -775,17 +776,18 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
if ($item["parent-uri"] === $item["uri"]) { if ($item["parent-uri"] === $item["uri"]) {
// Send a notification for every new post? // 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]); $send_notification = DBA::exists('contact', ['id' => $item['contact-id'], 'notify_new_posts' => true]);
// Or the contact is a mentioned forum
if (!$send_notification) { if (!$send_notification) {
$tags = q("SELECT `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` = %d AND `uid` = %d", $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)); intval(TERM_OBJ_POST), intval($itemid), intval(TERM_MENTION), intval($uid));
if (DBA::isResult($tags)) { if (DBA::isResult($tags)) {
foreach ($tags AS $tag) { foreach ($tags AS $tag) {
$condition = ['nurl' => Strings::normaliseLink($tag["url"]), 'uid' => $uid, 'notify_new_posts' => true]; $condition = ['nurl' => Strings::normaliseLink($tag["url"]), 'uid' => $uid, 'notify_new_posts' => true, 'contact-type' => Contact::TYPE_COMMUNITY];
$r = DBA::exists('contact', $condition); if (DBA::exists('contact', $condition)) {
if ($r) {
$send_notification = true; $send_notification = true;
} }
} }