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

[Reply] RedirectionException wasn't allowing other handlers to do their job.

Browse Source
This commit is contained in:
Eliseu Amaro 2021-09-05 16:16:42 +01:00 committed by Hugo Sales
parent 85db9464ca
commit 6fdec483cd
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/Reply/Reply.php
View File

@ -28,7 +28,7 @@ use function App\Core\I18n\_m;
use App\Core\Modules\NoteHandlerPlugin; use App\Core\Modules\NoteHandlerPlugin;
use App\Entity\Note; use App\Entity\Note;
use App\Util\Common; use App\Util\Common;
use App\Util\Exceptiion\InvalidFormException; use App\Util\Exception\InvalidFormException;
use App\Util\Exception\RedirectException; use App\Util\Exception\RedirectException;
use Component\Posting\Posting; use Component\Posting\Posting;
use Symfony\Component\Form\Extension\Core\Type\FileType; use Symfony\Component\Form\Extension\Core\Type\FileType;
@ -49,10 +49,11 @@ class Reply extends NoteHandlerPlugin
/** /**
* HTML rendering event that adds the reply form as a note action, * HTML rendering event that adds the reply form as a note action,
* if a user is logged in * if a user is logged in
* @throws RedirectException
*/ */
public function onAddNoteActions(Request $request, Note $note, array &$actions) public function onAddNoteActions(Request $request, Note $note, array &$actions)
{ {
if (($user = Common::user()) == null) { if (($user = Common::user()) === null) {
return Event::next; return Event::next;
} }
@ -71,7 +72,7 @@ class Reply extends NoteHandlerPlugin
]); ]);
// Handle form // Handle form
$ret = self::noteActionHandle($request, $form, $note, 'reply', function ($note, $data) { $ret = self::noteActionHandle($request, $form, $note, 'reply', function ($note, $data, $user) {
if ($data['content'] !== null) { if ($data['content'] !== null) {
// JS submitted // JS submitted
// TODO Implement in JS // TODO Implement in JS
@ -87,10 +88,12 @@ class Reply extends NoteHandlerPlugin
} else { } else {
// JS disabled, redirect // JS disabled, redirect
throw new RedirectException('note_reply', ['reply_to' => $note->getId()]); throw new RedirectException('note_reply', ['reply_to' => $note->getId()]);
return Event::stop;
} }
}); });
if ($ret != null) { if ($ret !== null) {
return $ret; return $ret;
} }
$actions[] = $form->createView(); $actions[] = $form->createView();
@ -105,7 +108,7 @@ class Reply extends NoteHandlerPlugin
$user = Common::ensureLoggedIn(); $user = Common::ensureLoggedIn();
$actor_id = $user->getId(); $actor_id = $user->getId();
$note = DB::find('note', ['id' => (int) $reply_to]); $note = DB::find('note', ['id' => (int) $reply_to]);
if ($note == null || !$note->isVisibleTo($user)) { if ($note === null || !$note->isVisibleTo($user)) {
throw new NoSuchNoteException(); throw new NoSuchNoteException();
} }