Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move Friendica\Core\NotificationsManager to Friendica\Model\Notify

Browse source
This commit is contained in:
Philipp Holzer 2019-10-26 02:01:46 +02:00
parent b632114b12
commit 1f368d469f
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
4 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/api.php
View file

@ -15,7 +15,6 @@ use Friendica\Core\Config;
use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\NotificationsManager;
use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
use Friendica\Core\Session;
@ -26,6 +25,7 @@ use Friendica\Model\Contact;
use Friendica\Model\Group;
use Friendica\Model\Item;
use Friendica\Model\Mail;
use Friendica\Model\Notify;
use Friendica\Model\Photo;
use Friendica\Model\Profile;
use Friendica\Model\User;
@ -6040,7 +6040,7 @@ function api_friendica_notification($type)
if ($a->argc!==3) {
throw new BadRequestException("Invalid argument count");
}
$nm = new NotificationsManager();
$nm = new Notify();
$notes = $nm->getAll([], ['seen' => 'ASC', 'date' => 'DESC'], 50);
@ -6084,7 +6084,7 @@ function api_friendica_notification_seen($type)
$id = (!empty($_REQUEST['id']) ? intval($_REQUEST['id']) : 0);
$nm = new NotificationsManager();
$nm = new Notify();
$note = $nm->getByID($id);
if (is_null($note)) {
throw new BadRequestException("Invalid argument");

5
mod/notifications.php
View file

@ -9,14 +9,13 @@ use Friendica\Content\ContactSelector;
use Friendica\Content\Nav;
use Friendica\Content\Pager;
use Friendica\Core\L10n;
use Friendica\Core\NotificationsManager;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Module\Login;
use Friendica\Model\Contact;
use Friendica\Model\Notify;
function notifications_post(App $a)
{
@ -85,7 +84,7 @@ function notifications_content(App $a)
$json = (($a->argc > 1 && $a->argv[$a->argc - 1] === 'json') ? true : false);
$nm = new NotificationsManager();
$nm = new Notify();
$o = '';
// Get the nav tabs for the notification pages

6
src/Core/NotificationsManager.php → src/Model/Notify.php
View file

@ -4,14 +4,12 @@
* @brief Methods for read and write notifications from/to database
* or for formatting notifications
*/
namespace Friendica\Core;
namespace Friendica\Model;
use Friendica\BaseObject;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Model\Item;
use Friendica\Protocol\Activity;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Proxy as ProxyUtils;
@ -22,7 +20,7 @@ use Friendica\Util\XML;
* @brief Methods for read and write notifications from/to database
* or for formatting notifications
*/
class NotificationsManager extends BaseObject
final class Notify extends BaseObject
{
/**
* @brief set some extra note properties

6
src/Module/Notifications/Notify.php
View file

@ -4,8 +4,8 @@ namespace Friendica\Module\Notifications;
use Friendica\BaseModule;
use Friendica\Core\L10n;
use Friendica\Core\NotificationsManager;
use Friendica\Core\System;
use Friendica\Model\Notify as ModelNotify;
use Friendica\Network\HTTPException;
/**
@ -26,7 +26,7 @@ class Notify extends BaseModule
// @TODO: Replace with parameter from router
if ($a->argc > 2 && $a->argv[1] === 'mark' && $a->argv[2] === 'all') {
$notificationsManager = new NotificationsManager();
$notificationsManager = new ModelNotify();
$success = $notificationsManager->setAllSeen();
header('Content-type: application/json; charset=utf-8');
@ -49,7 +49,7 @@ class Notify extends BaseModule
// @TODO: Replace with parameter from router
if ($a->argc > 2 && $a->argv[1] === 'view' && intval($a->argv[2])) {
$notificationsManager = new NotificationsManager();
$notificationsManager = new ModelNotify();
// @TODO: Replace with parameter from router
$note = $notificationsManager->getByID($a->argv[2]);
if (!empty($note)) {