strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Replace "notification" call with new function, removing enotify.php

Browse source
This commit is contained in:
Michael 2021-10-19 19:45:36 +00:00
parent 4422be9cea
commit 2f1f6f6fb2
7 changed files with 7 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
composer.json
View file

@ -85,7 +85,6 @@
"Friendica\\Addon\\": "addon/"
},
"files": [
"include/enotify.php",
"boot.php"
]
},

38
include/enotify.php
View file

@ -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);
}

4
mod/item.php
View file

@ -777,7 +777,7 @@ function item_post(App $a) {
// These notifications are sent if someone else is commenting other your wall
if ($contact_record != $author) {
if ($toplevel_item_id) {
notification([
DI::notify()->createFromArray([
'type' => Notification\Type::COMMENT,
'otype' => Notification\ObjectType::ITEM,
'verb' => Activity::POST,
@ -787,7 +787,7 @@ function item_post(App $a) {
'link' => DI::baseUrl() . '/display/' . urlencode($datarray['guid']),
]);
} elseif (empty($forum_contact)) {
notification([
DI::notify()->createFromArray([
'type' => Notification\Type::WALL,
'otype' => Notification\ObjectType::ITEM,
'verb' => Activity::POST,

2
src/Model/Contact.php
View file

@ -2719,7 +2719,7 @@ class Contact
if (($user['notify-flags'] & Notification\Type::INTRO) &&
in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL])) {
notification([
DI::notify()->createFromArray([
'type' => Notification\Type::INTRO,
'otype' => Notification\ObjectType::INTRO,
'verb' => ($sharing ? Activity::FRIEND : Activity::FOLLOW),

2
src/Model/Mail.php
View file

@ -104,7 +104,7 @@ class Mail
'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']]);
}

2
src/Module/Register.php
View file

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

4
src/Protocol/DFRN.php
View file

@ -1371,7 +1371,7 @@ class DFRN
'note' => $suggest['body'], 'hash' => $hash, 'datetime' => DateTimeFormat::utcNow(), 'blocked' => false];
DBA::insert('intro', $fields);
notification([
DI::notify()->createFromArray([
'type' => Notification\Type::SUGGEST,
'otype' => Notification\ObjectType::INTRO,
'verb' => Activity::REQ_FRIEND,
@ -1576,7 +1576,7 @@ class DFRN
$item['parent'] = $parent['id'];
// send a notification
notification(
DI::notify()->createFromArray(
[
"type" => Notification\Type::POKE,
"otype" => Notification\ObjectType::PERSON,