From 56bd395b8ad45adeb355924dbe3756ae82c66223 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Sat, 18 May 2019 18:59:41 +0200 Subject: [PATCH 1/4] Move mod/notify to src/Module/Notify --- src/App/Router.php | 5 +++ src/Module/Notifications/Notify.php | 70 +++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 src/Module/Notifications/Notify.php diff --git a/src/App/Router.php b/src/App/Router.php index cd59c3dd90..423452e244 100644 --- a/src/App/Router.php +++ b/src/App/Router.php @@ -164,6 +164,11 @@ class Router $this->routeCollector->addRoute(['GET'], '/modexp/{nick}', Module\PublicRSAKey::class); $this->routeCollector->addRoute(['GET'], '/nodeinfo/1.0', Module\NodeInfo::class); $this->routeCollector->addRoute(['GET'], '/nogroup', Module\Group::class); + $this->routeCollector->addGroup('/notify', function (RouteCollector $collector) { + $collector->addRoute(['GET'], '[/]', Module\Notifications\Notify::class); + $collector->addRoute(['GET'], '/view/{id:\d+}', Module\Notifications\Notify::class); + $collector->addRoute(['GET'], '/mark/all', Module\Notifications\Notify::class); + }); $this->routeCollector->addRoute(['GET'], '/objects/{guid}', Module\Objects::class); $this->routeCollector->addGroup('/oembed', function (RouteCollector $collector) { $collector->addRoute(['GET'], '/b2h', Module\Oembed::class); diff --git a/src/Module/Notifications/Notify.php b/src/Module/Notifications/Notify.php new file mode 100644 index 0000000000..d2c450dd9e --- /dev/null +++ b/src/Module/Notifications/Notify.php @@ -0,0 +1,70 @@ +argc > 2 && $a->argv[1] === 'view' && intval($a->argv[2])) { + $notificationsManager = new NotificationsManager(); + // @TODO: Replace with parameter from router + $note = $notificationsManager->getByID($a->argv[2]); + if (!empty($note)) { + $notificationsManager->setSeen($note); + if (!empty($note['link'])) { + System::externalRedirect($note['link']); + } + } + + $a->internalRedirect(); + } + + // @TODO: Replace with parameter from router + if ($a->argc > 2 && $a->argv[1] === 'mark' && $a->argv[2] === 'all') { + $notificationsManager = new NotificationsManager(); + $success = $notificationsManager->setAllSeen(); + + header('Content-type: application/json; charset=utf-8'); + echo json_encode([ + 'result' => ($success) ? 'success' : 'fail', + ]); + exit(); + } + } + + /** + * Redirect to the notifications main page + * + * @return string|void + * @throws HTTPException\InternalServerErrorException + */ + public static function content() + { + $a = self::getApp(); + + // @TODO: Replace with parameter from router + if (($a->argc > 0) && ($a->argv[0] == 'notify')) { + $a->internalRedirect('notifications/system'); + } + } +} From 2906a9031b91a0c4dd133eb7b431ddae9bd1ecb4 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Sat, 18 May 2019 19:04:33 +0200 Subject: [PATCH 2/4] Removed mod/notify --- mod/notify.php | 78 -------------------------------------------------- 1 file changed, 78 deletions(-) delete mode 100644 mod/notify.php diff --git a/mod/notify.php b/mod/notify.php deleted file mode 100644 index 7f9974d30a..0000000000 --- a/mod/notify.php +++ /dev/null @@ -1,78 +0,0 @@ -argc > 2 && $a->argv[1] === 'view' && intval($a->argv[2])) { - $note = $nm->getByID($a->argv[2]); - if ($note) { - $nm->setSeen($note); - System::externalRedirect($note['link']); - } - - $a->internalRedirect(); - } - - if ($a->argc > 2 && $a->argv[1] === 'mark' && $a->argv[2] === 'all') { - $r = $nm->setAllSeen(); - $j = json_encode(['result' => ($r) ? 'success' : 'fail']); - echo $j; - exit(); - } -} - -function notify_content(App $a) -{ - if (! local_user()) { - return Login::form(); - } - - $notif_content = ''; - - $nm = new NotificationsManager(); - - $notif_tpl = Renderer::getMarkupTemplate('notifications.tpl'); - - $not_tpl = Renderer::getMarkupTemplate('notify.tpl'); - - $r = $nm->getAll(['seen'=>0]); - if (DBA::isResult($r) > 0) { - foreach ($r as $it) { - $notif_content .= Renderer::replaceMacros($not_tpl, [ - '$item_link' => System::baseUrl(true).'/notify/view/'. $it['id'], - '$item_image' => $it['photo'], - '$item_text' => strip_tags(BBCode::convert($it['msg'])), - '$item_when' => Temporal::getRelativeDate($it['date']) - ]); - } - } else { - $notif_content .= L10n::t('No more system notifications.'); - } - - $o = Renderer::replaceMacros($notif_tpl, [ - '$notif_header' => L10n::t('System Notifications'), - '$tabs' => false, // $tabs, - '$notif_content' => $notif_content, - ]); - - return $o; -} From 68fdc7215e2d6ff2e96250831a04f262e97d3b30 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Sat, 18 May 2019 20:07:56 +0200 Subject: [PATCH 3/4] rearrange rawContent / content --- src/Module/Notifications/Notify.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Module/Notifications/Notify.php b/src/Module/Notifications/Notify.php index d2c450dd9e..b02cce3ef1 100644 --- a/src/Module/Notifications/Notify.php +++ b/src/Module/Notifications/Notify.php @@ -3,6 +3,7 @@ namespace Friendica\Module\Notifications; use Friendica\BaseModule; +use Friendica\Core\L10n; use Friendica\Core\NotificationsManager; use Friendica\Core\System; use Friendica\Network\HTTPException; @@ -12,11 +13,7 @@ use Friendica\Network\HTTPException; */ class Notify extends BaseModule { - /** - * @throws HTTPException\InternalServerErrorException - * @throws HTTPException\UnauthorizedException - */ - public static function rawContent() + public static function init() { if (!local_user()) { throw new HTTPException\UnauthorizedException(L10n::t('Permission denied.')); @@ -38,6 +35,11 @@ class Notify extends BaseModule $a->internalRedirect(); } + } + + public static function rawContent() + { + $a = self::getApp(); // @TODO: Replace with parameter from router if ($a->argc > 2 && $a->argv[1] === 'mark' && $a->argv[2] === 'all') { @@ -63,8 +65,6 @@ class Notify extends BaseModule $a = self::getApp(); // @TODO: Replace with parameter from router - if (($a->argc > 0) && ($a->argv[0] == 'notify')) { - $a->internalRedirect('notifications/system'); - } + $a->internalRedirect('notifications/system'); } } From 1483cd3fb4c7076f3d9866e450a6212e1ebc9f49 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Sat, 18 May 2019 20:34:11 +0200 Subject: [PATCH 4/4] rearrange content/init --- src/Module/Notifications/Notify.php | 34 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/src/Module/Notifications/Notify.php b/src/Module/Notifications/Notify.php index b02cce3ef1..d31de2cdda 100644 --- a/src/Module/Notifications/Notify.php +++ b/src/Module/Notifications/Notify.php @@ -18,23 +18,6 @@ class Notify extends BaseModule if (!local_user()) { throw new HTTPException\UnauthorizedException(L10n::t('Permission denied.')); } - - $a = self::getApp(); - - // @TODO: Replace with parameter from router - if ($a->argc > 2 && $a->argv[1] === 'view' && intval($a->argv[2])) { - $notificationsManager = new NotificationsManager(); - // @TODO: Replace with parameter from router - $note = $notificationsManager->getByID($a->argv[2]); - if (!empty($note)) { - $notificationsManager->setSeen($note); - if (!empty($note['link'])) { - System::externalRedirect($note['link']); - } - } - - $a->internalRedirect(); - } } public static function rawContent() @@ -55,7 +38,7 @@ class Notify extends BaseModule } /** - * Redirect to the notifications main page + * Redirect to the notifications main page or to the url for the chosen notify * * @return string|void * @throws HTTPException\InternalServerErrorException @@ -64,6 +47,21 @@ class Notify extends BaseModule { $a = self::getApp(); + // @TODO: Replace with parameter from router + if ($a->argc > 2 && $a->argv[1] === 'view' && intval($a->argv[2])) { + $notificationsManager = new NotificationsManager(); + // @TODO: Replace with parameter from router + $note = $notificationsManager->getByID($a->argv[2]); + if (!empty($note)) { + $notificationsManager->setSeen($note); + if (!empty($note['link'])) { + System::externalRedirect($note['link']); + } + } + + $a->internalRedirect(); + } + // @TODO: Replace with parameter from router $a->internalRedirect('notifications/system'); }