X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fenotify.php;h=da469b99b35075e6611eae144513cf51c4908230;hb=94954c810b3ee0f885029f9818b217e0817ad70b;hp=01c946d1ff9d83d3c8ecb87a7e761e799c5ce7e2;hpb=1de3960e267a8d298348fbca18cf1be1f6a20f7a;p=friendica.git

diff --git a/include/enotify.php b/include/enotify.php
index 01c946d1ff..da469b99b3 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -11,8 +11,10 @@ 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;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Emailer;
 use Friendica\Util\Strings;
@@ -338,7 +340,7 @@ function notification($params)
 		$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
 
 		switch ($params['verb']) {
-			case ACTIVITY_FRIEND:
+			case Activity::FRIEND:
 				// someone started to share with user (mostly OStatus)
 				$subject = L10n::t('[Friendica:Notify] A new person is sharing with you');
 
@@ -348,7 +350,7 @@ function notification($params)
 					$sitename
 				);
 				break;
-			case ACTIVITY_FOLLOW:
+			case Activity::FOLLOW:
 				// someone started to follow the user (mostly OStatus)
 				$subject = L10n::t('[Friendica:Notify] You have a new follower');
 
@@ -385,7 +387,7 @@ function notification($params)
 	}
 
 	if ($params['type'] == NOTIFY_CONFIRM) {
-		if ($params['verb'] == ACTIVITY_FRIEND) { // mutual connection
+		if ($params['verb'] == Activity::FRIEND) { // mutual connection
 			$itemlink =  $params['link'];
 			$subject = L10n::t('[Friendica:Notify] Connection accepted');
 
@@ -502,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'];
@@ -535,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'],
@@ -544,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)));
@@ -802,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;
 					}
 				}
@@ -821,7 +796,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
 
 		if ($send_notification) {
 			$params["type"] = NOTIFY_SHARE;
-			$params["verb"] = ACTIVITY_TAG;
+			$params["verb"] = Activity::TAG;
 		}
 	}
 
@@ -835,7 +810,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
 
 	if ($item["mention"] || $tagged || ($defaulttype == NOTIFY_TAGSELF)) {
 		$params["type"] = NOTIFY_TAGSELF;
-		$params["verb"] = ACTIVITY_TAG;
+		$params["verb"] = Activity::TAG;
 	}
 
 	// Is it a post that the user had started?
@@ -844,7 +819,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
 
 	if ($thread['mention'] && !$thread['ignored'] && !isset($params["type"])) {
 		$params["type"] = NOTIFY_COMMENT;
-		$params["verb"] = ACTIVITY_POST;
+		$params["verb"] = Activity::POST;
 	}
 
 	// And now we check for participation of one of our contacts in the thread
@@ -852,7 +827,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
 
 	if (!$thread['ignored'] && !isset($params["type"]) && Item::exists($condition)) {
 		$params["type"] = NOTIFY_COMMENT;
-		$params["verb"] = ACTIVITY_POST;
+		$params["verb"] = Activity::POST;
 	}
 
 	if (isset($params["type"])) {