Add legacy notification endpoint for deprecated Notify entity

- Add dependencies to Notifications\Notification module class
This commit is contained in:
Hypolite Petovan 2022-03-03 09:07:37 -05:00
parent deafdcde95
commit b7cee324b0
7 changed files with 112 additions and 50 deletions

View file

@ -442,7 +442,7 @@ function ping_get_notifications($uid)
DBA::update('notify', ['name_cache' => $notification["name"], 'msg_cache' => $notification["message"]], ['id' => $notification["id"]]); DBA::update('notify', ['name_cache' => $notification["name"], 'msg_cache' => $notification["message"]], ['id' => $notification["id"]]);
} }
$notification["href"] = DI::baseUrl() . "/notification/" . $notification["id"]; $notification["href"] = DI::baseUrl() . "/notify/" . $notification["id"];
if ($notification["visible"] if ($notification["visible"]
&& !$notification["deleted"] && !$notification["deleted"]

View file

@ -21,18 +21,45 @@
namespace Friendica\Module\Notifications; namespace Friendica\Module\Notifications;
use Friendica\App;
use Friendica\BaseModule; use Friendica\BaseModule;
use Friendica\Contact\Introduction\Repository\Introduction;
use Friendica\Core\L10n;
use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Module\Response;
use Friendica\Module\Security\Login; use Friendica\Module\Security\Login;
use Friendica\Navigation\Notifications\Factory;
use Friendica\Navigation\Notifications\Repository;
use Friendica\Network\HTTPException; use Friendica\Network\HTTPException;
use Friendica\Util\Profiler;
use Psr\Log\LoggerInterface;
/**
* Interacting with the /notification command
*/
class Notification extends BaseModule class Notification extends BaseModule
{ {
/** @var Introduction */
private $introductionRepo;
/** @var Repository\Notification */
private $notificationRepo;
/** @var Repository\Notify */
private $notifyRepo;
/** @var IManagePersonalConfigValues */
private $pconfig;
/** @var Factory\Notification */
private $notificationFactory;
public function __construct(Introduction $introductionRepo, Repository\Notification $notificationRepo, Factory\Notification $notificationFactory, Repository\Notify $notifyRepo, IManagePersonalConfigValues $pconfig, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
{
parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
$this->introductionRepo = $introductionRepo;
$this->notificationRepo = $notificationRepo;
$this->notificationFactory = $notificationFactory;
$this->notifyRepo = $notifyRepo;
$this->pconfig = $pconfig;
}
/** /**
* {@inheritDoc} * {@inheritDoc}
* *
@ -45,26 +72,26 @@ class Notification extends BaseModule
protected function post(array $request = []) protected function post(array $request = [])
{ {
if (!local_user()) { if (!local_user()) {
throw new HTTPException\UnauthorizedException(DI::l10n()->t('Permission denied.')); throw new HTTPException\UnauthorizedException($this->l10n->t('Permission denied.'));
} }
$request_id = $this->parameters['id'] ?? false; $request_id = $this->parameters['id'] ?? false;
if ($request_id) { if ($request_id) {
$intro = DI::intro()->selectOneById($request_id, local_user()); $intro = $this->introductionRepo->selectOneById($request_id, local_user());
switch ($_POST['submit']) { switch ($_POST['submit']) {
case DI::l10n()->t('Discard'): case $this->l10n->t('Discard'):
Contact\Introduction::discard($intro); Contact\Introduction::discard($intro);
DI::intro()->delete($intro); $this->introductionRepo->delete($intro);
break; break;
case DI::l10n()->t('Ignore'): case $this->l10n->t('Ignore'):
$intro->ignore(); $intro->ignore();
DI::intro()->save($intro); $this->introductionRepo->save($intro);
break; break;
} }
DI::baseUrl()->redirect('notifications/intros'); $this->baseUrl->redirect('notifications/intros');
} }
} }
@ -76,15 +103,15 @@ class Notification extends BaseModule
protected function rawContent(array $request = []) protected function rawContent(array $request = [])
{ {
if (!local_user()) { if (!local_user()) {
throw new HTTPException\UnauthorizedException(DI::l10n()->t('Permission denied.')); throw new HTTPException\UnauthorizedException($this->l10n->t('Permission denied.'));
} }
if (DI::args()->get(1) === 'mark' && DI::args()->get(2) === 'all') { if ($this->args->get(1) === 'mark' && $this->args->get(2) === 'all') {
try { try {
DI::notification()->setAllSeenForUser(local_user()); $this->notificationRepo->setAllSeenForUser(local_user());
$success = DI::notify()->setAllSeenForUser(local_user()); $success = $this->notifyRepo->setAllSeenForUser(local_user());
} catch (\Exception $e) { } catch (\Exception $e) {
DI::logger()->warning('set all seen failed.', ['exception' => $e]); $this->logger->warning('set all seen failed.', ['exception' => $e]);
$success = false; $success = false;
} }
@ -104,38 +131,71 @@ class Notification extends BaseModule
protected function content(array $request = []): string protected function content(array $request = []): string
{ {
if (!local_user()) { if (!local_user()) {
notice(DI::l10n()->t('You must be logged in to show this page.')); notice($this->l10n->t('You must be logged in to show this page.'));
return Login::form(); return Login::form();
} }
$request_id = $this->parameters['id'] ?? false; if (isset($this->parameters['notify_id'])) {
$this->handleNotify($this->parameters['notify_id']);
} elseif (isset($this->parameters['id'])) {
$this->handleNotification($this->parameters['id']);
}
if ($request_id) { $this->baseUrl->redirect('notifications/system');
$Notify = DI::notify()->selectOneById($request_id);
return '';
}
private function handleNotify(int $notifyId)
{
$Notify = $this->notifyRepo->selectOneById($notifyId);
if ($Notify->uid !== local_user()) { if ($Notify->uid !== local_user()) {
throw new HTTPException\ForbiddenException(); throw new HTTPException\ForbiddenException();
} }
if (DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) { if ($this->pconfig->get(local_user(), 'system', 'detailed_notif')) {
$Notify->setSeen(); $Notify->setSeen();
DI::notify()->save($Notify); $this->notifyRepo->save($Notify);
} else { } else {
if ($Notify->uriId) { if ($Notify->uriId) {
DI::notification()->setAllSeenForUser($Notify->uid, ['target-uri-id' => $Notify->uriId]); $this->notificationRepo->setAllSeenForUser($Notify->uid, ['target-uri-id' => $Notify->uriId]);
} }
DI::notify()->setAllSeenForRelatedNotify($Notify); $this->notifyRepo->setAllSeenForRelatedNotify($Notify);
} }
if ((string)$Notify->link) { if ((string)$Notify->link) {
System::externalRedirect($Notify->link); System::externalRedirect($Notify->link);
} }
DI::baseUrl()->redirect(); $this->baseUrl->redirect();
} }
DI::baseUrl()->redirect('notifications/system'); private function handleNotification(int $notificationId)
{
$Notification = $this->notificationRepo->selectOneById($notificationId);
if ($Notification->uid !== local_user()) {
throw new HTTPException\ForbiddenException();
}
return ''; if ($this->pconfig->get(local_user(), 'system', 'detailed_notif')) {
$Notification->setSeen();
$this->notificationRepo->save($Notification);
} else {
if ($Notification->parentUriId) {
$this->notificationRepo->setAllSeenForUser($Notification->uid, ['parent-uri-id' => $Notification->parentUriId]);
} else {
$Notification->setSeen();
$this->notificationRepo->save($Notification);
}
}
$message = $this->notificationFactory->getMessageFromNotification($Notification);
if ($message['link']) {
System::externalRedirect($message['link']);
}
$this->baseUrl->redirect();
} }
} }

View file

@ -214,7 +214,7 @@ class FormattedNotify extends BaseFactory
foreach ($Notifies as $Notify) { foreach ($Notifies as $Notify) {
$formattedNotifications[] = new ValueObject\FormattedNotify( $formattedNotifications[] = new ValueObject\FormattedNotify(
'notification', 'notification',
$this->baseUrl->get(true) . '/notification/' . $Notify->id, $this->baseUrl->get(true) . '/notify/' . $Notify->id,
Contact::getAvatarUrlForUrl($Notify->url, $Notify->uid, Proxy::SIZE_MICRO), Contact::getAvatarUrlForUrl($Notify->url, $Notify->uid, Proxy::SIZE_MICRO),
$Notify->url, $Notify->url,
strip_tags(BBCode::toPlaintext($Notify->msg)), strip_tags(BBCode::toPlaintext($Notify->msg)),

View file

@ -570,7 +570,7 @@ class Notify extends BaseRepository
$Notify->updateMsgFromPreamble($epreamble); $Notify->updateMsgFromPreamble($epreamble);
$Notify = $this->save($Notify); $Notify = $this->save($Notify);
$itemlink = $this->baseUrl->get() . '/notification/' . $Notify->id; $itemlink = $this->baseUrl->get() . '/notify/' . $Notify->id;
$notify_id = $Notify->id; $notify_id = $Notify->id;
} }

View file

@ -449,6 +449,8 @@ return [
'/{id:\d+}' => [Module\Notifications\Notification::class, [R::GET, R::POST]], '/{id:\d+}' => [Module\Notifications\Notification::class, [R::GET, R::POST]],
], ],
'/notify/{notify_id:\d+}' => [Module\Notifications\Notification::class, [R::GET]],
'/oauth' => [ '/oauth' => [
'/acknowledge' => [Module\OAuth\Acknowledge::class, [R::GET, R::POST]], '/acknowledge' => [Module\OAuth\Acknowledge::class, [R::GET, R::POST]],
'/authorize' => [Module\OAuth\Authorize::class, [R::GET]], '/authorize' => [Module\OAuth\Authorize::class, [R::GET]],

View file

@ -903,18 +903,18 @@ return [
[ [
'id' => 1, 'id' => 1,
'type' => 8, 'type' => 8,
'name' => 'Reply to', 'name' => 'Friend contact',
'url' => 'http://localhost/display/1', 'url' => 'http://localhost/profile/friendcontact',
'photo' => 'http://localhost/', 'photo' => 'http://localhost/',
'date' => '2020-01-01 12:12:02', 'date' => '2020-01-01 12:12:02',
'msg' => 'A test reply from an item', 'msg' => 'A test reply from an item',
'uid' => 42, 'uid' => 42,
'link' => 'http://localhost/notification/1', 'link' => 'http://localhost/display/1',
'iid' => 4, 'iid' => 4,
'seen' => 0, 'seen' => 0,
'verb' => \Friendica\Protocol\Activity::POST, 'verb' => \Friendica\Protocol\Activity::POST,
'otype' => Notification\ObjectType::ITEM, 'otype' => Notification\ObjectType::ITEM,
'name_cache' => 'Reply to', 'name_cache' => 'Friend contact',
'msg_cache' => 'A test reply from an item', 'msg_cache' => 'A test reply from an item',
], ],
], ],

View file

@ -62,7 +62,7 @@ class NotificationTest extends ApiTest
$assertXml = <<<XML $assertXml = <<<XML
<?xml version="1.0"?> <?xml version="1.0"?>
<notes> <notes>
<note date="$date" date_rel="$dateRel" id="1" iid="4" link="http://localhost/notification/1" msg="A test reply from an item" msg_cache="A test reply from an item" msg_html="A test reply from an item" msg_plain="A test reply from an item" name="Reply to" name_cache="Reply to" otype="item" parent="" photo="http://localhost/" seen="false" timestamp="1577880722" type="8" uid="42" url="http://localhost/display/1" verb="http://activitystrea.ms/schema/1.0/post"/> <note date="$date" date_rel="$dateRel" id="1" iid="4" link="http://localhost/display/1" msg="A test reply from an item" msg_cache="A test reply from an item" msg_html="A test reply from an item" msg_plain="A test reply from an item" name="Friend contact" name_cache="Friend contact" otype="item" parent="" photo="http://localhost/" seen="false" timestamp="1577880722" type="8" uid="42" url="http://localhost/profile/friendcontact" verb="http://activitystrea.ms/schema/1.0/post"/>
</notes> </notes>
XML; XML;