mirror of
https://github.com/friendica/friendica
synced 2024-11-09 17:02:54 +00:00
Deprecated the notify table/classes
This commit is contained in:
parent
b98243826f
commit
7ce97459d4
13 changed files with 492 additions and 36 deletions
|
@ -882,7 +882,7 @@ CREATE TABLE IF NOT EXISTS `notify` (
|
||||||
FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE,
|
FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE,
|
||||||
FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
|
FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
|
||||||
FOREIGN KEY (`parent-uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
|
FOREIGN KEY (`parent-uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
|
||||||
) DEFAULT COLLATE utf8mb4_general_ci COMMENT='notifications';
|
) DEFAULT COLLATE utf8mb4_general_ci COMMENT='[Deprecated] User notifications';
|
||||||
|
|
||||||
--
|
--
|
||||||
-- TABLE notify-threads
|
-- TABLE notify-threads
|
||||||
|
|
|
@ -37,7 +37,7 @@ Database Tables
|
||||||
| [mailacct](help/database/db_mailacct) | Mail account data for fetching mails |
|
| [mailacct](help/database/db_mailacct) | Mail account data for fetching mails |
|
||||||
| [manage](help/database/db_manage) | table of accounts that can manage each other |
|
| [manage](help/database/db_manage) | table of accounts that can manage each other |
|
||||||
| [notification](help/database/db_notification) | notifications |
|
| [notification](help/database/db_notification) | notifications |
|
||||||
| [notify](help/database/db_notify) | notifications |
|
| [notify](help/database/db_notify) | [Deprecated] User notifications |
|
||||||
| [notify-threads](help/database/db_notify-threads) | |
|
| [notify-threads](help/database/db_notify-threads) | |
|
||||||
| [oembed](help/database/db_oembed) | cache for OEmbed queries |
|
| [oembed](help/database/db_oembed) | cache for OEmbed queries |
|
||||||
| [openwebauth-token](help/database/db_openwebauth-token) | Store OpenWebAuth token to verify contacts |
|
| [openwebauth-token](help/database/db_openwebauth-token) | Store OpenWebAuth token to verify contacts |
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
Table notify
|
Table notify
|
||||||
===========
|
===========
|
||||||
|
|
||||||
notifications
|
[Deprecated] User notifications
|
||||||
|
|
||||||
Fields
|
Fields
|
||||||
------
|
------
|
||||||
|
|
|
@ -527,9 +527,9 @@ abstract class DI
|
||||||
return self::$dice->create(Navigation\Notifications\Factory\Notify::class);
|
return self::$dice->create(Navigation\Notifications\Factory\Notify::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function formattedNotificationFactory(): Navigation\Notifications\Factory\FormattedNotification
|
public static function formattedNotificationFactory(): Navigation\Notifications\Factory\FormattedNotify
|
||||||
{
|
{
|
||||||
return self::$dice->create(Navigation\Notifications\Factory\FormattedNotification::class);
|
return self::$dice->create(Navigation\Notifications\Factory\FormattedNotify::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
@ -29,7 +29,7 @@ use Friendica\Content\Pager;
|
||||||
use Friendica\Core\L10n;
|
use Friendica\Core\L10n;
|
||||||
use Friendica\Core\Renderer;
|
use Friendica\Core\Renderer;
|
||||||
use Friendica\Core\System;
|
use Friendica\Core\System;
|
||||||
use Friendica\Navigation\Notifications\ValueObject\FormattedNotification;
|
use Friendica\Navigation\Notifications\ValueObject\FormattedNotify;
|
||||||
use Friendica\Network\HTTPException\ForbiddenException;
|
use Friendica\Network\HTTPException\ForbiddenException;
|
||||||
use Friendica\Util\Profiler;
|
use Friendica\Util\Profiler;
|
||||||
use Psr\Log\LoggerInterface;
|
use Psr\Log\LoggerInterface;
|
||||||
|
@ -43,29 +43,29 @@ abstract class BaseNotifications extends BaseModule
|
||||||
{
|
{
|
||||||
/** @var array Array of URL parameters */
|
/** @var array Array of URL parameters */
|
||||||
const URL_TYPES = [
|
const URL_TYPES = [
|
||||||
FormattedNotification::NETWORK => 'network',
|
FormattedNotify::NETWORK => 'network',
|
||||||
FormattedNotification::SYSTEM => 'system',
|
FormattedNotify::SYSTEM => 'system',
|
||||||
FormattedNotification::HOME => 'home',
|
FormattedNotify::HOME => 'home',
|
||||||
FormattedNotification::PERSONAL => 'personal',
|
FormattedNotify::PERSONAL => 'personal',
|
||||||
FormattedNotification::INTRO => 'intros',
|
FormattedNotify::INTRO => 'intros',
|
||||||
];
|
];
|
||||||
|
|
||||||
/** @var array Array of the allowed notifications and their printable name */
|
/** @var array Array of the allowed notifications and their printable name */
|
||||||
const PRINT_TYPES = [
|
const PRINT_TYPES = [
|
||||||
FormattedNotification::NETWORK => 'Network',
|
FormattedNotify::NETWORK => 'Network',
|
||||||
FormattedNotification::SYSTEM => 'System',
|
FormattedNotify::SYSTEM => 'System',
|
||||||
FormattedNotification::HOME => 'Home',
|
FormattedNotify::HOME => 'Home',
|
||||||
FormattedNotification::PERSONAL => 'Personal',
|
FormattedNotify::PERSONAL => 'Personal',
|
||||||
FormattedNotification::INTRO => 'Introductions',
|
FormattedNotify::INTRO => 'Introductions',
|
||||||
];
|
];
|
||||||
|
|
||||||
/** @var array The array of access keys for notification pages */
|
/** @var array The array of access keys for notification pages */
|
||||||
const ACCESS_KEYS = [
|
const ACCESS_KEYS = [
|
||||||
FormattedNotification::NETWORK => 'w',
|
FormattedNotify::NETWORK => 'w',
|
||||||
FormattedNotification::SYSTEM => 'y',
|
FormattedNotify::SYSTEM => 'y',
|
||||||
FormattedNotification::HOME => 'h',
|
FormattedNotify::HOME => 'h',
|
||||||
FormattedNotification::PERSONAL => 'r',
|
FormattedNotify::PERSONAL => 'r',
|
||||||
FormattedNotification::INTRO => 'i',
|
FormattedNotify::INTRO => 'i',
|
||||||
];
|
];
|
||||||
|
|
||||||
/** @var int The default count of items per page */
|
/** @var int The default count of items per page */
|
||||||
|
|
|
@ -28,7 +28,7 @@ use Friendica\Core\L10n;
|
||||||
use Friendica\Core\Renderer;
|
use Friendica\Core\Renderer;
|
||||||
use Friendica\Module\BaseNotifications;
|
use Friendica\Module\BaseNotifications;
|
||||||
use Friendica\Module\Response;
|
use Friendica\Module\Response;
|
||||||
use Friendica\Navigation\Notifications\ValueObject\FormattedNotification;
|
use Friendica\Navigation\Notifications\ValueObject\FormattedNotify;
|
||||||
use Friendica\Util\Profiler;
|
use Friendica\Util\Profiler;
|
||||||
use Psr\Log\LoggerInterface;
|
use Psr\Log\LoggerInterface;
|
||||||
|
|
||||||
|
@ -41,14 +41,14 @@ use Psr\Log\LoggerInterface;
|
||||||
*/
|
*/
|
||||||
class Notifications extends BaseNotifications
|
class Notifications extends BaseNotifications
|
||||||
{
|
{
|
||||||
/** @var \Friendica\Navigation\Notifications\Factory\FormattedNotification */
|
/** @var \Friendica\Navigation\Notifications\Factory\FormattedNotify */
|
||||||
protected $formattedNotificationFactory;
|
protected $formattedNotifyFactory;
|
||||||
|
|
||||||
public function __construct(L10n $l10n, App\BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, \Friendica\Navigation\Notifications\Factory\FormattedNotification $formattedNotificationFactory, array $server, array $parameters = [])
|
public function __construct(L10n $l10n, App\BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, \Friendica\Navigation\Notifications\Factory\FormattedNotify $formattedNotifyFactory, array $server, array $parameters = [])
|
||||||
{
|
{
|
||||||
parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
|
parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
|
||||||
|
|
||||||
$this->formattedNotificationFactory = $formattedNotificationFactory;
|
$this->formattedNotifyFactory = $formattedNotifyFactory;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -59,30 +59,30 @@ class Notifications extends BaseNotifications
|
||||||
$notificationHeader = '';
|
$notificationHeader = '';
|
||||||
$notifications = [];
|
$notifications = [];
|
||||||
|
|
||||||
$factory = $this->formattedNotificationFactory;
|
$factory = $this->formattedNotifyFactory;
|
||||||
|
|
||||||
if (($this->args->get(1) == 'network')) {
|
if (($this->args->get(1) == 'network')) {
|
||||||
$notificationHeader = $this->t('Network Notifications');
|
$notificationHeader = $this->t('Network Notifications');
|
||||||
$notifications = [
|
$notifications = [
|
||||||
'ident' => FormattedNotification::NETWORK,
|
'ident' => FormattedNotify::NETWORK,
|
||||||
'notifications' => $factory->getNetworkList($this->showAll, $this->firstItemNum, self::ITEMS_PER_PAGE),
|
'notifications' => $factory->getNetworkList($this->showAll, $this->firstItemNum, self::ITEMS_PER_PAGE),
|
||||||
];
|
];
|
||||||
} elseif (($this->args->get(1) == 'system')) {
|
} elseif (($this->args->get(1) == 'system')) {
|
||||||
$notificationHeader = $this->t('System Notifications');
|
$notificationHeader = $this->t('System Notifications');
|
||||||
$notifications = [
|
$notifications = [
|
||||||
'ident' => FormattedNotification::SYSTEM,
|
'ident' => FormattedNotify::SYSTEM,
|
||||||
'notifications' => $factory->getSystemList($this->showAll, $this->firstItemNum, self::ITEMS_PER_PAGE),
|
'notifications' => $factory->getSystemList($this->showAll, $this->firstItemNum, self::ITEMS_PER_PAGE),
|
||||||
];
|
];
|
||||||
} elseif (($this->args->get(1) == 'personal')) {
|
} elseif (($this->args->get(1) == 'personal')) {
|
||||||
$notificationHeader = $this->t('Personal Notifications');
|
$notificationHeader = $this->t('Personal Notifications');
|
||||||
$notifications = [
|
$notifications = [
|
||||||
'ident' => FormattedNotification::PERSONAL,
|
'ident' => FormattedNotify::PERSONAL,
|
||||||
'notifications' => $factory->getPersonalList($this->showAll, $this->firstItemNum, self::ITEMS_PER_PAGE),
|
'notifications' => $factory->getPersonalList($this->showAll, $this->firstItemNum, self::ITEMS_PER_PAGE),
|
||||||
];
|
];
|
||||||
} elseif (($this->args->get(1) == 'home')) {
|
} elseif (($this->args->get(1) == 'home')) {
|
||||||
$notificationHeader = $this->t('Home Notifications');
|
$notificationHeader = $this->t('Home Notifications');
|
||||||
$notifications = [
|
$notifications = [
|
||||||
'ident' => FormattedNotification::HOME,
|
'ident' => FormattedNotify::HOME,
|
||||||
'notifications' => $factory->getHomeList($this->showAll, $this->firstItemNum, self::ITEMS_PER_PAGE),
|
'notifications' => $factory->getHomeList($this->showAll, $this->firstItemNum, self::ITEMS_PER_PAGE),
|
||||||
];
|
];
|
||||||
} else {
|
} else {
|
||||||
|
@ -120,7 +120,7 @@ class Notifications extends BaseNotifications
|
||||||
];
|
];
|
||||||
// Loop trough ever notification This creates an array with the output html for each
|
// Loop trough ever notification This creates an array with the output html for each
|
||||||
// notification and apply the correct template according to the notificationtype (label).
|
// notification and apply the correct template according to the notificationtype (label).
|
||||||
/** @var FormattedNotification $Notification */
|
/** @var FormattedNotify $Notification */
|
||||||
foreach ($notifications['notifications'] as $Notification) {
|
foreach ($notifications['notifications'] as $Notification) {
|
||||||
$notificationArray = $Notification->toArray();
|
$notificationArray = $Notification->toArray();
|
||||||
|
|
||||||
|
|
|
@ -24,12 +24,15 @@ namespace Friendica\Navigation\Notifications\Collection;
|
||||||
use Friendica\BaseCollection;
|
use Friendica\BaseCollection;
|
||||||
use Friendica\Navigation\Notifications\ValueObject;
|
use Friendica\Navigation\Notifications\ValueObject;
|
||||||
|
|
||||||
class FormattedNotifications extends BaseCollection
|
/**
|
||||||
|
* @deprecated since 2022.05 Use \Friendica\Navigation\Notifications\Collection\FormattedNotifications instead
|
||||||
|
*/
|
||||||
|
class FormattedNotifies extends BaseCollection
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @return ValueObject\FormattedNotification
|
* @return ValueObject\FormattedNotify
|
||||||
*/
|
*/
|
||||||
public function current(): ValueObject\FormattedNotification
|
public function current(): ValueObject\FormattedNotify
|
||||||
{
|
{
|
||||||
return parent::current();
|
return parent::current();
|
||||||
}
|
}
|
|
@ -46,6 +46,8 @@ use Psr\Http\Message\UriInterface;
|
||||||
* @property-read $uriId
|
* @property-read $uriId
|
||||||
* @property-read $parentUriId
|
* @property-read $parentUriId
|
||||||
* @property-read $id
|
* @property-read $id
|
||||||
|
*
|
||||||
|
* @deprecated since 2022.05 Use \Friendica\Navigation\Notifications\Entity\Notification instead
|
||||||
*/
|
*/
|
||||||
class Notify extends BaseEntity
|
class Notify extends BaseEntity
|
||||||
{
|
{
|
||||||
|
|
378
src/Navigation/Notifications/Factory/FormattedNotify.php
Normal file
378
src/Navigation/Notifications/Factory/FormattedNotify.php
Normal file
|
@ -0,0 +1,378 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (C) 2010-2022, 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/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Friendica\Navigation\Notifications\Factory;
|
||||||
|
|
||||||
|
use Exception;
|
||||||
|
use Friendica\App\BaseURL;
|
||||||
|
use Friendica\BaseFactory;
|
||||||
|
use Friendica\Content\Text\BBCode;
|
||||||
|
use Friendica\Core\L10n;
|
||||||
|
use Friendica\Core\Protocol;
|
||||||
|
use Friendica\Database\Database;
|
||||||
|
use Friendica\Model\Contact;
|
||||||
|
use Friendica\Model\Post;
|
||||||
|
use Friendica\Module\BaseNotifications;
|
||||||
|
use Friendica\Navigation\Notifications\Collection\FormattedNotifies;
|
||||||
|
use Friendica\Navigation\Notifications\Repository;
|
||||||
|
use Friendica\Navigation\Notifications\ValueObject;
|
||||||
|
use Friendica\Network\HTTPException\InternalServerErrorException;
|
||||||
|
use Friendica\Protocol\Activity;
|
||||||
|
use Friendica\Util\DateTimeFormat;
|
||||||
|
use Friendica\Util\Proxy;
|
||||||
|
use Friendica\Util\Temporal;
|
||||||
|
use Friendica\Util\XML;
|
||||||
|
use Psr\Log\LoggerInterface;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Factory for creating notification objects based on items
|
||||||
|
* Currently, there are the following types of item based notifications:
|
||||||
|
* - network
|
||||||
|
* - system
|
||||||
|
* - home
|
||||||
|
* - personal
|
||||||
|
*
|
||||||
|
* @deprecated since 2022.05 Use \Friendica\Navigation\Notifications\Factory\FormattedNotification instead
|
||||||
|
*/
|
||||||
|
class FormattedNotify extends BaseFactory
|
||||||
|
{
|
||||||
|
/** @var Database */
|
||||||
|
private $dba;
|
||||||
|
/** @var Repository\Notify */
|
||||||
|
private $notify;
|
||||||
|
/** @var BaseURL */
|
||||||
|
private $baseUrl;
|
||||||
|
/** @var L10n */
|
||||||
|
private $l10n;
|
||||||
|
|
||||||
|
public function __construct(LoggerInterface $logger, Database $dba, Repository\Notify $notification, BaseURL $baseUrl, L10n $l10n)
|
||||||
|
{
|
||||||
|
parent::__construct($logger);
|
||||||
|
|
||||||
|
$this->dba = $dba;
|
||||||
|
$this->notify = $notification;
|
||||||
|
$this->baseUrl = $baseUrl;
|
||||||
|
$this->l10n = $l10n;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array $formattedItem The return of $this->formatItem
|
||||||
|
*
|
||||||
|
* @return ValueObject\FormattedNotify
|
||||||
|
*/
|
||||||
|
private function createFromFormattedItem(array $formattedItem): ValueObject\FormattedNotify
|
||||||
|
{
|
||||||
|
// Transform the different types of notification in a usable array
|
||||||
|
switch ($formattedItem['verb'] ?? '') {
|
||||||
|
case Activity::LIKE:
|
||||||
|
return new ValueObject\FormattedNotify(
|
||||||
|
'like',
|
||||||
|
$this->baseUrl->get(true) . '/display/' . $formattedItem['parent-guid'],
|
||||||
|
$formattedItem['author-avatar'],
|
||||||
|
$formattedItem['author-link'],
|
||||||
|
$this->l10n->t("%s liked %s's post", $formattedItem['author-name'], $formattedItem['parent-author-name']),
|
||||||
|
$formattedItem['when'],
|
||||||
|
$formattedItem['ago'],
|
||||||
|
$formattedItem['seen']
|
||||||
|
);
|
||||||
|
|
||||||
|
case Activity::DISLIKE:
|
||||||
|
return new ValueObject\FormattedNotify(
|
||||||
|
'dislike',
|
||||||
|
$this->baseUrl->get(true) . '/display/' . $formattedItem['parent-guid'],
|
||||||
|
$formattedItem['author-avatar'],
|
||||||
|
$formattedItem['author-link'],
|
||||||
|
$this->l10n->t("%s disliked %s's post", $formattedItem['author-name'], $formattedItem['parent-author-name']),
|
||||||
|
$formattedItem['when'],
|
||||||
|
$formattedItem['ago'],
|
||||||
|
$formattedItem['seen']
|
||||||
|
);
|
||||||
|
|
||||||
|
case Activity::ATTEND:
|
||||||
|
return new ValueObject\FormattedNotify(
|
||||||
|
'attend',
|
||||||
|
$this->baseUrl->get(true) . '/display/' . $formattedItem['parent-guid'],
|
||||||
|
$formattedItem['author-avatar'],
|
||||||
|
$formattedItem['author-link'],
|
||||||
|
$this->l10n->t("%s is attending %s's event", $formattedItem['author-name'], $formattedItem['parent-author-name']),
|
||||||
|
$formattedItem['when'],
|
||||||
|
$formattedItem['ago'],
|
||||||
|
$formattedItem['seen']
|
||||||
|
);
|
||||||
|
|
||||||
|
case Activity::ATTENDNO:
|
||||||
|
return new ValueObject\FormattedNotify(
|
||||||
|
'attendno',
|
||||||
|
$this->baseUrl->get(true) . '/display/' . $formattedItem['parent-guid'],
|
||||||
|
$formattedItem['author-avatar'],
|
||||||
|
$formattedItem['author-link'],
|
||||||
|
$this->l10n->t("%s is not attending %s's event", $formattedItem['author-name'], $formattedItem['parent-author-name']),
|
||||||
|
$formattedItem['when'],
|
||||||
|
$formattedItem['ago'],
|
||||||
|
$formattedItem['seen']
|
||||||
|
);
|
||||||
|
|
||||||
|
case Activity::ATTENDMAYBE:
|
||||||
|
return new ValueObject\FormattedNotify(
|
||||||
|
'attendmaybe',
|
||||||
|
$this->baseUrl->get(true) . '/display/' . $formattedItem['parent-guid'],
|
||||||
|
$formattedItem['author-avatar'],
|
||||||
|
$formattedItem['author-link'],
|
||||||
|
$this->l10n->t("%s may attending %s's event", $formattedItem['author-name'], $formattedItem['parent-author-name']),
|
||||||
|
$formattedItem['when'],
|
||||||
|
$formattedItem['ago'],
|
||||||
|
$formattedItem['seen']
|
||||||
|
);
|
||||||
|
|
||||||
|
case Activity::FRIEND:
|
||||||
|
if (!isset($formattedItem['object'])) {
|
||||||
|
return new ValueObject\FormattedNotify(
|
||||||
|
'friend',
|
||||||
|
$formattedItem['link'],
|
||||||
|
$formattedItem['image'],
|
||||||
|
$formattedItem['url'],
|
||||||
|
$formattedItem['text'],
|
||||||
|
$formattedItem['when'],
|
||||||
|
$formattedItem['ago'],
|
||||||
|
$formattedItem['seen']
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
$xmlHead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
|
||||||
|
$obj = XML::parseString($xmlHead . $formattedItem['object']);
|
||||||
|
|
||||||
|
$formattedItem['fname'] = $obj->title;
|
||||||
|
|
||||||
|
return new ValueObject\FormattedNotify(
|
||||||
|
'friend',
|
||||||
|
$this->baseUrl->get(true) . '/display/' . $formattedItem['parent-guid'],
|
||||||
|
$formattedItem['author-avatar'],
|
||||||
|
$formattedItem['author-link'],
|
||||||
|
$this->l10n->t("%s is now friends with %s", $formattedItem['author-name'], $formattedItem['fname']),
|
||||||
|
$formattedItem['when'],
|
||||||
|
$formattedItem['ago'],
|
||||||
|
$formattedItem['seen']
|
||||||
|
);
|
||||||
|
|
||||||
|
default:
|
||||||
|
return new ValueObject\FormattedNotify(
|
||||||
|
$formattedItem['label'] ?? '',
|
||||||
|
$formattedItem['link'] ?? '',
|
||||||
|
$formattedItem['image'] ?? '',
|
||||||
|
$formattedItem['url'] ?? '',
|
||||||
|
$formattedItem['text'] ?? '',
|
||||||
|
$formattedItem['when'] ?? '',
|
||||||
|
$formattedItem['ago'] ?? '',
|
||||||
|
$formattedItem['seen'] ?? false
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get system notifications
|
||||||
|
*
|
||||||
|
* @param bool $seen False => only include notifications into the query
|
||||||
|
* which aren't marked as "seen"
|
||||||
|
* @param int $start Start the query at this point
|
||||||
|
* @param int $limit Maximum number of query results
|
||||||
|
*
|
||||||
|
* @return FormattedNotifies
|
||||||
|
*/
|
||||||
|
public function getSystemList(bool $seen = false, int $start = 0, int $limit = BaseNotifications::DEFAULT_PAGE_LIMIT): FormattedNotifies
|
||||||
|
{
|
||||||
|
$conditions = [];
|
||||||
|
if (!$seen) {
|
||||||
|
$conditions['seen'] = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$params = [];
|
||||||
|
$params['order'] = ['date' => 'DESC'];
|
||||||
|
$params['limit'] = [$start, $limit];
|
||||||
|
|
||||||
|
$formattedNotifications = new FormattedNotifies();
|
||||||
|
try {
|
||||||
|
$Notifies = $this->notify->selectForUser(local_user(), $conditions, $params);
|
||||||
|
|
||||||
|
foreach ($Notifies as $Notify) {
|
||||||
|
$formattedNotifications[] = new ValueObject\FormattedNotify(
|
||||||
|
'notification',
|
||||||
|
$this->baseUrl->get(true) . '/notification/' . $Notify->id,
|
||||||
|
Contact::getAvatarUrlForUrl($Notify->url, $Notify->uid, Proxy::SIZE_MICRO),
|
||||||
|
$Notify->url,
|
||||||
|
strip_tags(BBCode::toPlaintext($Notify->msg)),
|
||||||
|
DateTimeFormat::local($Notify->date->format(DateTimeFormat::MYSQL), 'r'),
|
||||||
|
Temporal::getRelativeDate($Notify->date->format(DateTimeFormat::MYSQL)),
|
||||||
|
$Notify->seen
|
||||||
|
);
|
||||||
|
}
|
||||||
|
} catch (Exception $e) {
|
||||||
|
$this->logger->warning('Select failed.', ['conditions' => $conditions, 'exception' => $e]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $formattedNotifications;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get network notifications
|
||||||
|
*
|
||||||
|
* @param bool $seen False => only include notifications into the query
|
||||||
|
* which aren't marked as "seen"
|
||||||
|
* @param int $start Start the query at this point
|
||||||
|
* @param int $limit Maximum number of query results
|
||||||
|
*
|
||||||
|
* @return FormattedNotifies
|
||||||
|
*/
|
||||||
|
public function getNetworkList(bool $seen = false, int $start = 0, int $limit = BaseNotifications::DEFAULT_PAGE_LIMIT): FormattedNotifies
|
||||||
|
{
|
||||||
|
$condition = ['wall' => false, 'uid' => local_user()];
|
||||||
|
|
||||||
|
if (!$seen) {
|
||||||
|
$condition['unseen'] = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
$fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar',
|
||||||
|
'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid', 'gravity'];
|
||||||
|
$params = ['order' => ['received' => true], 'limit' => [$start, $limit]];
|
||||||
|
|
||||||
|
$formattedNotifications = new FormattedNotifies();
|
||||||
|
|
||||||
|
try {
|
||||||
|
$userPosts = Post::selectForUser(local_user(), $fields, $condition, $params);
|
||||||
|
while ($userPost = $this->dba->fetch($userPosts)) {
|
||||||
|
$formattedNotifications[] = $this->createFromFormattedItem($this->formatItem($userPost));
|
||||||
|
}
|
||||||
|
} catch (Exception $e) {
|
||||||
|
$this->logger->warning('Select failed.', ['condition' => $condition, 'exception' => $e]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $formattedNotifications;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get personal notifications
|
||||||
|
*
|
||||||
|
* @param bool $seen False => only include notifications into the query
|
||||||
|
* which aren't marked as "seen"
|
||||||
|
* @param int $start Start the query at this point
|
||||||
|
* @param int $limit Maximum number of query results
|
||||||
|
*
|
||||||
|
* @return FormattedNotifies
|
||||||
|
*/
|
||||||
|
public function getPersonalList(bool $seen = false, int $start = 0, int $limit = BaseNotifications::DEFAULT_PAGE_LIMIT): FormattedNotifies
|
||||||
|
{
|
||||||
|
$condition = ['wall' => false, 'uid' => local_user(), 'author-id' => public_contact()];
|
||||||
|
|
||||||
|
if (!$seen) {
|
||||||
|
$condition['unseen'] = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
$fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar',
|
||||||
|
'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid', 'gravity'];
|
||||||
|
$params = ['order' => ['received' => true], 'limit' => [$start, $limit]];
|
||||||
|
|
||||||
|
$formattedNotifications = new FormattedNotifies();
|
||||||
|
|
||||||
|
try {
|
||||||
|
$userPosts = Post::selectForUser(local_user(), $fields, $condition, $params);
|
||||||
|
while ($userPost = $this->dba->fetch($userPosts)) {
|
||||||
|
$formattedNotifications[] = $this->createFromFormattedItem($this->formatItem($userPost));
|
||||||
|
}
|
||||||
|
} catch (Exception $e) {
|
||||||
|
$this->logger->warning('Select failed.', ['conditions' => $condition, 'exception' => $e]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $formattedNotifications;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get home notifications
|
||||||
|
*
|
||||||
|
* @param bool $seen False => only include notifications into the query
|
||||||
|
* which aren't marked as "seen"
|
||||||
|
* @param int $start Start the query at this point
|
||||||
|
* @param int $limit Maximum number of query results
|
||||||
|
*
|
||||||
|
* @return FormattedNotifies
|
||||||
|
*/
|
||||||
|
public function getHomeList(bool $seen = false, int $start = 0, int $limit = BaseNotifications::DEFAULT_PAGE_LIMIT): FormattedNotifies
|
||||||
|
{
|
||||||
|
$condition = ['wall' => true, 'uid' => local_user()];
|
||||||
|
|
||||||
|
if (!$seen) {
|
||||||
|
$condition['unseen'] = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
$fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar',
|
||||||
|
'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid', 'gravity'];
|
||||||
|
$params = ['order' => ['received' => true], 'limit' => [$start, $limit]];
|
||||||
|
|
||||||
|
$formattedNotifications = new FormattedNotifies();
|
||||||
|
|
||||||
|
try {
|
||||||
|
$userPosts = Post::selectForUser(local_user(), $fields, $condition, $params);
|
||||||
|
while ($userPost = $this->dba->fetch($userPosts)) {
|
||||||
|
$formattedItem = $this->formatItem($userPost);
|
||||||
|
|
||||||
|
// Overwrite specific fields, not default item format
|
||||||
|
$formattedItem['label'] = 'comment';
|
||||||
|
$formattedItem['text'] = $this->l10n->t("%s commented on %s's post", $formattedItem['author-name'], $formattedItem['parent-author-name']);
|
||||||
|
|
||||||
|
$formattedNotifications[] = $this->createFromFormattedItem($formattedItem);
|
||||||
|
}
|
||||||
|
} catch (Exception $e) {
|
||||||
|
$this->logger->warning('Select failed.', ['conditions' => $condition, 'exception' => $e]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $formattedNotifications;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Format the item query in a usable array
|
||||||
|
*
|
||||||
|
* @param array $item The item from the db query
|
||||||
|
*
|
||||||
|
* @return array The item, extended with the notification-specific information
|
||||||
|
*
|
||||||
|
* @throws InternalServerErrorException
|
||||||
|
* @throws Exception
|
||||||
|
*/
|
||||||
|
private function formatItem(array $item): array
|
||||||
|
{
|
||||||
|
$item['seen'] = !($item['unseen'] > 0);
|
||||||
|
|
||||||
|
// For feed items we use the user's contact, since the avatar is mostly self choosen.
|
||||||
|
if (!empty($item['network']) && $item['network'] == Protocol::FEED) {
|
||||||
|
$item['author-avatar'] = $item['contact-avatar'];
|
||||||
|
}
|
||||||
|
|
||||||
|
$item['label'] = (($item['gravity'] == GRAVITY_PARENT) ? 'post' : 'comment');
|
||||||
|
$item['link'] = $this->baseUrl->get(true) . '/display/' . $item['parent-guid'];
|
||||||
|
$item['image'] = $item['author-avatar'];
|
||||||
|
$item['url'] = $item['author-link'];
|
||||||
|
$item['when'] = DateTimeFormat::local($item['created'], 'r');
|
||||||
|
$item['ago'] = Temporal::getRelativeDate($item['created']);
|
||||||
|
$item['text'] = (($item['gravity'] == GRAVITY_PARENT)
|
||||||
|
? $this->l10n->t("%s created a new post", $item['author-name'])
|
||||||
|
: $this->l10n->t("%s commented on %s's post", $item['author-name'], $item['parent-author-name']));
|
||||||
|
|
||||||
|
return $item;
|
||||||
|
}
|
||||||
|
}
|
|
@ -26,6 +26,9 @@ use Friendica\Capabilities\ICanCreateFromTableRow;
|
||||||
use Friendica\Content\Text\BBCode;
|
use Friendica\Content\Text\BBCode;
|
||||||
use GuzzleHttp\Psr7\Uri;
|
use GuzzleHttp\Psr7\Uri;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated since 2022.05 Use \Friendica\Navigation\Notifications\Factory\Notification instead
|
||||||
|
*/
|
||||||
class Notify extends BaseFactory implements ICanCreateFromTableRow
|
class Notify extends BaseFactory implements ICanCreateFromTableRow
|
||||||
{
|
{
|
||||||
public function createFromTableRow(array $row): \Friendica\Navigation\Notifications\Entity\Notify
|
public function createFromTableRow(array $row): \Friendica\Navigation\Notifications\Entity\Notify
|
||||||
|
|
|
@ -41,6 +41,9 @@ use Friendica\Util\DateTimeFormat;
|
||||||
use Friendica\Util\Emailer;
|
use Friendica\Util\Emailer;
|
||||||
use Psr\Log\LoggerInterface;
|
use Psr\Log\LoggerInterface;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated since 2022.05 Use \Friendica\Navigation\Notifications\Repository\Notification instead
|
||||||
|
*/
|
||||||
class Notify extends BaseRepository
|
class Notify extends BaseRepository
|
||||||
{
|
{
|
||||||
/** @var Factory\Notify */
|
/** @var Factory\Notify */
|
||||||
|
|
67
src/Navigation/Notifications/ValueObject/FormattedNotify.php
Normal file
67
src/Navigation/Notifications/ValueObject/FormattedNotify.php
Normal file
|
@ -0,0 +1,67 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (C) 2010-2022, 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/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Friendica\Navigation\Notifications\ValueObject;
|
||||||
|
|
||||||
|
use Friendica\BaseDataTransferObject;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A view-only object for printing item notifications to the frontend
|
||||||
|
*
|
||||||
|
* @deprecated since 2022.05 Use \Friendica\Navigation\Notifications\ValueObject\FormattedNotification instead
|
||||||
|
*/
|
||||||
|
class FormattedNotify extends BaseDataTransferObject
|
||||||
|
{
|
||||||
|
const SYSTEM = 'system';
|
||||||
|
const PERSONAL = 'personal';
|
||||||
|
const NETWORK = 'network';
|
||||||
|
const INTRO = 'intro';
|
||||||
|
const HOME = 'home';
|
||||||
|
|
||||||
|
/** @var string */
|
||||||
|
protected $label = '';
|
||||||
|
/** @var string */
|
||||||
|
protected $link = '';
|
||||||
|
/** @var string */
|
||||||
|
protected $image = '';
|
||||||
|
/** @var string */
|
||||||
|
protected $url = '';
|
||||||
|
/** @var string */
|
||||||
|
protected $text = '';
|
||||||
|
/** @var string */
|
||||||
|
protected $when = '';
|
||||||
|
/** @var string */
|
||||||
|
protected $ago = '';
|
||||||
|
/** @var boolean */
|
||||||
|
protected $seen = false;
|
||||||
|
|
||||||
|
public function __construct(string $label, string $link, string $image, string $url, string $text, string $when, string $ago, bool $seen)
|
||||||
|
{
|
||||||
|
$this->label = $label ?? '';
|
||||||
|
$this->link = $link ?? '';
|
||||||
|
$this->image = $image ?? '';
|
||||||
|
$this->url = $url ?? '';
|
||||||
|
$this->text = $text ?? '';
|
||||||
|
$this->when = $when ?? '';
|
||||||
|
$this->ago = $ago ?? '';
|
||||||
|
$this->seen = $seen ?? false;
|
||||||
|
}
|
||||||
|
}
|
|
@ -904,7 +904,7 @@ return [
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
"notify" => [
|
"notify" => [
|
||||||
"comment" => "notifications",
|
"comment" => "[Deprecated] User notifications",
|
||||||
"fields" => [
|
"fields" => [
|
||||||
"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
|
"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
|
||||||
"type" => ["type" => "smallint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
|
"type" => ["type" => "smallint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
|
||||||
|
|
Loading…
Reference in a new issue