Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 04:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge "notification" routes

Browse source
This commit is contained in:
nupplaPhil 2020-01-28 23:21:24 +01:00
parent dd8d9d7c70
commit c2b8c65104
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
8 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/enotify.php
View file

@ -500,7 +500,7 @@ function notification($params)
DI::notify()->update($notification); DI::notify()->update($notification);
$itemlink = DI::baseUrl() . '/notification/view/' . $notification->id; $itemlink = DI::baseUrl() . '/notification/' . $notification->id;
$notify_id = $notification->id; $notify_id = $notification->id;
} }

2
mod/ping.php
View file

@ -443,7 +443,7 @@ function ping_get_notifications($uid)
); );
} }
$notification["href"] = DI::baseUrl() . "/notification/view/" . $notification["id"]; $notification["href"] = DI::baseUrl() . "/notification/" . $notification["id"];
if ($notification["visible"] if ($notification["visible"]
&& !$notification["deleted"] && !$notification["deleted"]

2
src/Factory/Notification/Notification.php
View file

@ -219,7 +219,7 @@ class Notification extends BaseFactory
foreach ($notifications as $notification) { foreach ($notifications as $notification) {
$formattedNotifications[] = new \Friendica\Object\Notification\Notification([ $formattedNotifications[] = new \Friendica\Object\Notification\Notification([
'label' => 'notification', 'label' => 'notification',
'link' => $this->baseUrl->get(true) . '/notification/view/' . $notification->id, 'link' => $this->baseUrl->get(true) . '/notification/' . $notification->id,
'image' => Proxy::proxifyUrl($notification->photo, false, Proxy::SIZE_MICRO), 'image' => Proxy::proxifyUrl($notification->photo, false, Proxy::SIZE_MICRO),
'url' => $notification->url, 'url' => $notification->url,
'text' => strip_tags(BBCode::convert($notification->msg)), 'text' => strip_tags(BBCode::convert($notification->msg)),

10
src/Module/Notifications/Notification.php
View file

@ -23,7 +23,7 @@ class Notification extends BaseModule
{ {
$request_id = $parameters['id'] ?? false; $request_id = $parameters['id'] ?? false;
if (DI::args()->get(1) == 'action' && $request_id) { if ($request_id) {
$intro = DI::intro()->selectFirst(['id' => $request_id, 'uid' => local_user()]); $intro = DI::intro()->selectFirst(['id' => $request_id, 'uid' => local_user()]);
switch ($_POST['submit']) { switch ($_POST['submit']) {
@ -65,10 +65,11 @@ class Notification extends BaseModule
*/ */
public static function content(array $parameters = []) public static function content(array $parameters = [])
{ {
// @TODO: Replace with parameter from router $request_id = $parameters['id'] ?? false;
if (DI::args()->getArgc() > 2 && DI::args()->get(1) === 'view' && intval(DI::args()->get(2))) {
if ($request_id) {
try { try {
$notification = DI::notify()->getByID(DI::args()->get(2)); $notification = DI::notify()->getByID($request_id);
$notification->setSeen(); $notification->setSeen();
if (!empty($notification->link)) { if (!empty($notification->link)) {
@ -86,3 +87,4 @@ class Notification extends BaseModule
DI::baseUrl()->redirect('notifications/system'); DI::baseUrl()->redirect('notifications/system');
} }
} }

3
static/routes.config.php
View file

@ -185,9 +185,8 @@ return [
'/notification' => [ '/notification' => [
'[/]' => [Module\Notifications\Notification::class, [R::GET]], '[/]' => [Module\Notifications\Notification::class, [R::GET]],
'/view/{id:\d+}' => [Module\Notifications\Notification::class, [R::GET]],
'/mark/all' => [Module\Notifications\Notification::class, [R::GET]], '/mark/all' => [Module\Notifications\Notification::class, [R::GET]],
'/action/{id:\d+}' => [Module\Notifications\Notification::class, [ R::POST]], '/{id:\d+}' => [Module\Notifications\Notification::class, [R::GET, R::POST]],
], ],
'/objects/{guid}' => [Module\Objects::class, [R::GET]], '/objects/{guid}' => [Module\Objects::class, [R::GET]],

2
view/templates/notifications/intros.tpl
View file

@ -12,7 +12,7 @@
<div class="intro-knowyou">{{$lbl_knowyou}} {{$knowyou}}</div> <div class="intro-knowyou">{{$lbl_knowyou}} {{$knowyou}}</div>
<div class="intro-note" id="intro-note-{{$contact_id}}">{{$note}}</div> <div class="intro-note" id="intro-note-{{$contact_id}}">{{$note}}</div>
<div class="intro-wrapper-end" id="intro-wrapper-end-{{$contact_id}}"></div> <div class="intro-wrapper-end" id="intro-wrapper-end-{{$contact_id}}"></div>
<form class="intro-form" action="notification/action/{{$intro_id}}" method="post"> <form class="intro-form" action="notification/{{$intro_id}}" method="post">
<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" /> <input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" />
{{if $discard}}<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" />{{/if}} {{if $discard}}<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" />{{/if}}
</form> </form>

2
view/templates/notifications/suggestions.tpl
View file

@ -8,7 +8,7 @@
<a class="intro-url-link" href="{{$url}}" ><img class="intro-photo lframe" src="{{$photo}}" width="175" height="175" title="{{$fullname}}" alt="{{$fullname}}" /></a> <a class="intro-url-link" href="{{$url}}" ><img class="intro-photo lframe" src="{{$photo}}" width="175" height="175" title="{{$fullname}}" alt="{{$fullname}}" /></a>
<div class="intro-note" >{{$note}}</div> <div class="intro-note" >{{$note}}</div>
<div class="intro-wrapper-end"></div> <div class="intro-wrapper-end"></div>
<form class="intro-form" action="notification/action/{{$intro_id}}" method="post"> <form class="intro-form" action="notification/{{$intro_id}}" method="post">
<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" /> <input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" />
<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" /> <input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" />
</form> </form>

4
view/theme/frio/templates/notifications/intros.tpl
View file

@ -13,7 +13,7 @@
<div class="intro-actions pull-right nav-pills preferences"> <div class="intro-actions pull-right nav-pills preferences">
<button class="btn-link intro-action-link" onclick="addElmToModal('#intro-approve-wrapper-{{$intro_id}}');" aria-label="{{$approve}}" title="{{$approve}}" data-toggle="tooltip"><i class="fa fa-check" aria-hidden="true"></i></button> <button class="btn-link intro-action-link" onclick="addElmToModal('#intro-approve-wrapper-{{$intro_id}}');" aria-label="{{$approve}}" title="{{$approve}}" data-toggle="tooltip"><i class="fa fa-check" aria-hidden="true"></i></button>
<form class="intro-form" action="notification/action/{{$intro_id}}" method="post"> <form class="intro-form" action="notification/{{$intro_id}}" method="post">
<button class="btn-link intro-submit-ignore intro-action-link" type="submit" name="submit" value="{{$ignore}}" aria-label="{{$ignore}}" title="{{$ignore}}" data-toggle="tooltip"><i class="fa fa-ban" aria-hidden="true"></i></button> <button class="btn-link intro-submit-ignore intro-action-link" type="submit" name="submit" value="{{$ignore}}" aria-label="{{$ignore}}" title="{{$ignore}}" data-toggle="tooltip"><i class="fa fa-ban" aria-hidden="true"></i></button>
{{if $discard}}<button class="btn-link intro-submit-discard intro-action-link" type="submit" name="submit" value="{{$discard}}" aria-label="{{$discard}}" title="{{$discard}}" data-toggle="tooltip"><i class="fa fa-trash-o" aria-hidden="true"></i></button>{{/if}} {{if $discard}}<button class="btn-link intro-submit-discard intro-action-link" type="submit" name="submit" value="{{$discard}}" aria-label="{{$discard}}" title="{{$discard}}" data-toggle="tooltip"><i class="fa fa-trash-o" aria-hidden="true"></i></button>{{/if}}
</form> </form>
@ -73,7 +73,7 @@
{{* On mobile touch devices we use buttons for approve, ingnore && discard to have a better UX *}} {{* On mobile touch devices we use buttons for approve, ingnore && discard to have a better UX *}}
{{if $APP->is_mobile}} {{if $APP->is_mobile}}
<div class="intro-action-buttons"> <div class="intro-action-buttons">
<form class="intro-form pull-left" action="notification/action/{{$intro_id}}" method="post"> <form class="intro-form pull-left" action="notification/{{$intro_id}}" method="post">
<button class="btn btn-small btn-default intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}">{{$ignore}}</button> <button class="btn btn-small btn-default intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}">{{$ignore}}</button>
{{if $discard}}<button class="btn btn-small btn-default intro-submit-discard" type="submit" name="submit" value="{{$discard}}">{{$discard}}</button>&nbsp;{{/if}} {{if $discard}}<button class="btn btn-small btn-default intro-submit-discard" type="submit" name="submit" value="{{$discard}}">{{$discard}}</button>&nbsp;{{/if}}
</form> </form>