From: Hypolite Petovan Date: Sat, 30 Jan 2021 22:52:01 +0000 (-0500) Subject: Move GET starred/{id} to POST item/{id}/star X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b31fc3bfa939c2b384e86182e57d12188624e909;p=friendica.git Move GET starred/{id} to POST item/{id}/star --- diff --git a/src/Module/Item/Star.php b/src/Module/Item/Star.php new file mode 100644 index 0000000000..fb1a5d2044 --- /dev/null +++ b/src/Module/Item/Star.php @@ -0,0 +1,82 @@ +. + * + */ + +namespace Friendica\Module\Item; + +use Friendica\BaseModule; +use Friendica\Core\Session; +use Friendica\Core\System; +use Friendica\DI; +use Friendica\Model\Item; +use Friendica\Model\Post; +use Friendica\Network\HTTPException; + +/** + * Toggle starred items + */ +class Star extends BaseModule +{ + public static function rawContent(array $parameters = []) + { + $l10n = DI::l10n(); + + if (!Session::isAuthenticated()) { + throw new HttpException\ForbiddenException($l10n->t('Access denied.')); + } + + if (empty($parameters['id'])) { + throw new HTTPException\BadRequestException(); + } + + $itemId = intval($parameters['id']); + + $item = Post::selectFirstForUser(local_user(), ['starred'], ['uid' => local_user(), 'id' => $itemId]); + if (empty($item)) { + throw new HTTPException\NotFoundException(); + } + + $starred = !(bool)$item['starred']; + + Item::update(['starred' => $starred], ['id' => $itemId]); + + // See if we've been passed a return path to redirect to + $return_path = $_REQUEST['return'] ?? ''; + if (!empty($return_path)) { + $rand = '_=' . time(); + if (strpos($return_path, '?')) { + $rand = "&$rand"; + } else { + $rand = "?$rand"; + } + + DI::baseUrl()->redirect($return_path . $rand); + } + + $return = [ + 'status' => 'ok', + 'item_id' => $itemId, + 'verb' => 'star', + 'state' => (int)$starred, + ]; + + System::jsonExit($return); + } +} diff --git a/src/Module/Starred.php b/src/Module/Starred.php deleted file mode 100644 index 8bc0fa3e4e..0000000000 --- a/src/Module/Starred.php +++ /dev/null @@ -1,66 +0,0 @@ -. - * - */ - -namespace Friendica\Module; - -use Friendica\BaseModule; -use Friendica\DI; -use Friendica\Model\Item; -use Friendica\Model\Post; - -/** - * Toggle starred items - */ -class Starred extends BaseModule -{ - public static function rawContent(array $parameters = []) - { - if (!local_user()) { - throw new \Friendica\Network\HTTPException\ForbiddenException(); - } - - if (empty($parameters['item'])) { - throw new \Friendica\Network\HTTPException\BadRequestException(); - } - - $itemId = intval($parameters['item']); - - $item = Post::selectFirstForUser(local_user(), ['starred'], ['uid' => local_user(), 'id' => $itemId]); - if (empty($item)) { - throw new \Friendica\Network\HTTPException\NotFoundException(); - } - - $starred = !(bool)$item['starred']; - - Item::update(['starred' => $starred], ['id' => $itemId]); - - // See if we've been passed a return path to redirect to - $returnPath = $_REQUEST['return'] ?? ''; - if (!empty($returnPath)) { - $rand = '_=' . time() . (strpos($returnPath, '?') ? '&' : '?') . 'rand'; - DI::baseUrl()->redirect($returnPath . $rand); - } - - // the json doesn't really matter, it will either be 0 or 1 - echo json_encode((int)$starred); - exit(); - } -} diff --git a/static/routes.config.php b/static/routes.config.php index 6acad3827e..7d1d9a1bfc 100644 --- a/static/routes.config.php +++ b/static/routes.config.php @@ -294,6 +294,7 @@ return [ '/{id:\d+}/activity/{verb}' => [Module\Item\Activity::class, [ R::POST]], '/{id:\d+}/ignore' => [Module\Item\Ignore::class, [ R::POST]], '/{id:\d+}/pin' => [Module\Item\Pin::class, [ R::POST]], + '/{id:\d+}/star' => [Module\Item\Star::class, [ R::POST]], ], '/localtime' => [Module\Debug\Localtime::class, [R::GET, R::POST]], @@ -412,7 +413,6 @@ return [ '/rsd.xml' => [Module\ReallySimpleDiscovery::class, [R::GET]], '/smilies[/json]' => [Module\Smilies::class, [R::GET]], '/statistics.json' => [Module\Statistics::class, [R::GET]], - '/starred/{item:\d+}' => [Module\Starred::class, [R::GET]], '/toggle_mobile' => [Module\ToggleMobile::class, [R::GET]], '/tos' => [Module\Tos::class, [R::GET]], diff --git a/view/js/main.js b/view/js/main.js index d1976fdaa9..0b9c1da283 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -685,7 +685,7 @@ function dosubthread(ident) { function doStar(ident) { ident = ident.toString(); $('#like-rotator-' + ident).show(); - $.get('starred/' + ident) + $.post('item/' + ident + '/star') .then(function(data) { if (data.state === 1) { $('#starred-' + ident)