From 97b6f6b3b3ac1559204749f53ebee62127815829 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Tue, 4 Feb 2020 22:01:55 +0100 Subject: [PATCH 01/18] Move OTYPE constants to own enum class --- include/api.php | 2 +- include/enotify.php | 2 +- src/Model/Notify.php | 4 ---- src/Model/Notify/ObjectType.php | 14 ++++++++++++++ 4 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 src/Model/Notify/ObjectType.php diff --git a/include/api.php b/include/api.php index 6f5120691cf..dda4631ce1b 100644 --- a/include/api.php +++ b/include/api.php @@ -5906,7 +5906,7 @@ function api_friendica_notification_seen($type) $notify = DI::notify()->getByID($id); DI::notify()->setSeen(true, $notify); - if ($notify->otype === Notify::OTYPE_ITEM) { + if ($notify->otype === Notify\ObjectType::ITEM) { $item = Item::selectFirstForUser(api_user(), [], ['id' => $notify->iid, 'uid' => api_user()]); if (DBA::isResult($item)) { // we found the item, return it to the user diff --git a/include/enotify.php b/include/enotify.php index 18f5dec8891..9f18a472d24 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -134,7 +134,7 @@ function notification($params) // if it's a post figure out who's post it is. $item = null; - if ($params['otype'] === Notify::OTYPE_ITEM && $parent_id) { + if ($params['otype'] === Notify\ObjectType::ITEM && $parent_id) { $item = Item::selectFirstForUser($params['uid'], Item::ITEM_FIELDLIST, ['id' => $parent_id, 'deleted' => false]); } diff --git a/src/Model/Notify.php b/src/Model/Notify.php index 35d72384e89..336b82537bc 100644 --- a/src/Model/Notify.php +++ b/src/Model/Notify.php @@ -31,10 +31,6 @@ */ class Notify extends BaseModel { - const OTYPE_ITEM = 'item'; - const OTYPE_INTRO = 'intro'; - const OTYPE_MAIL = 'mail'; - const OTYPE_PERSON = 'person'; /** @var \Friendica\Repository\Notify */ private $repo; diff --git a/src/Model/Notify/ObjectType.php b/src/Model/Notify/ObjectType.php new file mode 100644 index 00000000000..9fb279adc78 --- /dev/null +++ b/src/Model/Notify/ObjectType.php @@ -0,0 +1,14 @@ + Date: Tue, 4 Feb 2020 22:03:45 +0100 Subject: [PATCH 02/18] Move Notify::TYPE_INTRO --- boot.php | 1 - include/enotify.php | 2 +- mod/dfrn_request.php | 3 ++- mod/ping.php | 3 ++- mod/settings.php | 3 ++- src/Model/Contact.php | 5 +++-- src/Model/Notify/Type.php | 12 ++++++++++++ src/Module/Delegation.php | 3 ++- 8 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 src/Model/Notify/Type.php diff --git a/boot.php b/boot.php index 3852c3279af..f708ff8820c 100644 --- a/boot.php +++ b/boot.php @@ -140,7 +140,6 @@ * Email notification options * @{ */ -define('NOTIFY_INTRO', 1); define('NOTIFY_CONFIRM', 2); define('NOTIFY_WALL', 4); define('NOTIFY_COMMENT', 8); diff --git a/include/enotify.php b/include/enotify.php index 9f18a472d24..141fd36757b 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -276,7 +276,7 @@ function notification($params) $hsitelink = sprintf($sitelink, ''.$sitename.''); } - if ($params['type'] == NOTIFY_INTRO) { + if ($params['type'] == Notify\Type::INTRO) { $itemlink = $params['link']; $subject = $l10n->t('[Friendica:Notify] Introduction received'); diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index d8ad2bd3a54..bf1fbe3c904 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -23,6 +23,7 @@ use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Group; +use Friendica\Model\Notify\Type; use Friendica\Model\Profile; use Friendica\Model\User; use Friendica\Module\Security\Login; @@ -552,7 +553,7 @@ function dfrn_request_content(App $a) if (!$auto_confirm) { notification([ - 'type' => NOTIFY_INTRO, + 'type' => Type::INTRO, 'notify_flags' => $r[0]['notify-flags'], 'language' => $r[0]['language'], 'to_name' => $r[0]['username'], diff --git a/mod/ping.php b/mod/ping.php index 70c580d3d31..580d82a95fb 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -13,6 +13,7 @@ use Friendica\Model\Contact; use Friendica\Model\Group; use Friendica\Model\Item; +use Friendica\Model\Notify\Type; use Friendica\Util\DateTimeFormat; use Friendica\Util\Temporal; use Friendica\Util\Proxy as ProxyUtils; @@ -403,7 +404,7 @@ function ping_get_notifications($uid) AND NOT (`notify`.`type` IN (%d, %d)) AND $seensql `notify`.`seen` ORDER BY `notify`.`date` $order LIMIT %d, 50", intval($uid), - intval(NOTIFY_INTRO), + intval(Type::INTRO), intval(NOTIFY_MAIL), intval($offset) ); diff --git a/mod/settings.php b/mod/settings.php index 277470ad5b1..3a9d911042c 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -19,6 +19,7 @@ use Friendica\Model\Contact; use Friendica\Model\GContact; use Friendica\Model\Group; +use Friendica\Model\Notify\Type; use Friendica\Model\User; use Friendica\Module\Security\Login; use Friendica\Protocol\Email; @@ -1229,7 +1230,7 @@ function settings_content(App $a) '$h_not' => DI::l10n()->t('Notification Settings'), '$lbl_not' => DI::l10n()->t('Send a notification email when:'), - '$notify1' => ['notify1', DI::l10n()->t('You receive an introduction'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, ''], + '$notify1' => ['notify1', DI::l10n()->t('You receive an introduction'), ($notify & Type::INTRO), NOTIFY_INTRO, ''], '$notify2' => ['notify2', DI::l10n()->t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, ''], '$notify3' => ['notify3', DI::l10n()->t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, ''], '$notify4' => ['notify4', DI::l10n()->t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, ''], diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 3897f821b7f..051f94d3efd 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -14,6 +14,7 @@ use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; +use Friendica\Model\Notify\Type; use Friendica\Network\Probe; use Friendica\Protocol\Activity; use Friendica\Protocol\ActivityPub; @@ -2628,11 +2629,11 @@ public static function addRelationship(array $importer, array $contact, array $d Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']); - if (($user['notify-flags'] & NOTIFY_INTRO) && + if (($user['notify-flags'] & Type::INTRO) && in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL])) { notification([ - 'type' => NOTIFY_INTRO, + 'type' => Type::INTRO, 'notify_flags' => $user['notify-flags'], 'language' => $user['language'], 'to_name' => $user['username'], diff --git a/src/Model/Notify/Type.php b/src/Model/Notify/Type.php new file mode 100644 index 00000000000..5f34e1aa392 --- /dev/null +++ b/src/Model/Notify/Type.php @@ -0,0 +1,12 @@ +user['nickname']); - $condition = ["`uid` = ? AND `msg` != '' AND NOT (`type` IN (?, ?)) AND NOT `seen`", $identity['uid'], NOTIFY_INTRO, NOTIFY_MAIL]; + $condition = ["`uid` = ? AND `msg` != '' AND NOT (`type` IN (?, ?)) AND NOT `seen`", $identity['uid'], Type::INTRO, NOTIFY_MAIL]; $params = ['distinct' => true, 'expression' => 'parent']; $notifications = DBA::count('notify', $condition, $params); From 6e45514e2c03646143ac1776a13d4958125a1776 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Tue, 4 Feb 2020 22:05:56 +0100 Subject: [PATCH 03/18] Move Notify::TYPE_CONFIRM --- boot.php | 1 - include/enotify.php | 2 +- mod/dfrn_confirm.php | 5 +++-- mod/settings.php | 4 ++-- src/Model/Notify/Type.php | 2 ++ 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/boot.php b/boot.php index f708ff8820c..759e4e24f1c 100644 --- a/boot.php +++ b/boot.php @@ -140,7 +140,6 @@ * Email notification options * @{ */ -define('NOTIFY_CONFIRM', 2); define('NOTIFY_WALL', 4); define('NOTIFY_COMMENT', 8); define('NOTIFY_MAIL', 16); diff --git a/include/enotify.php b/include/enotify.php index 141fd36757b..f51c88eae88 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -339,7 +339,7 @@ function notification($params) $hsitelink = sprintf($sitelink, ''.$sitename.''); } - if ($params['type'] == NOTIFY_CONFIRM) { + if ($params['type'] == Notify\Type::CONFIRM) { if ($params['verb'] == Activity::FRIEND) { // mutual connection $itemlink = $params['link']; $subject = $l10n->t('[Friendica:Notify] Connection accepted'); diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 60a96a92664..a8544ca7dc4 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -26,6 +26,7 @@ use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Group; +use Friendica\Model\Notify\Type; use Friendica\Model\User; use Friendica\Protocol\Activity; use Friendica\Util\Crypto; @@ -525,10 +526,10 @@ function dfrn_confirm_post(App $a, $handsfree = null) if (DBA::isResult($r)) { $combined = $r[0]; - if ($combined['notify-flags'] & NOTIFY_CONFIRM) { + if ($combined['notify-flags'] & Type::CONFIRM) { $mutual = ($new_relation == Contact::FRIEND); notification([ - 'type' => NOTIFY_CONFIRM, + 'type' => Type::CONFIRM, 'notify_flags' => $combined['notify-flags'], 'language' => $combined['language'], 'to_name' => $combined['username'], diff --git a/mod/settings.php b/mod/settings.php index 3a9d911042c..a12d8a71f09 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1230,8 +1230,8 @@ function settings_content(App $a) '$h_not' => DI::l10n()->t('Notification Settings'), '$lbl_not' => DI::l10n()->t('Send a notification email when:'), - '$notify1' => ['notify1', DI::l10n()->t('You receive an introduction'), ($notify & Type::INTRO), NOTIFY_INTRO, ''], - '$notify2' => ['notify2', DI::l10n()->t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, ''], + '$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), NOTIFY_CONFIRM, ''], '$notify3' => ['notify3', DI::l10n()->t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, ''], '$notify4' => ['notify4', DI::l10n()->t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, ''], '$notify5' => ['notify5', DI::l10n()->t('You receive a private message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, ''], diff --git a/src/Model/Notify/Type.php b/src/Model/Notify/Type.php index 5f34e1aa392..550a818d44b 100644 --- a/src/Model/Notify/Type.php +++ b/src/Model/Notify/Type.php @@ -9,4 +9,6 @@ class Type { /** @var int Introduction notifications */ const INTRO = 1; + /** @var int Notification about a confirmed introduction */ + const CONFIRM = 2; } From b86ad370014f130b10343a870c9ac9a66c87162d Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Tue, 4 Feb 2020 22:07:10 +0100 Subject: [PATCH 04/18] Move Notify::TYPE_WALL --- boot.php | 1 - include/enotify.php | 2 +- mod/item.php | 3 ++- mod/settings.php | 4 ++-- src/Model/Notify/Type.php | 4 +++- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/boot.php b/boot.php index 759e4e24f1c..3f7087622a2 100644 --- a/boot.php +++ b/boot.php @@ -140,7 +140,6 @@ * Email notification options * @{ */ -define('NOTIFY_WALL', 4); define('NOTIFY_COMMENT', 8); define('NOTIFY_MAIL', 16); define('NOTIFY_SUGGEST', 32); diff --git a/include/enotify.php b/include/enotify.php index f51c88eae88..fe38fad2d44 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -212,7 +212,7 @@ function notification($params) $itemlink = $params['link']; } - if ($params['type'] == NOTIFY_WALL) { + if ($params['type'] == Notify\Type::WALL) { $subject = $l10n->t('[Friendica:Notify] %s posted to your profile wall', $params['source_name']); $preamble = $l10n->t('%1$s posted to your profile wall at %2$s', $params['source_name'], $sitename); diff --git a/mod/item.php b/mod/item.php index 3edf49f86c4..717c656d186 100644 --- a/mod/item.php +++ b/mod/item.php @@ -31,6 +31,7 @@ use Friendica\Model\Conversation; use Friendica\Model\FileTag; use Friendica\Model\Item; +use Friendica\Model\Notify\Type; use Friendica\Model\Photo; use Friendica\Model\Term; use Friendica\Network\HTTPException; @@ -771,7 +772,7 @@ function item_post(App $a) { } else { if (($contact_record != $author) && !count($forum_contact)) { notification([ - 'type' => NOTIFY_WALL, + 'type' => Type::WALL, 'notify_flags' => $user['notify-flags'], 'language' => $user['language'], 'to_name' => $user['username'], diff --git a/mod/settings.php b/mod/settings.php index a12d8a71f09..855a5a1ce05 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1231,8 +1231,8 @@ function settings_content(App $a) '$h_not' => DI::l10n()->t('Notification Settings'), '$lbl_not' => DI::l10n()->t('Send a notification email when:'), '$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), NOTIFY_CONFIRM, ''], - '$notify3' => ['notify3', DI::l10n()->t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, ''], + '$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, ''], '$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, ''], diff --git a/src/Model/Notify/Type.php b/src/Model/Notify/Type.php index 550a818d44b..f026e081fdc 100644 --- a/src/Model/Notify/Type.php +++ b/src/Model/Notify/Type.php @@ -7,8 +7,10 @@ */ class Type { - /** @var int Introduction notifications */ + /** @var int Notification about a introduction */ const INTRO = 1; /** @var int Notification about a confirmed introduction */ const CONFIRM = 2; + /** @var int Notification about a post on your wall */ + const WALL = 4; } From e6fb044e60e3c1df4a50c1a8b41ffbc18b4a9866 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Tue, 4 Feb 2020 22:09:00 +0100 Subject: [PATCH 05/18] 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 3f7087622a2..eafbc8da98f 100644 --- a/boot.php +++ b/boot.php @@ -140,7 +140,6 @@ * 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 fe38fad2d44..4c4e7e10d41 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -116,7 +116,7 @@ function notification($params) $hsitelink = sprintf($sitelink, ''.$sitename.''); } - 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 717c656d186..69b5f52cdad 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 855a5a1ce05..36350185294 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 f026e081fdc..440dde63e1d 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; } From 9435cc4b88de611407bf992f571e12e8f54b3c51 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Tue, 4 Feb 2020 22:10:19 +0100 Subject: [PATCH 06/18] Move Notify::TYPE_MAIL --- boot.php | 1 - include/enotify.php | 2 +- mod/message.php | 5 +++-- mod/ping.php | 2 +- mod/settings.php | 2 +- src/Model/Mail.php | 3 ++- src/Model/Notify/Type.php | 2 ++ src/Module/Delegation.php | 2 +- 8 files changed, 11 insertions(+), 8 deletions(-) diff --git a/boot.php b/boot.php index eafbc8da98f..4c16f59d60c 100644 --- a/boot.php +++ b/boot.php @@ -140,7 +140,6 @@ * Email notification options * @{ */ -define('NOTIFY_MAIL', 16); define('NOTIFY_SUGGEST', 32); define('NOTIFY_PROFILE', 64); define('NOTIFY_TAGSELF', 128); diff --git a/include/enotify.php b/include/enotify.php index 4c4e7e10d41..ad141e1c47a 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -102,7 +102,7 @@ function notification($params) $hsitelink = ''; $itemlink = ''; - if ($params['type'] == NOTIFY_MAIL) { + if ($params['type'] == Notify\Type::MAIL) { $itemlink = $siteurl.'/message/'.$params['item']['id']; $params["link"] = $itemlink; diff --git a/mod/message.php b/mod/message.php index d1d3e89df4c..bba530ca5dd 100644 --- a/mod/message.php +++ b/mod/message.php @@ -13,6 +13,7 @@ use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Mail; +use Friendica\Model\Notify\Type; use Friendica\Module\Security\Login; use Friendica\Util\DateTimeFormat; use Friendica\Util\Proxy as ProxyUtils; @@ -338,10 +339,10 @@ function message_content(App $a) if ($message['convid']) { // Clear Diaspora private message notifications - DBA::update('notify', ['seen' => 1], ['type' => NOTIFY_MAIL, 'parent' => $message['convid'], 'uid' => local_user()]); + DBA::update('notify', ['seen' => 1], ['type' => Type::MAIL, 'parent' => $message['convid'], 'uid' => local_user()]); } // Clear DFRN private message notifications - DBA::update('notify', ['seen' => 1], ['type' => NOTIFY_MAIL, 'parent' => $message['parent-uri'], 'uid' => local_user()]); + DBA::update('notify', ['seen' => 1], ['type' => Type::MAIL, 'parent' => $message['parent-uri'], 'uid' => local_user()]); } else { $messages = false; } diff --git a/mod/ping.php b/mod/ping.php index 580d82a95fb..f91a1753cee 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -405,7 +405,7 @@ function ping_get_notifications($uid) AND $seensql `notify`.`seen` ORDER BY `notify`.`date` $order LIMIT %d, 50", intval($uid), intval(Type::INTRO), - intval(NOTIFY_MAIL), + intval(Type::MAIL), intval($offset) ); diff --git a/mod/settings.php b/mod/settings.php index 36350185294..7ae0f6479e1 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1234,7 +1234,7 @@ function settings_content(App $a) '$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 & Type::COMMENT), Type::COMMENT, ''], - '$notify5' => ['notify5', DI::l10n()->t('You receive a private message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, ''], + '$notify5' => ['notify5', DI::l10n()->t('You receive a private message'), ($notify & Type::MAIL), Type::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, ''], '$notify8' => ['notify8', DI::l10n()->t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''], diff --git a/src/Model/Mail.php b/src/Model/Mail.php index de351db4aae..9735a795a23 100644 --- a/src/Model/Mail.php +++ b/src/Model/Mail.php @@ -10,6 +10,7 @@ use Friendica\Core\Worker; use Friendica\DI; use Friendica\Database\DBA; +use Friendica\Model\Notify\Type; use Friendica\Network\Probe; use Friendica\Protocol\Activity; use Friendica\Util\DateTimeFormat; @@ -68,7 +69,7 @@ public static function insert($msg) // send notifications. $notif_params = [ - 'type' => NOTIFY_MAIL, + 'type' => Type::MAIL, 'notify_flags' => $user['notify-flags'], 'language' => $user['language'], 'to_name' => $user['username'], diff --git a/src/Model/Notify/Type.php b/src/Model/Notify/Type.php index 440dde63e1d..fbc31da3733 100644 --- a/src/Model/Notify/Type.php +++ b/src/Model/Notify/Type.php @@ -15,4 +15,6 @@ class Type const WALL = 4; /** @var int Notification about a followup comment */ const COMMENT = 8; + /** @var int Notification about a private message */ + const MAIL = 16; } diff --git a/src/Module/Delegation.php b/src/Module/Delegation.php index eb38f02891d..b5e4c1a909d 100644 --- a/src/Module/Delegation.php +++ b/src/Module/Delegation.php @@ -112,7 +112,7 @@ public static function content(array $parameters = []) $identities[$key]['selected'] = ($identity['nickname'] === DI::app()->user['nickname']); - $condition = ["`uid` = ? AND `msg` != '' AND NOT (`type` IN (?, ?)) AND NOT `seen`", $identity['uid'], Type::INTRO, NOTIFY_MAIL]; + $condition = ["`uid` = ? AND `msg` != '' AND NOT (`type` IN (?, ?)) AND NOT `seen`", $identity['uid'], Type::INTRO, Type::MAIL]; $params = ['distinct' => true, 'expression' => 'parent']; $notifications = DBA::count('notify', $condition, $params); From 88dc3efdc90c0c0ac4e0b3df7d0123ba6fca258c Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Tue, 4 Feb 2020 22:11:11 +0100 Subject: [PATCH 07/18] Move Notify::TYPE_SUGGEST --- boot.php | 1 - include/enotify.php | 2 +- mod/settings.php | 2 +- src/Model/Notify/Type.php | 2 ++ src/Protocol/DFRN.php | 3 ++- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/boot.php b/boot.php index 4c16f59d60c..950624ad44f 100644 --- a/boot.php +++ b/boot.php @@ -140,7 +140,6 @@ * Email notification options * @{ */ -define('NOTIFY_SUGGEST', 32); define('NOTIFY_PROFILE', 64); define('NOTIFY_TAGSELF', 128); define('NOTIFY_TAGSHARE', 256); diff --git a/include/enotify.php b/include/enotify.php index ad141e1c47a..03fa428e894 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -319,7 +319,7 @@ function notification($params) } } - if ($params['type'] == NOTIFY_SUGGEST) { + if ($params['type'] == Notify\Type::SUGGEST) { $itemlink = $params['link']; $subject = $l10n->t('[Friendica:Notify] Friend suggestion received'); diff --git a/mod/settings.php b/mod/settings.php index 7ae0f6479e1..bce3ac8be59 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1235,7 +1235,7 @@ function settings_content(App $a) '$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 & Type::COMMENT), Type::COMMENT, ''], '$notify5' => ['notify5', DI::l10n()->t('You receive a private message'), ($notify & Type::MAIL), Type::MAIL, ''], - '$notify6' => ['notify6', DI::l10n()->t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, ''], + '$notify6' => ['notify6', DI::l10n()->t('You receive a friend suggestion'), ($notify & Type::SUGGEST), Type::SUGGEST, ''], '$notify7' => ['notify7', DI::l10n()->t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''], '$notify8' => ['notify8', DI::l10n()->t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''], diff --git a/src/Model/Notify/Type.php b/src/Model/Notify/Type.php index fbc31da3733..9c7e3b6deb6 100644 --- a/src/Model/Notify/Type.php +++ b/src/Model/Notify/Type.php @@ -17,4 +17,6 @@ class Type const COMMENT = 8; /** @var int Notification about a private message */ const MAIL = 16; + /** @var int Notification about a friend suggestion */ + const SUGGEST = 32; } diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index 424b519063d..b15816bc77e 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -25,6 +25,7 @@ use Friendica\Model\GContact; use Friendica\Model\Item; use Friendica\Model\Mail; +use Friendica\Model\Notify\Type; use Friendica\Model\PermissionSet; use Friendica\Model\Profile; use Friendica\Model\User; @@ -1892,7 +1893,7 @@ private static function processSuggestion($xpath, $suggestion, $importer) notification( [ - 'type' => NOTIFY_SUGGEST, + 'type' => Type::SUGGEST, 'notify_flags' => $importer['notify-flags'], 'language' => $importer['language'], 'to_name' => $importer['username'], From bd0be96fb39252ecb410908b707c8d90f5308e85 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Tue, 4 Feb 2020 22:11:31 +0100 Subject: [PATCH 08/18] Remove unused Notify::TYPE_PROFILE --- boot.php | 1 - 1 file changed, 1 deletion(-) diff --git a/boot.php b/boot.php index 950624ad44f..ec7d194a947 100644 --- a/boot.php +++ b/boot.php @@ -140,7 +140,6 @@ * Email notification options * @{ */ -define('NOTIFY_PROFILE', 64); define('NOTIFY_TAGSELF', 128); define('NOTIFY_TAGSHARE', 256); define('NOTIFY_POKE', 512); From 51260f234f49e40c5e9f1c30536043ff0afac9db Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Tue, 4 Feb 2020 22:13:06 +0100 Subject: [PATCH 09/18] Move Notify::TYPE_TAGSELF --- boot.php | 1 - include/enotify.php | 6 +++--- mod/settings.php | 2 +- src/Model/Notify/Type.php | 6 ++++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/boot.php b/boot.php index ec7d194a947..6e5777e6bef 100644 --- a/boot.php +++ b/boot.php @@ -140,7 +140,6 @@ * Email notification options * @{ */ -define('NOTIFY_TAGSELF', 128); define('NOTIFY_TAGSHARE', 256); define('NOTIFY_POKE', 512); define('NOTIFY_SHARE', 1024); diff --git a/include/enotify.php b/include/enotify.php index 03fa428e894..09b5e790574 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -116,7 +116,7 @@ function notification($params) $hsitelink = sprintf($sitelink, ''.$sitename.''); } - if ($params['type'] == Notify\Type::COMMENT || $params['type'] == NOTIFY_TAGSELF) { + if ($params['type'] == Notify\Type::COMMENT || $params['type'] == Notify\Type::TAG_SELF) { $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\Type::COMMENT, NOTIFY_SHARE], + $condition = ['type' => [Notify\Type::TAG_SELF, Notify\Type::COMMENT, NOTIFY_SHARE], 'link' => $params['link'], 'uid' => $params['uid']]; if (DBA::exists('notify', $condition)) { return false; @@ -592,7 +592,7 @@ function check_item_notification($itemid, $uid, $notification_type) { $params['type'] = NOTIFY_SHARE; $params['verb'] = Activity::POST; } elseif ($notification_type & UserItem::NOTIF_EXPLICIT_TAGGED) { - $params['type'] = NOTIFY_TAGSELF; + $params['type'] = Notify\Type::TAG_SELF; $params['verb'] = Activity::TAG; } elseif ($notification_type & UserItem::NOTIF_IMPLICIT_TAGGED) { $params['type'] = Notify\Type::COMMENT; diff --git a/mod/settings.php b/mod/settings.php index bce3ac8be59..9a8a8ba270f 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1236,7 +1236,7 @@ function settings_content(App $a) '$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 & Type::MAIL), Type::MAIL, ''], '$notify6' => ['notify6', DI::l10n()->t('You receive a friend suggestion'), ($notify & Type::SUGGEST), Type::SUGGEST, ''], - '$notify7' => ['notify7', DI::l10n()->t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''], + '$notify7' => ['notify7', DI::l10n()->t('You are tagged in a post'), ($notify & Type::TAG_SELF), Type::TAG_SELF, ''], '$notify8' => ['notify8', DI::l10n()->t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''], '$desktop_notifications' => ['desktop_notifications', DI::l10n()->t('Activate desktop notifications') , false, DI::l10n()->t('Show desktop popup on new notifications')], diff --git a/src/Model/Notify/Type.php b/src/Model/Notify/Type.php index 9c7e3b6deb6..c6f921b456d 100644 --- a/src/Model/Notify/Type.php +++ b/src/Model/Notify/Type.php @@ -19,4 +19,10 @@ class Type const MAIL = 16; /** @var int Notification about a friend suggestion */ const SUGGEST = 32; + /** @var int Unknown Notification + * @deprecated + */ + const PROFILE = 64; + /** @var int Notification about being tagged in a post */ + const TAG_SELF = 128; } From bee110dc0b3039c1ed375b9b7febd2de3f63519b Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Tue, 4 Feb 2020 22:14:42 +0100 Subject: [PATCH 10/18] Move Notify::TYPE_TAGSHARE --- boot.php | 1 - include/enotify.php | 2 +- src/Model/Notify/Type.php | 4 ++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index 6e5777e6bef..f7d7c298f23 100644 --- a/boot.php +++ b/boot.php @@ -140,7 +140,6 @@ * Email notification options * @{ */ -define('NOTIFY_TAGSHARE', 256); define('NOTIFY_POKE', 512); define('NOTIFY_SHARE', 1024); diff --git a/include/enotify.php b/include/enotify.php index 09b5e790574..d3c4c74f393 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -261,7 +261,7 @@ function notification($params) $itemlink = $params['link']; } - if ($params['type'] == NOTIFY_TAGSHARE) { + if ($params['type'] == Notify\Type::TAG_SHARE) { $itemlink = $params['link']; $subject = $l10n->t('[Friendica:Notify] %s tagged your post', $params['source_name']); diff --git a/src/Model/Notify/Type.php b/src/Model/Notify/Type.php index c6f921b456d..b329d7696b5 100644 --- a/src/Model/Notify/Type.php +++ b/src/Model/Notify/Type.php @@ -25,4 +25,8 @@ class Type const PROFILE = 64; /** @var int Notification about being tagged in a post */ const TAG_SELF = 128; + /** @var int Notification about being tagged + * @deprecated + */ + const TAG_SHARE = 256; } From a78e19ea769990f3587a7bff2d497db92cb2c314 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Tue, 4 Feb 2020 22:15:33 +0100 Subject: [PATCH 11/18] Move Notify::TYPE_POKE --- boot.php | 1 - include/enotify.php | 2 +- mod/settings.php | 2 +- src/Model/Notify/Type.php | 2 ++ src/Protocol/DFRN.php | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/boot.php b/boot.php index f7d7c298f23..84d43003412 100644 --- a/boot.php +++ b/boot.php @@ -140,7 +140,6 @@ * Email notification options * @{ */ -define('NOTIFY_POKE', 512); define('NOTIFY_SHARE', 1024); define('NOTIFY_SYSTEM', 32768); diff --git a/include/enotify.php b/include/enotify.php index d3c4c74f393..31983d8947e 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -242,7 +242,7 @@ function notification($params) $itemlink = $params['link']; } - if ($params['type'] == NOTIFY_POKE) { + if ($params['type'] == Notify\Type::POKE) { $subject = $l10n->t('[Friendica:Notify] %1$s poked you', $params['source_name']); $preamble = $l10n->t('%1$s poked you at %2$s', $params['source_name'], $sitename); diff --git a/mod/settings.php b/mod/settings.php index 9a8a8ba270f..69d9c77c9fd 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1237,7 +1237,7 @@ function settings_content(App $a) '$notify5' => ['notify5', DI::l10n()->t('You receive a private message'), ($notify & Type::MAIL), Type::MAIL, ''], '$notify6' => ['notify6', DI::l10n()->t('You receive a friend suggestion'), ($notify & Type::SUGGEST), Type::SUGGEST, ''], '$notify7' => ['notify7', DI::l10n()->t('You are tagged in a post'), ($notify & Type::TAG_SELF), Type::TAG_SELF, ''], - '$notify8' => ['notify8', DI::l10n()->t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''], + '$notify8' => ['notify8', DI::l10n()->t('You are poked/prodded/etc. in a post'), ($notify & Type::POKE), Type::POKE, ''], '$desktop_notifications' => ['desktop_notifications', DI::l10n()->t('Activate desktop notifications') , false, DI::l10n()->t('Show desktop popup on new notifications')], diff --git a/src/Model/Notify/Type.php b/src/Model/Notify/Type.php index b329d7696b5..80e5c493754 100644 --- a/src/Model/Notify/Type.php +++ b/src/Model/Notify/Type.php @@ -29,4 +29,6 @@ class Type * @deprecated */ const TAG_SHARE = 256; + /** @var int Notification about getting poked/prodded/etc. */ + const POKE = 512; } diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index b15816bc77e..9269fcc5e0d 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -2137,7 +2137,7 @@ private static function doPoke(array $item, array $importer) // send a notification notification( [ - "type" => NOTIFY_POKE, + "type" => Type::POKE, "notify_flags" => $importer["notify-flags"], "language" => $importer["language"], "to_name" => $importer["username"], From c6915dc6729e4ce73e5c0d890ba1b48feab6b232 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Tue, 4 Feb 2020 22:21:02 +0100 Subject: [PATCH 12/18] Move Notify::TYPE_SHARE --- boot.php | 1 - include/enotify.php | 6 +++--- src/Model/Notify/Type.php | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/boot.php b/boot.php index 84d43003412..df7dc85608e 100644 --- a/boot.php +++ b/boot.php @@ -140,7 +140,6 @@ * Email notification options * @{ */ -define('NOTIFY_SHARE', 1024); define('NOTIFY_SYSTEM', 32768); /* @}*/ diff --git a/include/enotify.php b/include/enotify.php index 31983d8947e..6d261720e56 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -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\Type::TAG_SELF, Notify\Type::COMMENT, NOTIFY_SHARE], + $condition = ['type' => [Notify\Type::TAG_SELF, Notify\Type::COMMENT, Notify\Type::SHARE], 'link' => $params['link'], 'uid' => $params['uid']]; if (DBA::exists('notify', $condition)) { return false; @@ -227,7 +227,7 @@ function notification($params) $itemlink = $params['link']; } - if ($params['type'] == NOTIFY_SHARE) { + if ($params['type'] == Notify\Type::SHARE) { $subject = $l10n->t('[Friendica:Notify] %s shared a new post', $params['source_name']); $preamble = $l10n->t('%1$s shared a new post at %2$s', $params['source_name'], $sitename); @@ -589,7 +589,7 @@ function check_item_notification($itemid, $uid, $notification_type) { } if ($notification_type & UserItem::NOTIF_SHARED) { - $params['type'] = NOTIFY_SHARE; + $params['type'] = Notify\Type::SHARE; $params['verb'] = Activity::POST; } elseif ($notification_type & UserItem::NOTIF_EXPLICIT_TAGGED) { $params['type'] = Notify\Type::TAG_SELF; diff --git a/src/Model/Notify/Type.php b/src/Model/Notify/Type.php index 80e5c493754..f15c1b76a75 100644 --- a/src/Model/Notify/Type.php +++ b/src/Model/Notify/Type.php @@ -31,4 +31,6 @@ class Type const TAG_SHARE = 256; /** @var int Notification about getting poked/prodded/etc. */ const POKE = 512; + /** @var int Notification about either a contact had posted something directly or the contact is a mentioned forum */ + const SHARE = 1024; } From 511556085a90f3bd12c4bc4d5b482a12d5fd2b98 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Tue, 4 Feb 2020 22:23:37 +0100 Subject: [PATCH 13/18] Move Notify::TYPE_SYSTEM --- boot.php | 11 ----------- include/enotify.php | 4 ++-- src/Model/Notify/Type.php | 5 ++++- src/Module/Register.php | 2 +- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/boot.php b/boot.php index df7dc85608e..40729a78c02 100644 --- a/boot.php +++ b/boot.php @@ -134,17 +134,6 @@ */ define('MAX_LIKERS', 75); -/** - * @name Notify - * - * Email notification options - * @{ - */ - -define('NOTIFY_SYSTEM', 32768); -/* @}*/ - - /** @deprecated since 2019.03, use Term::UNKNOWN instead */ define('TERM_UNKNOWN', Term::UNKNOWN); /** @deprecated since 2019.03, use Term::HASHTAG instead */ diff --git a/include/enotify.php b/include/enotify.php index 6d261720e56..96630ca3ecf 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -375,7 +375,7 @@ function notification($params) } } - if ($params['type'] == NOTIFY_SYSTEM) { + if ($params['type'] == Notify\Type::SYSTEM) { switch($params['event']) { case "SYSTEM_REGISTER_REQUEST": $itemlink = $params['link']; @@ -456,7 +456,7 @@ function notification($params) // send email notification if notification preferences permit if ((intval($params['notify_flags']) & intval($params['type'])) - || $params['type'] == NOTIFY_SYSTEM) { + || $params['type'] == Notify\Type::SYSTEM) { Logger::log('sending notification email'); diff --git a/src/Model/Notify/Type.php b/src/Model/Notify/Type.php index f15c1b76a75..aae5fedc05e 100644 --- a/src/Model/Notify/Type.php +++ b/src/Model/Notify/Type.php @@ -8,7 +8,7 @@ class Type { /** @var int Notification about a introduction */ - const INTRO = 1; + const INTRO = 1; /** @var int Notification about a confirmed introduction */ const CONFIRM = 2; /** @var int Notification about a post on your wall */ @@ -33,4 +33,7 @@ class Type const POKE = 512; /** @var int Notification about either a contact had posted something directly or the contact is a mentioned forum */ const SHARE = 1024; + + /** @var int Global System notifications */ + const SYSTEM = 32768; } diff --git a/src/Module/Register.php b/src/Module/Register.php index 98af06543d1..8401a215a8a 100644 --- a/src/Module/Register.php +++ b/src/Module/Register.php @@ -348,7 +348,7 @@ public static function post(array $parameters = []) // send notification to admins while ($admin = DBA::fetch($admins_stmt)) { \notification([ - 'type' => NOTIFY_SYSTEM, + 'type' => Model\Notify\Type::SYSTEM, 'event' => 'SYSTEM_REGISTER_REQUEST', 'source_name' => $user['username'], 'source_mail' => $user['email'], From 951b7179af35dd5a0a1544b76b9e04c66c9bae44 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Tue, 4 Feb 2020 22:30:34 +0100 Subject: [PATCH 14/18] Move [Friendica:Notify] to a own PREFIX variable --- include/enotify.php | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/include/enotify.php b/include/enotify.php index 96630ca3ecf..0e91ca7da11 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -30,6 +30,9 @@ */ function notification($params) { + /** @var string the common prefix of a notification subject */ + $SUBJECT_PREFIX = DI::l10n()->t('[Friendica:Notify]'); + // Temporary logging for finding the origin if (!isset($params['uid'])) { Logger::notice('Missing parameters "uid".', ['params' => $params, 'callstack' => System::callstack()]); @@ -106,7 +109,7 @@ function notification($params) $itemlink = $siteurl.'/message/'.$params['item']['id']; $params["link"] = $itemlink; - $subject = $l10n->t('[Friendica:Notify] New mail received at %s', $sitename); + $subject = $l10n->t( '%s New mail received at %s', $SUBJECT_PREFIX, $sitename); $preamble = $l10n->t('%1$s sent you a new private message at %2$s.', $params['source_name'], $sitename); $epreamble = $l10n->t('%1$s sent you %2$s.', '[url='.$params['source_link'].']'.$params['source_name'].'[/url]', '[url=' . $itemlink . ']' . $l10n->t('a private message').'[/url]'); @@ -195,11 +198,11 @@ function notification($params) // Before this we have the name of the replier on the subject rendering // different subjects for messages on the same thread. if ($params['activity']['explicit_tagged']) { - $subject = $l10n->t('[Friendica:Notify] %s tagged you', $params['source_name']); + $subject = $l10n->t('%s %s tagged you', $SUBJECT_PREFIX, $params['source_name']); $preamble = $l10n->t('%1$s tagged you at %2$s', $params['source_name'], $sitename); } else { - $subject = $l10n->t('[Friendica:Notify] Comment to conversation #%1$d by %2$s', $parent_id, $params['source_name']); + $subject = $l10n->t('%s Comment to conversation #%1$d by %2$s', $SUBJECT_PREFIX, $parent_id, $params['source_name']); $preamble = $l10n->t('%s commented on an item/conversation you have been following.', $params['source_name']); } @@ -213,7 +216,7 @@ function notification($params) } if ($params['type'] == Notify\Type::WALL) { - $subject = $l10n->t('[Friendica:Notify] %s posted to your profile wall', $params['source_name']); + $subject = $l10n->t('%s %s posted to your profile wall', $SUBJECT_PREFIX, $params['source_name']); $preamble = $l10n->t('%1$s posted to your profile wall at %2$s', $params['source_name'], $sitename); $epreamble = $l10n->t('%1$s posted to [url=%2$s]your wall[/url]', @@ -228,7 +231,7 @@ function notification($params) } if ($params['type'] == Notify\Type::SHARE) { - $subject = $l10n->t('[Friendica:Notify] %s shared a new post', $params['source_name']); + $subject = $l10n->t('%s Friendica:Notify] %s shared a new post', $SUBJECT_PREFIX, $params['source_name']); $preamble = $l10n->t('%1$s shared a new post at %2$s', $params['source_name'], $sitename); $epreamble = $l10n->t('%1$s [url=%2$s]shared a post[/url].', @@ -243,7 +246,7 @@ function notification($params) } if ($params['type'] == Notify\Type::POKE) { - $subject = $l10n->t('[Friendica:Notify] %1$s poked you', $params['source_name']); + $subject = $l10n->t('%s %1$s poked you', $SUBJECT_PREFIX, $params['source_name']); $preamble = $l10n->t('%1$s poked you at %2$s', $params['source_name'], $sitename); $epreamble = $l10n->t('%1$s [url=%2$s]poked you[/url].', @@ -263,7 +266,7 @@ function notification($params) if ($params['type'] == Notify\Type::TAG_SHARE) { $itemlink = $params['link']; - $subject = $l10n->t('[Friendica:Notify] %s tagged your post', $params['source_name']); + $subject = $l10n->t('%s %s tagged your post', $SUBJECT_PREFIX, $params['source_name']); $preamble = $l10n->t('%1$s tagged your post at %2$s', $params['source_name'], $sitename); $epreamble = $l10n->t('%1$s tagged [url=%2$s]your post[/url]', @@ -278,7 +281,7 @@ function notification($params) if ($params['type'] == Notify\Type::INTRO) { $itemlink = $params['link']; - $subject = $l10n->t('[Friendica:Notify] Introduction received'); + $subject = $l10n->t('%s Introduction received', $SUBJECT_PREFIX); $preamble = $l10n->t('You\'ve received an introduction from \'%1$s\' at %2$s', $params['source_name'], $sitename); $epreamble = $l10n->t('You\'ve received [url=%1$s]an introduction[/url] from %2$s.', @@ -295,7 +298,7 @@ function notification($params) switch ($params['verb']) { case Activity::FRIEND: // someone started to share with user (mostly OStatus) - $subject = $l10n->t('[Friendica:Notify] A new person is sharing with you'); + $subject = $l10n->t('%s A new person is sharing with you', $SUBJECT_PREFIX); $preamble = $l10n->t('%1$s is sharing with you at %2$s', $params['source_name'], $sitename); $epreamble = $l10n->t('%1$s is sharing with you at %2$s', @@ -305,7 +308,7 @@ function notification($params) break; case Activity::FOLLOW: // someone started to follow the user (mostly OStatus) - $subject = $l10n->t('[Friendica:Notify] You have a new follower'); + $subject = $l10n->t('%s You have a new follower', $SUBJECT_PREFIX); $preamble = $l10n->t('You have a new follower at %2$s : %1$s', $params['source_name'], $sitename); $epreamble = $l10n->t('You have a new follower at %2$s : %1$s', @@ -321,7 +324,7 @@ function notification($params) if ($params['type'] == Notify\Type::SUGGEST) { $itemlink = $params['link']; - $subject = $l10n->t('[Friendica:Notify] Friend suggestion received'); + $subject = $l10n->t('%s Friend suggestion received', $SUBJECT_PREFIX); $preamble = $l10n->t('You\'ve received a friend suggestion from \'%1$s\' at %2$s', $params['source_name'], $sitename); $epreamble = $l10n->t('You\'ve received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s.', @@ -342,7 +345,7 @@ function notification($params) if ($params['type'] == Notify\Type::CONFIRM) { if ($params['verb'] == Activity::FRIEND) { // mutual connection $itemlink = $params['link']; - $subject = $l10n->t('[Friendica:Notify] Connection accepted'); + $subject = $l10n->t('%s Connection accepted', $SUBJECT_PREFIX); $preamble = $l10n->t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename); $epreamble = $l10n->t('%2$s has accepted your [url=%1$s]connection request[/url].', @@ -357,7 +360,7 @@ function notification($params) $hsitelink = sprintf($sitelink, ''.$sitename.''); } else { // ACTIVITY_FOLLOW $itemlink = $params['link']; - $subject = $l10n->t('[Friendica:Notify] Connection accepted'); + $subject = $l10n->t('%s Connection accepted', $SUBJECT_PREFIX); $preamble = $l10n->t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename); $epreamble = $l10n->t('%2$s has accepted your [url=%1$s]connection request[/url].', From 2e98c05bd3affb6c866688b4ba33d5877e0c1a2d Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Wed, 5 Feb 2020 22:22:12 +0100 Subject: [PATCH 15/18] improvements/fixings --- include/enotify.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/include/enotify.php b/include/enotify.php index 0e91ca7da11..0777a72f4f0 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -31,7 +31,7 @@ function notification($params) { /** @var string the common prefix of a notification subject */ - $SUBJECT_PREFIX = DI::l10n()->t('[Friendica:Notify]'); + $subjectPrefix = DI::l10n()->t('[Friendica:Notify]'); // Temporary logging for finding the origin if (!isset($params['uid'])) { @@ -109,7 +109,7 @@ function notification($params) $itemlink = $siteurl.'/message/'.$params['item']['id']; $params["link"] = $itemlink; - $subject = $l10n->t( '%s New mail received at %s', $SUBJECT_PREFIX, $sitename); + $subject = $l10n->t( '%s New mail received at %s', $subjectPrefix, $sitename); $preamble = $l10n->t('%1$s sent you a new private message at %2$s.', $params['source_name'], $sitename); $epreamble = $l10n->t('%1$s sent you %2$s.', '[url='.$params['source_link'].']'.$params['source_name'].'[/url]', '[url=' . $itemlink . ']' . $l10n->t('a private message').'[/url]'); @@ -198,11 +198,11 @@ function notification($params) // Before this we have the name of the replier on the subject rendering // different subjects for messages on the same thread. if ($params['activity']['explicit_tagged']) { - $subject = $l10n->t('%s %s tagged you', $SUBJECT_PREFIX, $params['source_name']); + $subject = $l10n->t('%s %s tagged you', $subjectPrefix, $params['source_name']); $preamble = $l10n->t('%1$s tagged you at %2$s', $params['source_name'], $sitename); } else { - $subject = $l10n->t('%s Comment to conversation #%1$d by %2$s', $SUBJECT_PREFIX, $parent_id, $params['source_name']); + $subject = $l10n->t('%s Comment to conversation #%1$d by %2$s', $subjectPrefix, $parent_id, $params['source_name']); $preamble = $l10n->t('%s commented on an item/conversation you have been following.', $params['source_name']); } @@ -216,7 +216,7 @@ function notification($params) } if ($params['type'] == Notify\Type::WALL) { - $subject = $l10n->t('%s %s posted to your profile wall', $SUBJECT_PREFIX, $params['source_name']); + $subject = $l10n->t('%s %s posted to your profile wall', $subjectPrefix, $params['source_name']); $preamble = $l10n->t('%1$s posted to your profile wall at %2$s', $params['source_name'], $sitename); $epreamble = $l10n->t('%1$s posted to [url=%2$s]your wall[/url]', @@ -231,7 +231,7 @@ function notification($params) } if ($params['type'] == Notify\Type::SHARE) { - $subject = $l10n->t('%s Friendica:Notify] %s shared a new post', $SUBJECT_PREFIX, $params['source_name']); + $subject = $l10n->t('%s %s shared a new post', $subjectPrefix, $params['source_name']); $preamble = $l10n->t('%1$s shared a new post at %2$s', $params['source_name'], $sitename); $epreamble = $l10n->t('%1$s [url=%2$s]shared a post[/url].', @@ -246,7 +246,7 @@ function notification($params) } if ($params['type'] == Notify\Type::POKE) { - $subject = $l10n->t('%s %1$s poked you', $SUBJECT_PREFIX, $params['source_name']); + $subject = $l10n->t('%s %1$s poked you', $subjectPrefix, $params['source_name']); $preamble = $l10n->t('%1$s poked you at %2$s', $params['source_name'], $sitename); $epreamble = $l10n->t('%1$s [url=%2$s]poked you[/url].', @@ -266,7 +266,7 @@ function notification($params) if ($params['type'] == Notify\Type::TAG_SHARE) { $itemlink = $params['link']; - $subject = $l10n->t('%s %s tagged your post', $SUBJECT_PREFIX, $params['source_name']); + $subject = $l10n->t('%s %s tagged your post', $subjectPrefix, $params['source_name']); $preamble = $l10n->t('%1$s tagged your post at %2$s', $params['source_name'], $sitename); $epreamble = $l10n->t('%1$s tagged [url=%2$s]your post[/url]', @@ -281,7 +281,7 @@ function notification($params) if ($params['type'] == Notify\Type::INTRO) { $itemlink = $params['link']; - $subject = $l10n->t('%s Introduction received', $SUBJECT_PREFIX); + $subject = $l10n->t('%s Introduction received', $subjectPrefix); $preamble = $l10n->t('You\'ve received an introduction from \'%1$s\' at %2$s', $params['source_name'], $sitename); $epreamble = $l10n->t('You\'ve received [url=%1$s]an introduction[/url] from %2$s.', @@ -298,7 +298,7 @@ function notification($params) switch ($params['verb']) { case Activity::FRIEND: // someone started to share with user (mostly OStatus) - $subject = $l10n->t('%s A new person is sharing with you', $SUBJECT_PREFIX); + $subject = $l10n->t('%s A new person is sharing with you', $subjectPrefix); $preamble = $l10n->t('%1$s is sharing with you at %2$s', $params['source_name'], $sitename); $epreamble = $l10n->t('%1$s is sharing with you at %2$s', @@ -308,7 +308,7 @@ function notification($params) break; case Activity::FOLLOW: // someone started to follow the user (mostly OStatus) - $subject = $l10n->t('%s You have a new follower', $SUBJECT_PREFIX); + $subject = $l10n->t('%s You have a new follower', $subjectPrefix); $preamble = $l10n->t('You have a new follower at %2$s : %1$s', $params['source_name'], $sitename); $epreamble = $l10n->t('You have a new follower at %2$s : %1$s', @@ -324,7 +324,7 @@ function notification($params) if ($params['type'] == Notify\Type::SUGGEST) { $itemlink = $params['link']; - $subject = $l10n->t('%s Friend suggestion received', $SUBJECT_PREFIX); + $subject = $l10n->t('%s Friend suggestion received', $subjectPrefix); $preamble = $l10n->t('You\'ve received a friend suggestion from \'%1$s\' at %2$s', $params['source_name'], $sitename); $epreamble = $l10n->t('You\'ve received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s.', @@ -345,7 +345,7 @@ function notification($params) if ($params['type'] == Notify\Type::CONFIRM) { if ($params['verb'] == Activity::FRIEND) { // mutual connection $itemlink = $params['link']; - $subject = $l10n->t('%s Connection accepted', $SUBJECT_PREFIX); + $subject = $l10n->t('%s Connection accepted', $subjectPrefix); $preamble = $l10n->t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename); $epreamble = $l10n->t('%2$s has accepted your [url=%1$s]connection request[/url].', @@ -360,7 +360,7 @@ function notification($params) $hsitelink = sprintf($sitelink, ''.$sitename.''); } else { // ACTIVITY_FOLLOW $itemlink = $params['link']; - $subject = $l10n->t('%s Connection accepted', $SUBJECT_PREFIX); + $subject = $l10n->t('%s Connection accepted', $subjectPrefix); $preamble = $l10n->t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename); $epreamble = $l10n->t('%2$s has accepted your [url=%1$s]connection request[/url].', From f2517e2fba27c89062d7db96ad1ba5c807fbb8ab Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Wed, 5 Feb 2020 22:27:04 +0100 Subject: [PATCH 16/18] Set global notify constants deprecated --- boot.php | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/boot.php b/boot.php index 40729a78c02..8b9077b09dc 100644 --- a/boot.php +++ b/boot.php @@ -134,6 +134,40 @@ */ define('MAX_LIKERS', 75); +/** + * @name Notify + * + * Email notification options + * @{ + */ +/** @deprecated since 2020.12, use Notify\Type::INTRO instead */ +define('NOTIFY_INTRO', 1); +/** @deprecated since 2020.12, use Notify\Type::CONFIRM instead */ +define('NOTIFY_CONFIRM', 2); +/** @deprecated since 2020.12, use Notify\Type::WALL instead */ +define('NOTIFY_WALL', 4); +/** @deprecated since 2020.12, use Notify\Type::COMMENT instead */ +define('NOTIFY_COMMENT', 8); +/** @deprecated since 2020.12, use Notify\Type::MAIL instead */ +define('NOTIFY_MAIL', 16); +/** @deprecated since 2020.12, use Notify\Type::SUGGEST instead */ +define('NOTIFY_SUGGEST', 32); +/** @deprecated since 2020.12, use Notify\Type::PROFILE instead */ +define('NOTIFY_PROFILE', 64); +/** @deprecated since 2020.12, use Notify\Type::TAG_SELF instead */ +define('NOTIFY_TAGSELF', 128); +/** @deprecated since 2020.12, use Notify\Type::TAG_SHARE instead */ +define('NOTIFY_TAGSHARE', 256); +/** @deprecated since 2020.12, use Notify\Type::POKE instead */ +define('NOTIFY_POKE', 512); +/** @deprecated since 2020.12, use Notify\Type::SHARE instead */ +define('NOTIFY_SHARE', 1024); + +/** @deprecated since 2020.12, use Notify\Type::SYSTEM instead */ +define('NOTIFY_SYSTEM', 32768); +/* @}*/ + + /** @deprecated since 2019.03, use Term::UNKNOWN instead */ define('TERM_UNKNOWN', Term::UNKNOWN); /** @deprecated since 2019.03, use Term::HASHTAG instead */ From cb0057ef201fc2b063ec3c4f0f0c1234ecc4c38e Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Wed, 5 Feb 2020 22:27:47 +0100 Subject: [PATCH 17/18] wrong release ... --- boot.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/boot.php b/boot.php index 8b9077b09dc..409ed05eb40 100644 --- a/boot.php +++ b/boot.php @@ -140,27 +140,27 @@ * Email notification options * @{ */ -/** @deprecated since 2020.12, use Notify\Type::INTRO instead */ +/** @deprecated since 2020.03, use Notify\Type::INTRO instead */ define('NOTIFY_INTRO', 1); -/** @deprecated since 2020.12, use Notify\Type::CONFIRM instead */ +/** @deprecated since 2020.03, use Notify\Type::CONFIRM instead */ define('NOTIFY_CONFIRM', 2); -/** @deprecated since 2020.12, use Notify\Type::WALL instead */ +/** @deprecated since 2020.03, use Notify\Type::WALL instead */ define('NOTIFY_WALL', 4); -/** @deprecated since 2020.12, use Notify\Type::COMMENT instead */ +/** @deprecated since 2020.03, use Notify\Type::COMMENT instead */ define('NOTIFY_COMMENT', 8); -/** @deprecated since 2020.12, use Notify\Type::MAIL instead */ +/** @deprecated since 2020.03, use Notify\Type::MAIL instead */ define('NOTIFY_MAIL', 16); -/** @deprecated since 2020.12, use Notify\Type::SUGGEST instead */ +/** @deprecated since 2020.03, use Notify\Type::SUGGEST instead */ define('NOTIFY_SUGGEST', 32); -/** @deprecated since 2020.12, use Notify\Type::PROFILE instead */ +/** @deprecated since 2020.03, use Notify\Type::PROFILE instead */ define('NOTIFY_PROFILE', 64); -/** @deprecated since 2020.12, use Notify\Type::TAG_SELF instead */ +/** @deprecated since 2020.03, use Notify\Type::TAG_SELF instead */ define('NOTIFY_TAGSELF', 128); -/** @deprecated since 2020.12, use Notify\Type::TAG_SHARE instead */ +/** @deprecated since 2020.03, use Notify\Type::TAG_SHARE instead */ define('NOTIFY_TAGSHARE', 256); -/** @deprecated since 2020.12, use Notify\Type::POKE instead */ +/** @deprecated since 2020.03, use Notify\Type::POKE instead */ define('NOTIFY_POKE', 512); -/** @deprecated since 2020.12, use Notify\Type::SHARE instead */ +/** @deprecated since 2020.03, use Notify\Type::SHARE instead */ define('NOTIFY_SHARE', 1024); /** @deprecated since 2020.12, use Notify\Type::SYSTEM instead */ From d3929267d0d8fe9eac176685a34d2cfb2f8122ce Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Wed, 5 Feb 2020 22:31:08 +0100 Subject: [PATCH 18/18] replaced with notify constants --- boot.php | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/boot.php b/boot.php index 409ed05eb40..cd6e3bda853 100644 --- a/boot.php +++ b/boot.php @@ -22,6 +22,7 @@ use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; +use Friendica\Model\Notify; use Friendica\Model\Term; use Friendica\Util\BasePath; use Friendica\Util\DateTimeFormat; @@ -141,30 +142,30 @@ * @{ */ /** @deprecated since 2020.03, use Notify\Type::INTRO instead */ -define('NOTIFY_INTRO', 1); +define('NOTIFY_INTRO', Notify\Type::INTRO); /** @deprecated since 2020.03, use Notify\Type::CONFIRM instead */ -define('NOTIFY_CONFIRM', 2); +define('NOTIFY_CONFIRM', Notify\Type::CONFIRM); /** @deprecated since 2020.03, use Notify\Type::WALL instead */ -define('NOTIFY_WALL', 4); +define('NOTIFY_WALL', Notify\Type::WALL); /** @deprecated since 2020.03, use Notify\Type::COMMENT instead */ -define('NOTIFY_COMMENT', 8); +define('NOTIFY_COMMENT', Notify\Type::COMMENT); /** @deprecated since 2020.03, use Notify\Type::MAIL instead */ -define('NOTIFY_MAIL', 16); +define('NOTIFY_MAIL', Notify\Type::MAIL); /** @deprecated since 2020.03, use Notify\Type::SUGGEST instead */ -define('NOTIFY_SUGGEST', 32); +define('NOTIFY_SUGGEST', Notify\Type::SUGGEST); /** @deprecated since 2020.03, use Notify\Type::PROFILE instead */ -define('NOTIFY_PROFILE', 64); +define('NOTIFY_PROFILE', Notify\Type::PROFILE); /** @deprecated since 2020.03, use Notify\Type::TAG_SELF instead */ -define('NOTIFY_TAGSELF', 128); +define('NOTIFY_TAGSELF', Notify\Type::TAG_SELF); /** @deprecated since 2020.03, use Notify\Type::TAG_SHARE instead */ -define('NOTIFY_TAGSHARE', 256); +define('NOTIFY_TAGSHARE', Notify\Type::TAG_SHARE); /** @deprecated since 2020.03, use Notify\Type::POKE instead */ -define('NOTIFY_POKE', 512); +define('NOTIFY_POKE', Notify\Type::POKE); /** @deprecated since 2020.03, use Notify\Type::SHARE instead */ -define('NOTIFY_SHARE', 1024); +define('NOTIFY_SHARE', Notify\Type::SHARE); /** @deprecated since 2020.12, use Notify\Type::SYSTEM instead */ -define('NOTIFY_SYSTEM', 32768); +define('NOTIFY_SYSTEM', Notify\Type::SYSTEM); /* @}*/