bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Rename notify classes according the feature name, not the table name

Browse source
This commit is contained in:
Hypolite Petovan 2021-01-23 04:53:44 -05:00
parent a7fac5a76f
commit 82e094179c
25 changed files with 120 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
boot.php
View file

@ -32,7 +32,7 @@ use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Notify; use Friendica\Model\Notification;
use Friendica\Util\BasePath; use Friendica\Util\BasePath;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
@ -145,36 +145,36 @@ $netgroup_ids = [
define('MAX_LIKERS', 75); define('MAX_LIKERS', 75);
/** /**
* @name Notify * @name Notification
* *
* Email notification options * Email notification options
* @{ * @{
*/ */
/** @deprecated since 2020.03, use Notify\Type::INTRO instead */ /** @deprecated since 2020.03, use Notification\Type::INTRO instead */
define('NOTIFY_INTRO', Notify\Type::INTRO); define('NOTIFY_INTRO', Notification\Type::INTRO);
/** @deprecated since 2020.03, use Notify\Type::CONFIRM instead */ /** @deprecated since 2020.03, use Notification\Type::CONFIRM instead */
define('NOTIFY_CONFIRM', Notify\Type::CONFIRM); define('NOTIFY_CONFIRM', Notification\Type::CONFIRM);
/** @deprecated since 2020.03, use Notify\Type::WALL instead */ /** @deprecated since 2020.03, use Notification\Type::WALL instead */
define('NOTIFY_WALL', Notify\Type::WALL); define('NOTIFY_WALL', Notification\Type::WALL);
/** @deprecated since 2020.03, use Notify\Type::COMMENT instead */ /** @deprecated since 2020.03, use Notification\Type::COMMENT instead */
define('NOTIFY_COMMENT', Notify\Type::COMMENT); define('NOTIFY_COMMENT', Notification\Type::COMMENT);
/** @deprecated since 2020.03, use Notify\Type::MAIL instead */ /** @deprecated since 2020.03, use Notification\Type::MAIL instead */
define('NOTIFY_MAIL', Notify\Type::MAIL); define('NOTIFY_MAIL', Notification\Type::MAIL);
/** @deprecated since 2020.03, use Notify\Type::SUGGEST instead */ /** @deprecated since 2020.03, use Notification\Type::SUGGEST instead */
define('NOTIFY_SUGGEST', Notify\Type::SUGGEST); define('NOTIFY_SUGGEST', Notification\Type::SUGGEST);
/** @deprecated since 2020.03, use Notify\Type::PROFILE instead */ /** @deprecated since 2020.03, use Notification\Type::PROFILE instead */
define('NOTIFY_PROFILE', Notify\Type::PROFILE); define('NOTIFY_PROFILE', Notification\Type::PROFILE);
/** @deprecated since 2020.03, use Notify\Type::TAG_SELF instead */ /** @deprecated since 2020.03, use Notification\Type::TAG_SELF instead */
define('NOTIFY_TAGSELF', Notify\Type::TAG_SELF); define('NOTIFY_TAGSELF', Notification\Type::TAG_SELF);
/** @deprecated since 2020.03, use Notify\Type::TAG_SHARE instead */ /** @deprecated since 2020.03, use Notification\Type::TAG_SHARE instead */
define('NOTIFY_TAGSHARE', Notify\Type::TAG_SHARE); define('NOTIFY_TAGSHARE', Notification\Type::TAG_SHARE);
/** @deprecated since 2020.03, use Notify\Type::POKE instead */ /** @deprecated since 2020.03, use Notification\Type::POKE instead */
define('NOTIFY_POKE', Notify\Type::POKE); define('NOTIFY_POKE', Notification\Type::POKE);
/** @deprecated since 2020.03, use Notify\Type::SHARE instead */ /** @deprecated since 2020.03, use Notification\Type::SHARE instead */
define('NOTIFY_SHARE', Notify\Type::SHARE); define('NOTIFY_SHARE', Notification\Type::SHARE);
/** @deprecated since 2020.12, use Notify\Type::SYSTEM instead */ /** @deprecated since 2020.12, use Notification\Type::SYSTEM instead */
define('NOTIFY_SYSTEM', Notify\Type::SYSTEM); define('NOTIFY_SYSTEM', Notification\Type::SYSTEM);
/* @}*/ /* @}*/
/** /**

7
include/api.php
View file

@ -39,13 +39,12 @@ use Friendica\Model\Contact;
use Friendica\Model\Group; use Friendica\Model\Group;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Model\Mail; use Friendica\Model\Mail;
use Friendica\Model\Notify; use Friendica\Model\Notification;
use Friendica\Model\Photo; use Friendica\Model\Photo;
use Friendica\Model\Post; use Friendica\Model\Post;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Model\UserItem; use Friendica\Model\UserItem;
use Friendica\Model\Verb; use Friendica\Model\Verb;
use Friendica\Security\FKOAuth1;
use Friendica\Network\HTTPException; use Friendica\Network\HTTPException;
use Friendica\Network\HTTPException\BadRequestException; use Friendica\Network\HTTPException\BadRequestException;
use Friendica\Network\HTTPException\ExpectationFailedException; use Friendica\Network\HTTPException\ExpectationFailedException;
@ -53,12 +52,12 @@ use Friendica\Network\HTTPException\ForbiddenException;
use Friendica\Network\HTTPException\InternalServerErrorException; use Friendica\Network\HTTPException\InternalServerErrorException;
use Friendica\Network\HTTPException\MethodNotAllowedException; use Friendica\Network\HTTPException\MethodNotAllowedException;
use Friendica\Network\HTTPException\NotFoundException; use Friendica\Network\HTTPException\NotFoundException;
use Friendica\Network\HTTPException\NotImplementedException;
use Friendica\Network\HTTPException\TooManyRequestsException; use Friendica\Network\HTTPException\TooManyRequestsException;
use Friendica\Network\HTTPException\UnauthorizedException; use Friendica\Network\HTTPException\UnauthorizedException;
use Friendica\Object\Image; use Friendica\Object\Image;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
use Friendica\Protocol\Diaspora; use Friendica\Protocol\Diaspora;
use Friendica\Security\FKOAuth1;
use Friendica\Security\OAuth1\OAuthRequest; use Friendica\Security\OAuth1\OAuthRequest;
use Friendica\Security\OAuth1\OAuthUtil; use Friendica\Security\OAuth1\OAuthUtil;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
@ -5809,7 +5808,7 @@ function api_friendica_notification_seen($type)
$notify = DI::notify()->getByID($id, api_user()); $notify = DI::notify()->getByID($id, api_user());
DI::notify()->setSeen(true, $notify); DI::notify()->setSeen(true, $notify);
if ($notify->otype === Notify\ObjectType::ITEM) { if ($notify->otype === Notification\ObjectType::ITEM) {
$item = Post::selectFirstForUser(api_user(), [], ['id' => $notify->iid, 'uid' => api_user()]); $item = Post::selectFirstForUser(api_user(), [], ['id' => $notify->iid, 'uid' => api_user()]);
if (DBA::isResult($item)) { if (DBA::isResult($item)) {
// we found the item, return it to the user // we found the item, return it to the user

44
include/enotify.php
View file

@ -29,7 +29,7 @@ use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Model\ItemContent; use Friendica\Model\ItemContent;
use Friendica\Model\Notify; use Friendica\Model\Notification;
use Friendica\Model\Post; use Friendica\Model\Post;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Model\UserItem; use Friendica\Model\UserItem;
@ -132,7 +132,7 @@ function notification($params)
$hsitelink = ''; $hsitelink = '';
$itemlink = ''; $itemlink = '';
if ($params['type'] == Notify\Type::MAIL) { if ($params['type'] == Notification\Type::MAIL) {
$itemlink = $params['link']; $itemlink = $params['link'];
$subject = $l10n->t('%s New mail received at %s', $subjectPrefix, $sitename); $subject = $l10n->t('%s New mail received at %s', $subjectPrefix, $sitename);
@ -148,7 +148,7 @@ function notification($params)
$show_in_notification_page = false; $show_in_notification_page = false;
} }
if ($params['type'] == Notify\Type::COMMENT || $params['type'] == Notify\Type::TAG_SELF) { if ($params['type'] == Notification\Type::COMMENT || $params['type'] == Notification\Type::TAG_SELF) {
$thread = Post::selectFirstThreadForUser($params['uid'], ['ignored'], ['iid' => $parent_id, 'deleted' => false]); $thread = Post::selectFirstThreadForUser($params['uid'], ['ignored'], ['iid' => $parent_id, 'deleted' => false]);
if (DBA::isResult($thread) && $thread['ignored']) { if (DBA::isResult($thread) && $thread['ignored']) {
Logger::log('Thread ' . $parent_id . ' will be ignored', Logger::DEBUG); Logger::log('Thread ' . $parent_id . ' will be ignored', Logger::DEBUG);
@ -158,7 +158,7 @@ function notification($params)
// Check to see if there was already a tag notify or comment notify for this post. // Check to see if there was already a tag notify or comment notify for this post.
// If so don't create a second notification // If so don't create a second notification
/// @todo In the future we should store the notification with the highest "value" and replace notifications /// @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\Type::SHARE], $condition = ['type' => [Notification\Type::TAG_SELF, Notification\Type::COMMENT, Notification\Type::SHARE],
'link' => $params['link'], 'uid' => $params['uid']]; 'link' => $params['link'], 'uid' => $params['uid']];
if (DBA::exists('notify', $condition)) { if (DBA::exists('notify', $condition)) {
return false; return false;
@ -166,7 +166,7 @@ function notification($params)
// if it's a post figure out who's post it is. // if it's a post figure out who's post it is.
$item = null; $item = null;
if ($params['otype'] === Notify\ObjectType::ITEM && $parent_id) { if ($params['otype'] === Notification\ObjectType::ITEM && $parent_id) {
$item = Post::selectFirstForUser($params['uid'], Item::ITEM_FIELDLIST, ['id' => $parent_id, 'deleted' => false]); $item = Post::selectFirstForUser($params['uid'], Item::ITEM_FIELDLIST, ['id' => $parent_id, 'deleted' => false]);
} }
@ -244,7 +244,7 @@ function notification($params)
$itemlink = $params['link']; $itemlink = $params['link'];
} }
if ($params['type'] == Notify\Type::WALL) { if ($params['type'] == Notification\Type::WALL) {
$subject = $l10n->t('%s %s posted to your profile wall', $subjectPrefix, $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); $preamble = $l10n->t('%1$s posted to your profile wall at %2$s', $params['source_name'], $sitename);
@ -259,7 +259,7 @@ function notification($params)
$itemlink = $params['link']; $itemlink = $params['link'];
} }
if ($params['type'] == Notify\Type::SHARE) { if ($params['type'] == Notification\Type::SHARE) {
if ($params['origin_link'] == $params['source_link']) { if ($params['origin_link'] == $params['source_link']) {
$subject = $l10n->t('%s %s shared a new post', $subjectPrefix, $params['source_name']); $subject = $l10n->t('%s %s shared a new post', $subjectPrefix, $params['source_name']);
@ -284,7 +284,7 @@ function notification($params)
$itemlink = $params['link']; $itemlink = $params['link'];
} }
if ($params['type'] == Notify\Type::POKE) { if ($params['type'] == Notification\Type::POKE) {
$subject = $l10n->t('%1$s %2$s poked you', $subjectPrefix, $params['source_name']); $subject = $l10n->t('%1$s %2$s poked you', $subjectPrefix, $params['source_name']);
$preamble = $l10n->t('%1$s poked you at %2$s', $params['source_name'], $sitename); $preamble = $l10n->t('%1$s poked you at %2$s', $params['source_name'], $sitename);
@ -303,7 +303,7 @@ function notification($params)
$itemlink = $params['link']; $itemlink = $params['link'];
} }
if ($params['type'] == Notify\Type::TAG_SHARE) { if ($params['type'] == Notification\Type::TAG_SHARE) {
$itemlink = $params['link']; $itemlink = $params['link'];
$subject = $l10n->t('%s %s tagged your post', $subjectPrefix, $params['source_name']); $subject = $l10n->t('%s %s tagged your post', $subjectPrefix, $params['source_name']);
@ -318,7 +318,7 @@ function notification($params)
$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>'); $hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
} }
if ($params['type'] == Notify\Type::INTRO) { if ($params['type'] == Notification\Type::INTRO) {
$itemlink = $params['link']; $itemlink = $params['link'];
$subject = $l10n->t('%s Introduction received', $subjectPrefix); $subject = $l10n->t('%s Introduction received', $subjectPrefix);
@ -361,7 +361,7 @@ function notification($params)
} }
} }
if ($params['type'] == Notify\Type::SUGGEST) { if ($params['type'] == Notification\Type::SUGGEST) {
$itemlink = $params['link']; $itemlink = $params['link'];
$subject = $l10n->t('%s Friend suggestion received', $subjectPrefix); $subject = $l10n->t('%s Friend suggestion received', $subjectPrefix);
@ -381,7 +381,7 @@ function notification($params)
$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>'); $hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
} }
if ($params['type'] == Notify\Type::CONFIRM) { if ($params['type'] == Notification\Type::CONFIRM) {
if ($params['verb'] == Activity::FRIEND) { // mutual connection if ($params['verb'] == Activity::FRIEND) { // mutual connection
$itemlink = $params['link']; $itemlink = $params['link'];
$subject = $l10n->t('%s Connection accepted', $subjectPrefix); $subject = $l10n->t('%s Connection accepted', $subjectPrefix);
@ -417,7 +417,7 @@ function notification($params)
} }
} }
if ($params['type'] == Notify\Type::SYSTEM) { if ($params['type'] == Notification\Type::SYSTEM) {
switch($params['event']) { switch($params['event']) {
case "SYSTEM_REGISTER_REQUEST": case "SYSTEM_REGISTER_REQUEST":
$itemlink = $params['link']; $itemlink = $params['link'];
@ -514,7 +514,7 @@ function notification($params)
// send email notification if notification preferences permit // send email notification if notification preferences permit
if ((intval($params['notify_flags']) & intval($params['type'])) if ((intval($params['notify_flags']) & intval($params['type']))
|| $params['type'] == Notify\Type::SYSTEM) { || $params['type'] == Notification\Type::SYSTEM) {
Logger::log('sending notification email'); Logger::log('sending notification email');
@ -631,7 +631,7 @@ function check_item_notification($itemid, $uid, $notification_type) {
// Generate the notification array // Generate the notification array
$params = []; $params = [];
$params['otype'] = Notify\ObjectType::ITEM; $params['otype'] = Notification\ObjectType::ITEM;
$params['uid'] = $uid; $params['uid'] = $uid;
$params['origin_cid'] = $params['cid'] = $item['author-id']; $params['origin_cid'] = $params['cid'] = $item['author-id'];
$params['item'] = $item; $params['item'] = $item;
@ -651,7 +651,7 @@ function check_item_notification($itemid, $uid, $notification_type) {
} }
if ($notification_type & UserItem::NOTIF_SHARED) { if ($notification_type & UserItem::NOTIF_SHARED) {
$params['type'] = Notify\Type::SHARE; $params['type'] = Notification\Type::SHARE;
$params['verb'] = Activity::POST; $params['verb'] = Activity::POST;
// Special treatment for posts that had been shared via "announce" // Special treatment for posts that had been shared via "announce"
@ -668,22 +668,22 @@ function check_item_notification($itemid, $uid, $notification_type) {
} }
} }
} elseif ($notification_type & UserItem::NOTIF_EXPLICIT_TAGGED) { } elseif ($notification_type & UserItem::NOTIF_EXPLICIT_TAGGED) {
$params['type'] = Notify\Type::TAG_SELF; $params['type'] = Notification\Type::TAG_SELF;
$params['verb'] = Activity::TAG; $params['verb'] = Activity::TAG;
} elseif ($notification_type & UserItem::NOTIF_IMPLICIT_TAGGED) { } elseif ($notification_type & UserItem::NOTIF_IMPLICIT_TAGGED) {
$params['type'] = Notify\Type::COMMENT; $params['type'] = Notification\Type::COMMENT;
$params['verb'] = Activity::POST; $params['verb'] = Activity::POST;
} elseif ($notification_type & UserItem::NOTIF_THREAD_COMMENT) { } elseif ($notification_type & UserItem::NOTIF_THREAD_COMMENT) {
$params['type'] = Notify\Type::COMMENT; $params['type'] = Notification\Type::COMMENT;
$params['verb'] = Activity::POST; $params['verb'] = Activity::POST;
} elseif ($notification_type & UserItem::NOTIF_DIRECT_COMMENT) { } elseif ($notification_type & UserItem::NOTIF_DIRECT_COMMENT) {
$params['type'] = Notify\Type::COMMENT; $params['type'] = Notification\Type::COMMENT;
$params['verb'] = Activity::POST; $params['verb'] = Activity::POST;
} elseif ($notification_type & UserItem::NOTIF_COMMENT_PARTICIPATION) { } elseif ($notification_type & UserItem::NOTIF_COMMENT_PARTICIPATION) {
$params['type'] = Notify\Type::COMMENT; $params['type'] = Notification\Type::COMMENT;
$params['verb'] = Activity::POST; $params['verb'] = Activity::POST;
} elseif ($notification_type & UserItem::NOTIF_ACTIVITY_PARTICIPATION) { } elseif ($notification_type & UserItem::NOTIF_ACTIVITY_PARTICIPATION) {
$params['type'] = Notify\Type::COMMENT; $params['type'] = Notification\Type::COMMENT;
$params['verb'] = Activity::POST; $params['verb'] = Activity::POST;
} else { } else {
return false; return false;

9
mod/dfrn_confirm.php
View file

@ -40,8 +40,7 @@ use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Group; use Friendica\Model\Group;
use Friendica\Model\Notify; use Friendica\Model\Notification;
use Friendica\Model\Notify\Type;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
use Friendica\Util\Crypto; use Friendica\Util\Crypto;
@ -540,11 +539,11 @@ function dfrn_confirm_post(App $a, $handsfree = null)
if (DBA::isResult($r)) { if (DBA::isResult($r)) {
$combined = $r[0]; $combined = $r[0];
if ($combined['notify-flags'] & Type::CONFIRM) { if ($combined['notify-flags'] & Notification\Type::CONFIRM) {
$mutual = ($new_relation == Contact::FRIEND); $mutual = ($new_relation == Contact::FRIEND);
notification([ notification([
'type' => Type::CONFIRM, 'type' => Notification\Type::CONFIRM,
'otype' => Notify\ObjectType::INTRO, 'otype' => Notification\ObjectType::INTRO,
'verb' => ($mutual ? Activity::FRIEND : Activity::FOLLOW), 'verb' => ($mutual ? Activity::FRIEND : Activity::FOLLOW),
'uid' => $combined['uid'], 'uid' => $combined['uid'],
'cid' => $combined['id'], 'cid' => $combined['id'],

7
mod/dfrn_request.php
View file

@ -35,8 +35,7 @@ use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Group; use Friendica\Model\Group;
use Friendica\Model\Notify; use Friendica\Model\Notification;
use Friendica\Model\Notify\Type;
use Friendica\Model\Profile; use Friendica\Model\Profile;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Module\Security\Login; use Friendica\Module\Security\Login;
@ -560,8 +559,8 @@ function dfrn_request_content(App $a)
if (!$auto_confirm) { if (!$auto_confirm) {
notification([ notification([
'type' => Type::INTRO, 'type' => Notification\Type::INTRO,
'otype' => Notify\ObjectType::INTRO, 'otype' => Notification\ObjectType::INTRO,
'verb' => Activity::REQ_FRIEND, 'verb' => Activity::REQ_FRIEND,
'uid' => $r[0]['uid'], 'uid' => $r[0]['uid'],
'cid' => $r[0]['id'], 'cid' => $r[0]['id'],

13
mod/item.php
View file

@ -45,8 +45,7 @@ use Friendica\Model\Contact;
use Friendica\Model\Conversation; use Friendica\Model\Conversation;
use Friendica\Model\FileTag; use Friendica\Model\FileTag;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Model\Notify; use Friendica\Model\Notification;
use Friendica\Model\Notify\Type;
use Friendica\Model\Photo; use Friendica\Model\Photo;
use Friendica\Model\Post; use Friendica\Model\Post;
use Friendica\Model\Tag; use Friendica\Model\Tag;
@ -55,8 +54,8 @@ use Friendica\Network\HTTPException;
use Friendica\Object\EMail\ItemCCEMail; use Friendica\Object\EMail\ItemCCEMail;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
use Friendica\Protocol\Diaspora; use Friendica\Protocol\Diaspora;
use Friendica\Util\DateTimeFormat;
use Friendica\Security\Security; use Friendica\Security\Security;
use Friendica\Util\DateTimeFormat;
use Friendica\Worker\Delivery; use Friendica\Worker\Delivery;
function item_post(App $a) { function item_post(App $a) {
@ -743,8 +742,8 @@ function item_post(App $a) {
if ($contact_record != $author) { if ($contact_record != $author) {
if ($toplevel_item_id) { if ($toplevel_item_id) {
notification([ notification([
'type' => Type::COMMENT, 'type' => Notification\Type::COMMENT,
'otype' => Notify\ObjectType::ITEM, 'otype' => Notification\ObjectType::ITEM,
'verb' => Activity::POST, 'verb' => Activity::POST,
'uid' => $profile_uid, 'uid' => $profile_uid,
'cid' => $datarray['author-id'], 'cid' => $datarray['author-id'],
@ -753,8 +752,8 @@ function item_post(App $a) {
]); ]);
} elseif (empty($forum_contact)) { } elseif (empty($forum_contact)) {
notification([ notification([
'type' => Type::WALL, 'type' => Notification\Type::WALL,
'otype' => Notify\ObjectType::ITEM, 'otype' => Notification\ObjectType::ITEM,
'verb' => Activity::POST, 'verb' => Activity::POST,
'uid' => $profile_uid, 'uid' => $profile_uid,
'cid' => $datarray['author-id'], 'cid' => $datarray['author-id'],

1
mod/message.php
View file

@ -29,7 +29,6 @@ use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Mail; use Friendica\Model\Mail;
use Friendica\Model\Notify\Type;
use Friendica\Module\Security\Login; use Friendica\Module\Security\Login;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings; use Friendica\Util\Strings;

8
mod/ping.php
View file

@ -28,7 +28,7 @@ use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Group; use Friendica\Model\Group;
use Friendica\Model\Notify\Type; use Friendica\Model\Notification;
use Friendica\Model\Post; use Friendica\Model\Post;
use Friendica\Model\Verb; use Friendica\Model\Verb;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
@ -418,8 +418,8 @@ function ping_get_notifications($uid)
AND NOT (`notify`.`type` IN (%d, %d)) AND NOT (`notify`.`type` IN (%d, %d))
AND $seensql `notify`.`seen` ORDER BY `notify`.`date` $order LIMIT %d, 50", AND $seensql `notify`.`seen` ORDER BY `notify`.`date` $order LIMIT %d, 50",
intval($uid), intval($uid),
intval(Type::INTRO), intval(Notification\Type::INTRO),
intval(Type::MAIL), intval(Notification\Type::MAIL),
intval($offset) intval($offset)
); );
@ -448,7 +448,7 @@ function ping_get_notifications($uid)
$notification["message"] = $notification["msg_cache"]; $notification["message"] = $notification["msg_cache"];
} else { } else {
$notification["name"] = strip_tags(BBCode::convert($notification["name"])); $notification["name"] = strip_tags(BBCode::convert($notification["name"]));
$notification["message"] = Friendica\Model\Notify::formatMessage($notification["name"], strip_tags(BBCode::convert($notification["msg"]))); $notification["message"] = Notification::formatMessage($notification["name"], strip_tags(BBCode::convert($notification["msg"])));
q( q(
"UPDATE `notify` SET `name_cache` = '%s', `msg_cache` = '%s' WHERE `id` = %d", "UPDATE `notify` SET `name_cache` = '%s', `msg_cache` = '%s' WHERE `id` = %d",

18
mod/settings.php
View file

@ -32,7 +32,7 @@ use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Group; use Friendica\Model\Group;
use Friendica\Model\Notify\Type; use Friendica\Model\Notification;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Module\BaseSettings; use Friendica\Module\BaseSettings;
use Friendica\Module\Security\Login; use Friendica\Module\Security\Login;
@ -895,14 +895,14 @@ function settings_content(App $a)
'$h_not' => DI::l10n()->t('Notification Settings'), '$h_not' => DI::l10n()->t('Notification Settings'),
'$lbl_not' => DI::l10n()->t('Send a notification email when:'), '$lbl_not' => DI::l10n()->t('Send a notification email when:'),
'$notify1' => ['notify1', DI::l10n()->t('You receive an introduction'), ($notify & Type::INTRO), Type::INTRO, ''], '$notify1' => ['notify1', DI::l10n()->t('You receive an introduction'), ($notify & Notification\Type::INTRO), Notification\Type::INTRO, ''],
'$notify2' => ['notify2', DI::l10n()->t('Your introductions are confirmed'), ($notify & Type::CONFIRM), Type::CONFIRM, ''], '$notify2' => ['notify2', DI::l10n()->t('Your introductions are confirmed'), ($notify & Notification\Type::CONFIRM), Notification\Type::CONFIRM, ''],
'$notify3' => ['notify3', DI::l10n()->t('Someone writes on your profile wall'), ($notify & Type::WALL), Type::WALL, ''], '$notify3' => ['notify3', DI::l10n()->t('Someone writes on your profile wall'), ($notify & Notification\Type::WALL), Notification\Type::WALL, ''],
'$notify4' => ['notify4', DI::l10n()->t('Someone writes a followup comment'), ($notify & Type::COMMENT), Type::COMMENT, ''], '$notify4' => ['notify4', DI::l10n()->t('Someone writes a followup comment'), ($notify & Notification\Type::COMMENT), Notification\Type::COMMENT, ''],
'$notify5' => ['notify5', DI::l10n()->t('You receive a private message'), ($notify & Type::MAIL), Type::MAIL, ''], '$notify5' => ['notify5', DI::l10n()->t('You receive a private message'), ($notify & Notification\Type::MAIL), Notification\Type::MAIL, ''],
'$notify6' => ['notify6', DI::l10n()->t('You receive a friend suggestion'), ($notify & Type::SUGGEST), Type::SUGGEST, ''], '$notify6' => ['notify6', DI::l10n()->t('You receive a friend suggestion'), ($notify & Notification\Type::SUGGEST), Notification\Type::SUGGEST, ''],
'$notify7' => ['notify7', DI::l10n()->t('You are tagged in a post'), ($notify & Type::TAG_SELF), Type::TAG_SELF, ''], '$notify7' => ['notify7', DI::l10n()->t('You are tagged in a post'), ($notify & Notification\Type::TAG_SELF), Notification\Type::TAG_SELF, ''],
'$notify8' => ['notify8', DI::l10n()->t('You are poked/prodded/etc. in a post'), ($notify & Type::POKE), Type::POKE, ''], '$notify8' => ['notify8', DI::l10n()->t('You are poked/prodded/etc. in a post'), ($notify & Notification\Type::POKE), Notification\Type::POKE, ''],
'$desktop_notifications' => ['desktop_notifications', DI::l10n()->t('Activate desktop notifications') , false, DI::l10n()->t('Show desktop popup on new notifications')], '$desktop_notifications' => ['desktop_notifications', DI::l10n()->t('Activate desktop notifications') , false, DI::l10n()->t('Show desktop popup on new notifications')],

4
src/Collection/Notifies.php → src/Collection/Notifications.php
View file

@ -24,10 +24,10 @@ namespace Friendica\Collection;
use Friendica\BaseCollection; use Friendica\BaseCollection;
use Friendica\Model; use Friendica\Model;
class Notifies extends BaseCollection class Notifications extends BaseCollection
{ {
/** /**
* @return Model\Notify * @return Model\Notification
*/ */
public function current() public function current()
{ {

4
src/DI.php
View file

@ -411,11 +411,11 @@ abstract class DI
} }
/** /**
* @return Repository\Notify * @return Repository\Notification
*/ */
public static function notify() public static function notify()
{ {
return self::$dice->create(Repository\Notify::class); return self::$dice->create(Repository\Notification::class);
} }
// //

4
src/Factory/Notification/Notification.php
View file

@ -56,7 +56,7 @@ class Notification extends BaseFactory
{ {
/** @var Database */ /** @var Database */
private $dba; private $dba;
/** @var Repository\Notify */ /** @var Repository\Notification */
private $notification; private $notification;
/** @var BaseURL */ /** @var BaseURL */
private $baseUrl; private $baseUrl;
@ -65,7 +65,7 @@ class Notification extends BaseFactory
/** @var string */ /** @var string */
private $nurl; private $nurl;
public function __construct(LoggerInterface $logger, Database $dba, Repository\Notify $notification, BaseURL $baseUrl, L10n $l10n, App $app, IPConfig $pConfig, ISession $session) public function __construct(LoggerInterface $logger, Database $dba, Repository\Notification $notification, BaseURL $baseUrl, L10n $l10n, App $app, IPConfig $pConfig, ISession $session)
{ {
parent::__construct($logger); parent::__construct($logger);

7
src/Model/Contact.php
View file

@ -34,7 +34,6 @@ use Friendica\Core\Worker;
use Friendica\Database\Database; use Friendica\Database\Database;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Notify\Type;
use Friendica\Network\HTTPException; use Friendica\Network\HTTPException;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
@ -2499,12 +2498,12 @@ class Contact
Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']); Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']);
if (($user['notify-flags'] & Type::INTRO) && if (($user['notify-flags'] & Notification\Type::INTRO) &&
in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL])) { in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL])) {
notification([ notification([
'type' => Type::INTRO, 'type' => Notification\Type::INTRO,
'otype' => Notify\ObjectType::INTRO, 'otype' => Notification\ObjectType::INTRO,
'verb' => ($sharing ? Activity::FRIEND : Activity::FOLLOW), 'verb' => ($sharing ? Activity::FRIEND : Activity::FOLLOW),
'uid' => $user['uid'], 'uid' => $user['uid'],
'cid' => $contact_record['id'], 'cid' => $contact_record['id'],

5
src/Model/FContact.php
View file

@ -25,7 +25,6 @@ use Friendica\Core\Logger;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Notify\Type;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
@ -181,8 +180,8 @@ class FContact
DBA::insert('intro', $fields); DBA::insert('intro', $fields);
notification([ notification([
'type' => Type::SUGGEST, 'type' => Notification\Type::SUGGEST,
'otype' => Notify\ObjectType::INTRO, 'otype' => Notification\ObjectType::INTRO,
'verb' => Activity::REQ_FRIEND, 'verb' => Activity::REQ_FRIEND,
'uid' => $owner['uid'], 'uid' => $owner['uid'],
'cid' => $from_contact['uid'], 'cid' => $from_contact['uid'],

7
src/Model/Mail.php
View file

@ -24,9 +24,8 @@ namespace Friendica\Model;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\DI;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Notify\Type; use Friendica\DI;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Worker\Delivery; use Friendica\Worker\Delivery;
@ -84,8 +83,8 @@ class Mail
// send notifications. // send notifications.
$notif_params = [ $notif_params = [
'type' => Type::MAIL, 'type' => Notification\Type::MAIL,
'otype' => Notify\ObjectType::MAIL, 'otype' => Notification\ObjectType::MAIL,
'verb' => Activity::POST, 'verb' => Activity::POST,
'uid' => $user['uid'], 'uid' => $user['uid'],
'cid' => $msg['contact-id'], 'cid' => $msg['contact-id'],

7
src/Model/Notify.php → src/Model/Notification.php
View file

@ -48,13 +48,12 @@ use Psr\Log\LoggerInterface;
* @property-read string name_cache Full name of the contact subject * @property-read string name_cache Full name of the contact subject
* @property-read string msg_cache Plaintext version of the notification text with a placeholder (`{0}`) for the subject contact's name. * @property-read string msg_cache Plaintext version of the notification text with a placeholder (`{0}`) for the subject contact's name.
*/ */
class Notify extends BaseModel class Notification extends BaseModel
{ {
/** @var \Friendica\Repository\Notification */
/** @var \Friendica\Repository\Notify */
private $repo; private $repo;
public function __construct(Database $dba, LoggerInterface $logger, \Friendica\Repository\Notify $repo, array $data = []) public function __construct(Database $dba, LoggerInterface $logger, \Friendica\Repository\Notification $repo, array $data = [])
{ {
parent::__construct($dba, $logger, $data); parent::__construct($dba, $logger, $data);

2
src/Model/Notify/ObjectType.php → src/Model/Notification/ObjectType.php
View file

@ -19,7 +19,7 @@
* *
*/ */
namespace Friendica\Model\Notify; namespace Friendica\Model\Notification;
/** /**
* Enum for different otypes of the Notify * Enum for different otypes of the Notify

2
src/Model/Notify/Type.php → src/Model/Notification/Type.php
View file

@ -19,7 +19,7 @@
* *
*/ */
namespace Friendica\Model\Notify; namespace Friendica\Model\Notification;
/** /**
* Enum for different types of the Notify * Enum for different types of the Notify

4
src/Module/Delegation.php
View file

@ -28,7 +28,7 @@ use Friendica\Core\Session;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Notify\Type; use Friendica\Model\Notification;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Network\HTTPException\ForbiddenException; use Friendica\Network\HTTPException\ForbiddenException;
@ -131,7 +131,7 @@ class Delegation extends BaseModule
$identities[$key]['selected'] = ($identity['nickname'] === DI::app()->user['nickname']); $identities[$key]['selected'] = ($identity['nickname'] === DI::app()->user['nickname']);
$condition = ["`uid` = ? AND `msg` != '' AND NOT (`type` IN (?, ?)) AND NOT `seen`", $identity['uid'], Type::INTRO, Type::MAIL]; $condition = ["`uid` = ? AND `msg` != '' AND NOT (`type` IN (?, ?)) AND NOT `seen`", $identity['uid'], Notification\Type::INTRO, Notification\Type::MAIL];
$params = ['distinct' => true, 'expression' => 'parent']; $params = ['distinct' => true, 'expression' => 'parent'];
$notifications = DBA::count('notify', $condition, $params); $notifications = DBA::count('notify', $condition, $params);

2
src/Module/Register.php
View file

@ -365,7 +365,7 @@ class Register extends BaseModule
// send notification to admins // send notification to admins
while ($admin = DBA::fetch($admins_stmt)) { while ($admin = DBA::fetch($admins_stmt)) {
\notification([ \notification([
'type' => Model\Notify\Type::SYSTEM, 'type' => Model\Notification\Type::SYSTEM,
'event' => 'SYSTEM_REGISTER_REQUEST', 'event' => 'SYSTEM_REGISTER_REQUEST',
'uid' => $admin['uid'], 'uid' => $admin['uid'],
'link' => $base_url . '/admin/users/', 'link' => $base_url . '/admin/users/',

4
src/Object/Api/Friendica/Notification.php
View file

@ -24,7 +24,7 @@ namespace Friendica\Object\Api\Friendica;
use Friendica\BaseEntity; use Friendica\BaseEntity;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML; use Friendica\Content\Text\HTML;
use Friendica\Model\Notify; use Friendica\Model\Notification as NotificationModel;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Temporal; use Friendica\Util\Temporal;
@ -78,7 +78,7 @@ class Notification extends BaseEntity
/** @var string Message (Plaintext) */ /** @var string Message (Plaintext) */
protected $msg_plain; protected $msg_plain;
public function __construct(Notify $notify) public function __construct(NotificationModel $notify)
{ {
// map each notify attribute to the entity // map each notify attribute to the entity
foreach ($notify->toArray() as $key => $value) { foreach ($notify->toArray() as $key => $value) {

7
src/Protocol/DFRN.php
View file

@ -37,8 +37,7 @@ use Friendica\Model\FContact;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Model\ItemURI; use Friendica\Model\ItemURI;
use Friendica\Model\Mail; use Friendica\Model\Mail;
use Friendica\Model\Notify; use Friendica\Model\Notification;
use Friendica\Model\Notify\Type;
use Friendica\Model\PermissionSet; use Friendica\Model\PermissionSet;
use Friendica\Model\Post; use Friendica\Model\Post;
use Friendica\Model\Post\Category; use Friendica\Model\Post\Category;
@ -1963,8 +1962,8 @@ class DFRN
// send a notification // send a notification
notification( notification(
[ [
"type" => Type::POKE, "type" => Notification\Type::POKE,
"otype" => Notify\ObjectType::PERSON, "otype" => Notification\ObjectType::PERSON,
"activity" => $verb, "activity" => $verb,
"verb" => $item["verb"], "verb" => $item["verb"],
"uid" => $importer["importer_uid"], "uid" => $importer["importer_uid"],

20
src/Repository/Notify.php → src/Repository/Notification.php
View file

@ -30,28 +30,28 @@ use Friendica\Network\HTTPException\InternalServerErrorException;
use Friendica\Network\HTTPException\NotFoundException; use Friendica\Network\HTTPException\NotFoundException;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
class Notify extends BaseRepository class Notification extends BaseRepository
{ {
protected static $table_name = 'notify'; protected static $table_name = 'notify';
protected static $model_class = Model\Notify::class; protected static $model_class = Model\Notification::class;
protected static $collection_class = Collection\Notifies::class; protected static $collection_class = Collection\Notifications::class;
/** /**
* {@inheritDoc} * {@inheritDoc}
* *
* @return Model\Notify * @return Model\Notification
*/ */
protected function create(array $data) protected function create(array $data)
{ {
return new Model\Notify($this->dba, $this->logger, $this, $data); return new Model\Notification($this->dba, $this->logger, $this, $data);
} }
/** /**
* {@inheritDoc} * {@inheritDoc}
* *
* @return Collection\Notifies * @return Collection\Notifications
*/ */
public function select(array $condition = [], array $params = []) public function select(array $condition = [], array $params = [])
{ {
@ -66,7 +66,7 @@ class Notify extends BaseRepository
* @param int $id The ID of the notify instance * @param int $id The ID of the notify instance
* @param int $uid The user ID, bound to this notify instance (= security check) * @param int $uid The user ID, bound to this notify instance (= security check)
* *
* @return Model\Notify * @return Model\Notification
* @throws NotFoundException * @throws NotFoundException
*/ */
public function getByID(int $id, int $uid) public function getByID(int $id, int $uid)
@ -78,13 +78,13 @@ class Notify extends BaseRepository
* Set seen state of notifications of the local_user() * Set seen state of notifications of the local_user()
* *
* @param bool $seen optional true or false. default true * @param bool $seen optional true or false. default true
* @param Model\Notify $notify optional a notify, which should be set seen (including his parents) * @param Model\Notification $notify optional a notify, which should be set seen (including his parents)
* *
* @return bool true on success, false on error * @return bool true on success, false on error
* *
* @throws Exception * @throws Exception
*/ */
public function setSeen(bool $seen = true, Model\Notify $notify = null) public function setSeen(bool $seen = true, Model\Notification $notify = null)
{ {
if (empty($notify)) { if (empty($notify)) {
$conditions = ['uid' => local_user()]; $conditions = ['uid' => local_user()];
@ -102,7 +102,7 @@ class Notify extends BaseRepository
/** /**
* @param array $fields * @param array $fields
* *
* @return Model\Notify|false * @return Model\Notification|false
* *
* @throws InternalServerErrorException * @throws InternalServerErrorException
* @throws Exception * @throws Exception

4
tests/datasets/api.fixture.php
View file

@ -19,7 +19,7 @@
* *
*/ */
use Friendica\Model\Notify; use Friendica\Model\Notification;
return [ return [
// Empty these tables // Empty these tables
@ -375,7 +375,7 @@ return [
'iid' => 4, 'iid' => 4,
'seen' => 0, 'seen' => 0,
'verb' => '', 'verb' => '',
'otype' => Notify\ObjectType::ITEM, 'otype' => Notification\ObjectType::ITEM,
'name_cache' => 'Reply to', 'name_cache' => 'Reply to',
'msg_cache' => 'A test reply from an item', 'msg_cache' => 'A test reply from an item',
], ],

7
update.php
View file

@ -40,7 +40,6 @@
* If you need to run a script before the database update, name the function "pre_update_4712()" * If you need to run a script before the database update, name the function "pre_update_4712()"
*/ */
use Friendica\Core\Addon;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Update; use Friendica\Core\Update;
use Friendica\Core\Worker; use Friendica\Core\Worker;
@ -50,7 +49,7 @@ use Friendica\Database\DBStructure;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Model\Notify; use Friendica\Model\Notification;
use Friendica\Model\Photo; use Friendica\Model\Photo;
use Friendica\Model\Post; use Friendica\Model\Post;
use Friendica\Model\Storage; use Friendica\Model\Storage;
@ -655,12 +654,12 @@ function pre_update_1377()
function update_1380() function update_1380()
{ {
if (!DBA::e("UPDATE `notify` INNER JOIN `item` ON `item`.`id` = `notify`.`iid` SET `notify`.`uri-id` = `item`.`uri-id` WHERE `notify`.`uri-id` IS NULL AND `notify`.`otype` IN (?, ?)", if (!DBA::e("UPDATE `notify` INNER JOIN `item` ON `item`.`id` = `notify`.`iid` SET `notify`.`uri-id` = `item`.`uri-id` WHERE `notify`.`uri-id` IS NULL AND `notify`.`otype` IN (?, ?)",
Notify\ObjectType::ITEM, Notify\ObjectType::PERSON)) { Notification\ObjectType::ITEM, Notification\ObjectType::PERSON)) {
return Update::FAILED; return Update::FAILED;
} }
if (!DBA::e("UPDATE `notify` INNER JOIN `item` ON `item`.`id` = `notify`.`parent` SET `notify`.`parent-uri-id` = `item`.`uri-id` WHERE `notify`.`parent-uri-id` IS NULL AND `notify`.`otype` IN (?, ?)", if (!DBA::e("UPDATE `notify` INNER JOIN `item` ON `item`.`id` = `notify`.`parent` SET `notify`.`parent-uri-id` = `item`.`uri-id` WHERE `notify`.`parent-uri-id` IS NULL AND `notify`.`otype` IN (?, ?)",
Notify\ObjectType::ITEM, Notify\ObjectType::PERSON)) { Notification\ObjectType::ITEM, Notification\ObjectType::PERSON)) {
return Update::FAILED; return Update::FAILED;
} }