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

[friendica.git] / include / enotify.php

diff --git a/include/enotify.php b/include/enotify.php
index a8090e35f8969a05b7ea784a57e8283f5ab6523b..da469b99b35075e6611eae144513cf51c4908230 100644 (file)
--- 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;
@@ -503,17 +504,9 @@ function notification($params)
 
        if ($show_in_notification_page) {
                Logger::log("adding notification entry", Logger::DEBUG);
-               do {
-                       $dups = false;
-                       $hash = Strings::getRandomHex();
-                       if (DBA::exists('notify', ['hash' => $hash])) {
-                               $dups = true;
-                       }
-               } while ($dups == true);
 
                /// @TODO One statement is enough
                $datarray = [];
-               $datarray['hash']  = $hash;
                $datarray['name']  = $params['source_name'];
                $datarray['name_cache'] = strip_tags(BBCode::convert($params['source_name']));
                $datarray['url']   = $params['source_link'];
@@ -536,7 +529,7 @@ function notification($params)
                }
 
                // create notification entry in DB
-               $fields = ['hash' => $datarray['hash'], 'name' => $datarray['name'], 'url' => $datarray['url'],
+               $fields = ['name' => $datarray['name'], 'url' => $datarray['url'],
                        'photo' => $datarray['photo'], 'date' => $datarray['date'], 'uid' => $datarray['uid'],
                        'link' => $datarray['link'], 'iid' => $datarray['iid'], 'parent' => $datarray['parent'],
                        'type' => $datarray['type'], 'verb' => $datarray['verb'], 'otype' => $datarray['otype'],
@@ -545,26 +538,6 @@ function notification($params)
 
                $notify_id = DBA::lastInsertId();
 
-               // we seem to have a lot of duplicate comment notifications due to race conditions, mostly from forums
-               // After we've stored everything, look again to see if there are any duplicates and if so remove them
-               $p = q("SELECT `id` FROM `notify` WHERE `type` IN (%d, %d) AND `link` = '%s' AND `uid` = %d ORDER BY `id`",
-                       intval(NOTIFY_TAGSELF),
-                       intval(NOTIFY_COMMENT),
-                       DBA::escape($params['link']),
-                       intval($params['uid'])
-               );
-               if ($p && (count($p) > 1)) {
-                       for ($d = 1; $d < count($p); $d ++) {
-                               DBA::delete('notify', ['id' => $p[$d]['id']]);
-                       }
-
-                       // only continue on if we stored the first one
-                       if ($notify_id != $p[0]['id']) {
-                               L10n::popLang();
-                               return false;
-                       }
-               }
-
                $itemlink = System::baseUrl().'/notify/view/'.$notify_id;
                $msg = Renderer::replaceMacros($epreamble, ['$itemlink' => $itemlink]);
                $msg_cache = format_notification_message($datarray['name_cache'], strip_tags(BBCode::convert($msg)));
@@ -803,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;
                                        }
                                }