Replace "notification" call with new function, removing enotify.php
This commit is contained in:
parent
4422be9cea
commit
2f1f6f6fb2
|
@ -85,7 +85,6 @@
|
||||||
"Friendica\\Addon\\": "addon/"
|
"Friendica\\Addon\\": "addon/"
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
"include/enotify.php",
|
|
||||||
"boot.php"
|
"boot.php"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,38 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* @copyright Copyright (C) 2010-2021, the Friendica project
|
|
||||||
*
|
|
||||||
* @license GNU AGPL version 3 or any later version
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as
|
|
||||||
* published by the Free Software Foundation, either version 3 of the
|
|
||||||
* License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
use Friendica\DI;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a notification entry and possibly sends a mail
|
|
||||||
*
|
|
||||||
* @param array $params Array with the elements:
|
|
||||||
* type, event, otype, activity, verb, uid, cid, item, link,
|
|
||||||
* source_name, source_mail, source_nick, source_link, source_photo,
|
|
||||||
* show_in_notification_page
|
|
||||||
*
|
|
||||||
* @return bool
|
|
||||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
|
||||||
*/
|
|
||||||
function notification($params)
|
|
||||||
{
|
|
||||||
return DI::notify()->createFromArray($params);
|
|
||||||
}
|
|
|
@ -777,7 +777,7 @@ function item_post(App $a) {
|
||||||
// These notifications are sent if someone else is commenting other your wall
|
// These notifications are sent if someone else is commenting other your wall
|
||||||
if ($contact_record != $author) {
|
if ($contact_record != $author) {
|
||||||
if ($toplevel_item_id) {
|
if ($toplevel_item_id) {
|
||||||
notification([
|
DI::notify()->createFromArray([
|
||||||
'type' => Notification\Type::COMMENT,
|
'type' => Notification\Type::COMMENT,
|
||||||
'otype' => Notification\ObjectType::ITEM,
|
'otype' => Notification\ObjectType::ITEM,
|
||||||
'verb' => Activity::POST,
|
'verb' => Activity::POST,
|
||||||
|
@ -787,7 +787,7 @@ function item_post(App $a) {
|
||||||
'link' => DI::baseUrl() . '/display/' . urlencode($datarray['guid']),
|
'link' => DI::baseUrl() . '/display/' . urlencode($datarray['guid']),
|
||||||
]);
|
]);
|
||||||
} elseif (empty($forum_contact)) {
|
} elseif (empty($forum_contact)) {
|
||||||
notification([
|
DI::notify()->createFromArray([
|
||||||
'type' => Notification\Type::WALL,
|
'type' => Notification\Type::WALL,
|
||||||
'otype' => Notification\ObjectType::ITEM,
|
'otype' => Notification\ObjectType::ITEM,
|
||||||
'verb' => Activity::POST,
|
'verb' => Activity::POST,
|
||||||
|
|
|
@ -2719,7 +2719,7 @@ class Contact
|
||||||
if (($user['notify-flags'] & Notification\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([
|
DI::notify()->createFromArray([
|
||||||
'type' => Notification\Type::INTRO,
|
'type' => Notification\Type::INTRO,
|
||||||
'otype' => Notification\ObjectType::INTRO,
|
'otype' => Notification\ObjectType::INTRO,
|
||||||
'verb' => ($sharing ? Activity::FRIEND : Activity::FOLLOW),
|
'verb' => ($sharing ? Activity::FRIEND : Activity::FOLLOW),
|
||||||
|
|
|
@ -104,7 +104,7 @@ class Mail
|
||||||
'link' => DI::baseUrl() . '/message/' . $msg['id'],
|
'link' => DI::baseUrl() . '/message/' . $msg['id'],
|
||||||
];
|
];
|
||||||
|
|
||||||
notification($notif_params);
|
DI::notify()->createFromArray($notif_params);
|
||||||
|
|
||||||
Logger::info('Mail is processed, notification was sent.', ['id' => $msg['id'], 'uri' => $msg['uri']]);
|
Logger::info('Mail is processed, notification was sent.', ['id' => $msg['id'], 'uri' => $msg['uri']]);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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([
|
DI::notify()->createFromArray([
|
||||||
'type' => Model\Notification\Type::SYSTEM,
|
'type' => Model\Notification\Type::SYSTEM,
|
||||||
'event' => 'SYSTEM_REGISTER_REQUEST',
|
'event' => 'SYSTEM_REGISTER_REQUEST',
|
||||||
'uid' => $admin['uid'],
|
'uid' => $admin['uid'],
|
||||||
|
|
|
@ -1371,7 +1371,7 @@ class DFRN
|
||||||
'note' => $suggest['body'], 'hash' => $hash, 'datetime' => DateTimeFormat::utcNow(), 'blocked' => false];
|
'note' => $suggest['body'], 'hash' => $hash, 'datetime' => DateTimeFormat::utcNow(), 'blocked' => false];
|
||||||
DBA::insert('intro', $fields);
|
DBA::insert('intro', $fields);
|
||||||
|
|
||||||
notification([
|
DI::notify()->createFromArray([
|
||||||
'type' => Notification\Type::SUGGEST,
|
'type' => Notification\Type::SUGGEST,
|
||||||
'otype' => Notification\ObjectType::INTRO,
|
'otype' => Notification\ObjectType::INTRO,
|
||||||
'verb' => Activity::REQ_FRIEND,
|
'verb' => Activity::REQ_FRIEND,
|
||||||
|
@ -1576,7 +1576,7 @@ class DFRN
|
||||||
$item['parent'] = $parent['id'];
|
$item['parent'] = $parent['id'];
|
||||||
|
|
||||||
// send a notification
|
// send a notification
|
||||||
notification(
|
DI::notify()->createFromArray(
|
||||||
[
|
[
|
||||||
"type" => Notification\Type::POKE,
|
"type" => Notification\Type::POKE,
|
||||||
"otype" => Notification\ObjectType::PERSON,
|
"otype" => Notification\ObjectType::PERSON,
|
||||||
|
|
Loading…
Reference in a new issue