keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #7157 from nupplaphil/task/mod_notify

Browse source 
Move mod/notify to src/Module/Notify
This commit is contained in:
Hypolite Petovan 2019-05-18 17:49:01 -04:00 committed by GitHub
commit 30945784c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 73 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
mod/notify.php
View file

@ -1,78 +0,0 @@
<?php
/**
* @file mod/notify.php
*/
use Friendica\App;
use Friendica\Content\Text\BBCode;
use Friendica\Core\L10n;
use Friendica\Core\NotificationsManager;
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Model\Item;
use Friendica\Module\Login;
use Friendica\Util\Temporal;
function notify_init(App $a)
{
if (! local_user()) {
return;
}
$nm = new NotificationsManager();
if ($a->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;
}

5
src/App/Router.php
View file

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

68
src/Module/Notifications/Notify.php Normal file
View file

@ -0,0 +1,68 @@
<?php
namespace Friendica\Module\Notifications;
use Friendica\BaseModule;
use Friendica\Core\L10n;
use Friendica\Core\NotificationsManager;
use Friendica\Core\System;
use Friendica\Network\HTTPException;
/**
* Interacting with the /notify command
*/
class Notify extends BaseModule
{
public static function init()
{
if (!local_user()) {
throw new HTTPException\UnauthorizedException(L10n::t('Permission denied.'));
}
}
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') {
$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 or to the url for the chosen notify
*
* @return string|void
* @throws HTTPException\InternalServerErrorException
*/
public static function content()
{
$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');
}
}