]> git.mxchange.org Git - friendica.git/commitdiff
Move GET starred/{id} to POST item/{id}/star
authorHypolite Petovan <hypolite@mrpetovan.com>
Sat, 30 Jan 2021 22:52:01 +0000 (17:52 -0500)
committerHypolite Petovan <hypolite@mrpetovan.com>
Sun, 31 Jan 2021 19:21:57 +0000 (14:21 -0500)
src/Module/Item/Star.php [new file with mode: 0644]
src/Module/Starred.php [deleted file]
static/routes.config.php
view/js/main.js

diff --git a/src/Module/Item/Star.php b/src/Module/Item/Star.php
new file mode 100644 (file)
index 0000000..fb1a5d2
--- /dev/null
@@ -0,0 +1,82 @@
+<?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+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 (file)
index 8bc0fa3..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2020, Friendica
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-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();
-       }
-}
index 6acad3827ebd7dfb70cf0bf376e0364be525ea58..7d1d9a1bfcceb079958d1d92700e8421e3eaae60 100644 (file)
@@ -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]],
 
index d1976fdaa97cc36d1ff38345b339da7b9456bcf3..0b9c1da283e2a526c16f06071494ebb8bf729ecb 100644 (file)
@@ -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)