From e6fb044e60e3c1df4a50c1a8b41ffbc18b4a9866 Mon Sep 17 00:00:00 2001
From: nupplaPhil <admin+github@philipp.info>
Date: Tue, 4 Feb 2020 22:09:00 +0100
Subject: [PATCH] Move Notify::TYPE_COMMENT

---
 boot.php                  |  1 -
 include/enotify.php       | 14 +++++++-------
 mod/item.php              |  2 +-
 mod/settings.php          |  2 +-
 src/Model/Notify/Type.php |  2 ++
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/boot.php b/boot.php
index 3f7087622a..eafbc8da98 100644
--- a/boot.php
+++ b/boot.php
@@ -140,7 +140,6 @@ define('MAX_LIKERS',    75);
  * Email notification options
  * @{
  */
-define('NOTIFY_COMMENT',      8);
 define('NOTIFY_MAIL',        16);
 define('NOTIFY_SUGGEST',     32);
 define('NOTIFY_PROFILE',     64);
diff --git a/include/enotify.php b/include/enotify.php
index fe38fad2d4..4c4e7e10d4 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -116,7 +116,7 @@ function notification($params)
 		$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'/message/'.$params['item']['id'].'">'.$sitename.'</a>');
 	}
 
-	if ($params['type'] == NOTIFY_COMMENT || $params['type'] == NOTIFY_TAGSELF) {
+	if ($params['type'] == Notify\Type::COMMENT || $params['type'] == NOTIFY_TAGSELF) {
 		$thread = Item::selectFirstThreadForUser($params['uid'], ['ignored'], ['iid' => $parent_id, 'deleted' => false]);
 		if (DBA::isResult($thread) && $thread['ignored']) {
 			Logger::log('Thread ' . $parent_id . ' will be ignored', Logger::DEBUG);
@@ -126,7 +126,7 @@ function notification($params)
 		// Check to see if there was already a tag notify or comment notify for this post.
 		// If so don't create a second notification
 		/// @todo In the future we should store the notification with the highest "value" and replace notifications
-		$condition = ['type' => [NOTIFY_TAGSELF, NOTIFY_COMMENT, NOTIFY_SHARE],
+		$condition = ['type' => [NOTIFY_TAGSELF, Notify\Type::COMMENT, NOTIFY_SHARE],
 			'link' => $params['link'], 'uid' => $params['uid']];
 		if (DBA::exists('notify', $condition)) {
 			return false;
@@ -595,19 +595,19 @@ function check_item_notification($itemid, $uid, $notification_type) {
 		$params['type'] = NOTIFY_TAGSELF;
 		$params['verb'] = Activity::TAG;
 	} elseif ($notification_type & UserItem::NOTIF_IMPLICIT_TAGGED) {
-		$params['type'] = NOTIFY_COMMENT;
+		$params['type'] = Notify\Type::COMMENT;
 		$params['verb'] = Activity::POST;
 	} elseif ($notification_type & UserItem::NOTIF_THREAD_COMMENT) {
-		$params['type'] = NOTIFY_COMMENT;
+		$params['type'] = Notify\Type::COMMENT;
 		$params['verb'] = Activity::POST;
 	} elseif ($notification_type & UserItem::NOTIF_DIRECT_COMMENT) {
-		$params['type'] = NOTIFY_COMMENT;
+		$params['type'] = Notify\Type::COMMENT;
 		$params['verb'] = Activity::POST;
 	} elseif ($notification_type & UserItem::NOTIF_COMMENT_PARTICIPATION) {
-		$params['type'] = NOTIFY_COMMENT;
+		$params['type'] = Notify\Type::COMMENT;
 		$params['verb'] = Activity::POST;
 	} elseif ($notification_type & UserItem::NOTIF_ACTIVITY_PARTICIPATION) {
-		$params['type'] = NOTIFY_COMMENT;
+		$params['type'] = Notify\Type::COMMENT;
 		$params['verb'] = Activity::POST;
 	} else {
 		return false;
diff --git a/mod/item.php b/mod/item.php
index 717c656d18..69b5f52cda 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -752,7 +752,7 @@ function item_post(App $a) {
 	if ($toplevel_item_id) {
 		if ($contact_record != $author) {
 			notification([
-				'type'         => NOTIFY_COMMENT,
+				'type'         => Type::COMMENT,
 				'notify_flags' => $user['notify-flags'],
 				'language'     => $user['language'],
 				'to_name'      => $user['username'],
diff --git a/mod/settings.php b/mod/settings.php
index 855a5a1ce0..3635018529 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1233,7 +1233,7 @@ function settings_content(App $a)
 		'$notify1'	=> ['notify1', DI::l10n()->t('You receive an introduction'), ($notify & Type::INTRO), Type::INTRO, ''],
 		'$notify2'	=> ['notify2', DI::l10n()->t('Your introductions are confirmed'), ($notify & Type::CONFIRM), Type::CONFIRM, ''],
 		'$notify3'	=> ['notify3', DI::l10n()->t('Someone writes on your profile wall'), ($notify & Type::WALL), Type::WALL, ''],
-		'$notify4'	=> ['notify4', DI::l10n()->t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, ''],
+		'$notify4'	=> ['notify4', DI::l10n()->t('Someone writes a followup comment'), ($notify & Type::COMMENT), Type::COMMENT, ''],
 		'$notify5'	=> ['notify5', DI::l10n()->t('You receive a private message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, ''],
 		'$notify6'  => ['notify6', DI::l10n()->t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, ''],
 		'$notify7'  => ['notify7', DI::l10n()->t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''],
diff --git a/src/Model/Notify/Type.php b/src/Model/Notify/Type.php
index f026e081fd..440dde63e1 100644
--- a/src/Model/Notify/Type.php
+++ b/src/Model/Notify/Type.php
@@ -13,4 +13,6 @@ class Type
 	const CONFIRM = 2;
 	/** @var int Notification about a post on your wall */
 	const WALL = 4;
+	/** @var int Notification about a followup comment */
+	const COMMENT = 8;
 }