GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[PLUGINS][Favourite] Refactored redirection to previous url. User is now unable to do invalid actions (ex. favour an already favourited note).

Browse Source 
[PLUGINS][ActivityPub] Fixed favour route id to be more consistent.
This commit is contained in:
Eliseu Amaro
2021-10-26 17:29:14 +01:00
parent e54e55dfbf
commit d47f125894
4 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/ActivityPub/Util/Model/EntityToType/GSActorToType.php
View File

@@ -32,7 +32,7 @@ class GSActorToType
'outbox' => Router::url('activitypub_actor_outbox', ['gsactor_id' => $gsactor->getId()], Router::ABSOLUTE_URL), 'outbox' => Router::url('activitypub_actor_outbox', ['gsactor_id' => $gsactor->getId()], Router::ABSOLUTE_URL),
'following' => Router::url('actor_subscriptions_id', ['id' => $gsactor->getId()], Router::ABSOLUTE_URL), 'following' => Router::url('actor_subscriptions_id', ['id' => $gsactor->getId()], Router::ABSOLUTE_URL),
'followers' => Router::url('actor_subscribers_id', ['id' => $gsactor->getId()], Router::ABSOLUTE_URL), 'followers' => Router::url('actor_subscribers_id', ['id' => $gsactor->getId()], Router::ABSOLUTE_URL),
'liked' => Router::url('actor_favourites_id', ['id' => $gsactor->getId()], Router::ABSOLUTE_URL), 'liked' => Router::url('favourites_view_by_actor_id', ['id' => $gsactor->getId()], Router::ABSOLUTE_URL),
//'streams' => //'streams' =>
'preferredUsername' => $gsactor->getNickname(), 'preferredUsername' => $gsactor->getNickname(),
'publicKey' => [ 'publicKey' => [

26
plugins/Favourite/Controller/Favourite.php
View File

@@ -46,13 +46,14 @@ class Favourite extends Controller
* @throws NoSuchNoteException * @throws NoSuchNoteException
* @throws InvalidFormException * @throws InvalidFormException
* @throws \App\Util\Exception\ServerException * @throws \App\Util\Exception\ServerException
* @throws NoLoggedInUser
*/ */
public function noteAddFavourite(Request $request, int $id): bool|array public function favouriteAddNote(Request $request, int $id): bool|array
{ {
$user = Common::ensureLoggedIn(); $user = Common::ensureLoggedIn();
$opts = ['id' => $id]; $opts = ['id' => $id];
$add_favourite_note = DB::find('note', $opts); $add_favourite_note = DB::find('note', $opts);
if (!$user || $add_favourite_note === null) { if (is_null($add_favourite_note)) {
throw new NoSuchNoteException(); throw new NoSuchNoteException();
} }
@@ -70,14 +71,18 @@ class Favourite extends Controller
$form_add_to_favourite->handleRequest($request); $form_add_to_favourite->handleRequest($request);
if ($form_add_to_favourite->isSubmitted()) { if ($form_add_to_favourite->isSubmitted()) {
$opts = ['note_id' => $id, 'actor_id' => $user->getId()];
$note_already_favourited = DB::find('favourite', $opts);
if (is_null($note_already_favourited)) {
$opts = ['note_id' => $id, 'actor_id' => $user->getId()]; $opts = ['note_id' => $id, 'actor_id' => $user->getId()];
DB::persist(FavouriteEntity::create($opts)); DB::persist(FavouriteEntity::create($opts));
DB::flush(); DB::flush();
}
if ($redirect_back_exists = explode("&", explode("?", $_SERVER['REQUEST_URI'])[1] )[0]) { if (array_key_exists('from', $get_params = $this->params())) {
$redirect_back_exists = substr($redirect_back_exists, 5);
# TODO anchor on element id # TODO anchor on element id
throw new RedirectException($redirect_back_exists); throw new RedirectException($get_params['from']);
} }
} }
@@ -95,12 +100,12 @@ class Favourite extends Controller
* @throws \App\Util\Exception\ServerException * @throws \App\Util\Exception\ServerException
* @throws NoLoggedInUser * @throws NoLoggedInUser
*/ */
public function noteRemoveFavourite(Request $request, int $id): array public function favouriteRemoveNote(Request $request, int $id): array
{ {
$user = Common::ensureLoggedIn(); $user = Common::ensureLoggedIn();
$opts = ['note_id' => $id, 'actor_id' => $user->getId()]; $opts = ['note_id' => $id, 'actor_id' => $user->getId()];
$remove_favourite_note = DB::find('favourite', $opts); $remove_favourite_note = DB::find('favourite', $opts);
if (!$user || $remove_favourite_note === null) { if (is_null($remove_favourite_note)) {
throw new NoSuchNoteException(); throw new NoSuchNoteException();
} }
@@ -117,13 +122,14 @@ class Favourite extends Controller
$form_remove_favourite->handleRequest($request); $form_remove_favourite->handleRequest($request);
if ($form_remove_favourite->isSubmitted()) { if ($form_remove_favourite->isSubmitted()) {
if ($remove_favourite_note) {
DB::remove($remove_favourite_note); DB::remove($remove_favourite_note);
DB::flush(); DB::flush();
}
if ($redirect_back_exists = explode("&", explode("?", $_SERVER['REQUEST_URI'])[1] )[0]) { if (array_key_exists('from', $get_params = $this->params())) {
$redirect_back_exists = substr($redirect_back_exists, 5);
# TODO anchor on element id # TODO anchor on element id
throw new RedirectException($redirect_back_exists); throw new RedirectException($get_params['from']);
} }
} }

22
plugins/Favourite/Favourite.php
View File

@@ -63,11 +63,11 @@ class Favourite extends NoteHandlerPlugin
$args = ['id' => $note->getId()]; $args = ['id' => $note->getId()];
$type = Router::ABSOLUTE_PATH; $type = Router::ABSOLUTE_PATH;
$favourite_action_url = $is_favourite ? $favourite_action_url = $is_favourite ?
Router::url('note_remove_favourite', $args, $type) : Router::url('favourite_remove', $args, $type) :
Router::url('note_add_favourite', $args, $type); Router::url('favourite_add', $args, $type);
// Concatenating get parameter to redirect the user to where he came from // Concatenating get parameter to redirect the user to where he came from
$favourite_action_url .= '?from=' . urlencode(Common::route()); $favourite_action_url .= '?from=' . substr($request->getQueryString(), 2);
$extra_classes = $is_favourite ? "note-actions-set" : "note-actions-unset"; $extra_classes = $is_favourite ? "note-actions-set" : "note-actions-unset";
$favourite_action = [ $favourite_action = [
@@ -82,24 +82,24 @@ class Favourite extends NoteHandlerPlugin
public function onAddProfileNavigationItem(array $vars, array &$res): bool public function onAddProfileNavigationItem(array $vars, array &$res): bool
{ {
$res[] = ['title' => 'Favourites', 'path' => Router::url('actor_favourites_nickname', ['nickname' => $vars['nickname']]), 'path_id' => 'actor_favourites_nickname']; $res[] = ['title' => 'Favourites', 'path' => Router::url('favourites_view_by_nickname', ['nickname' => $vars['nickname']]), 'path_id' => 'favourites_view_by_nickname'];
$res[] = ['title' => 'Reverse Favourites', 'path' => Router::url('actor_reverse_favourites_nickname', ['nickname' => $vars['nickname']]), 'path_id' => 'actor_reverse_favourites_nickname']; $res[] = ['title' => 'Reverse Favourites', 'path' => Router::url('favourites_reverse_view_by_nickname', ['nickname' => $vars['nickname']]), 'path_id' => 'favourites_view_by_nickname'];
return Event::next; return Event::next;
} }
public function onAddRoute(RouteLoader $r): bool public function onAddRoute(RouteLoader $r): bool
{ {
// Add/remove note to/from favourites // Add/remove note to/from favourites
$r->connect(id: 'note_add_favourite', uri_path: '/note/{id<\d+>}/add_favourite', target: [Controller\Favourite::class, 'noteAddFavourite']); $r->connect(id: 'favourite_add', uri_path: '/object/note/{id<\d+>}/favour', target: [Controller\Favourite::class, 'favouriteAddNote']);
$r->connect(id: 'note_remove_favourite', uri_path: '/note/{id<\d+>}/remove_favourite', target: [Controller\Favourite::class, 'noteRemoveFavourite']); $r->connect(id: 'favourite_remove', uri_path: '/object/note/{id<\d+>}/unfavour', target: [Controller\Favourite::class, 'favouriteRemoveNote']);
// View all favourites by actor id // View all favourites by actor id
$r->connect(id: 'actor_favourites_id', uri_path: '/actor/{id<\d+>}/favourites', target: [Controller\Favourite::class, 'favouritesByActorId']); $r->connect(id: 'favourites_view_by_actor_id', uri_path: '/actor/{id<\d+>}/favourites', target: [Controller\Favourite::class, 'favouritesViewByActorId']);
$r->connect(id: 'actor_reverse_favourites_id', uri_path: '/actor/{id<\d+>}/reverse_favourites', target: [Controller\Favourite::class, 'reverseFavouritesByActorId']); $r->connect(id: 'favourites_reverse_view_by_actor_id', uri_path: '/actor/{id<\d+>}/reverse_favourites', target: [Controller\Favourite::class, 'favouritesReverseViewByActorId']);
// View all favourites by nickname // View all favourites by nickname
$r->connect(id: 'actor_favourites_nickname', uri_path: '/@{nickname<' . Nickname::DISPLAY_FMT . '>}/favourites', target: [Controller\Favourite::class, 'favouritesByActorNickname']); $r->connect(id: 'favourites_view_by_nickname', uri_path: '/@{nickname<' . Nickname::DISPLAY_FMT . '>}/favourites', target: [Controller\Favourite::class, 'favouritesByActorNickname']);
$r->connect(id: 'actor_reverse_favourites_nickname', uri_path: '/@{nickname<' . Nickname::DISPLAY_FMT . '>}/reverse_favourites', target: [Controller\Favourite::class, 'reverseFavouritesByActorNickname']); $r->connect(id: 'favourites_reverse_view_by_nickname', uri_path: '/@{nickname<' . Nickname::DISPLAY_FMT . '>}/reverse_favourites', target: [Controller\Favourite::class, 'reverseFavouritesByActorNickname']);
return Event::next; return Event::next;
} }
} }

1
templates/cards/note/view.html.twig
View File

@@ -16,7 +16,6 @@
<a href="{{ actor_url }}" class="note-author u-url"> <a href="{{ actor_url }}" class="note-author u-url">
<strong class="note-author-fullname">{{ fullname }}</strong> <strong class="note-author-fullname">{{ fullname }}</strong>
<em class="note-author-nickname">{{ nickname }}</em> <em class="note-author-nickname">{{ nickname }}</em>
<em class="note-author-instance">{{ nickname }}</em>
</a> </a>
{% if app.user and note_actions_show %} {% if app.user and note_actions_show %}