Move GET pinned/{id} to POST item/{id}/pin

diff --git a/src/Module/Item/Pin.php b/src/Module/Item/Pin.php
new file mode 100644 (file)
index 0000000..d99b1a3
--- /dev/null
+++ b/src/Module/Item/Pin.php
@@ -0,0 +1,76 @@
+<?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\Network\HTTPException;
+
+/**
+ * Toggle pinned items
+ */
+class Pin 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']);
+
+               $pinned = !Item::getPinned($itemId, local_user());
+
+               Item::setPinned($itemId, local_user(), $pinned);
+
+               // 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'    => 'pin',
+                       'state'   => (int)$pinned,
+               ];
+
+               System::jsonExit($return);
+       }
+}

diff --git a/src/Module/Pinned.php b/src/Module/Pinned.php
deleted file mode 100644 (file)
index 97364ce..0000000
--- a/src/Module/Pinned.php
+++ /dev/null
@@ -1,60 +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;
-
-/**
- * Toggle pinned items
- */
-class Pinned 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']);
-
-               $pinned = !Item::getPinned($itemId, local_user());
-
-               Item::setPinned($itemId, local_user(), $pinned);
-
-               // 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)$pinned);
-               exit();
-       }
-}

diff --git a/static/routes.config.php b/static/routes.config.php
index 8108c24cdceffba1eb0e69c86a88fc441e9b6564..5a2ee2ffd1885578f5f01bc5d2b52de42be8e9e4 100644 (file)
--- a/static/routes.config.php
+++ b/static/routes.config.php
@@ -292,6 +292,7 @@ return [
 
        '/item'            => [
                '/ignore/{id}' => [Module\Item\Ignore::class, [R::GET]],
+               '/{id:\d+}/pin' => [Module\Item\Pin::class,       [        R::POST]],
        ],
 
        '/like/{item:\d+}'    => [Module\Like::class,            [R::GET]],
@@ -351,7 +352,6 @@ return [
                '/{type}/{customize}/{name}' => [Module\Photo::class, [R::GET]],
        ],
 
-       '/pinned/{item:\d+}' => [Module\Pinned::class,       [R::GET]],
        '/pretheme'          => [Module\ThemeDetails::class, [R::GET]],
        '/probe'             => [Module\Debug\Probe::class,  [R::GET]],
 

diff --git a/view/js/main.js b/view/js/main.js
index 089f780103610bea58b2fd318a6b195a5995380f..1503529d1fef06940834f2ef08cf511c7f2c3990 100644 (file)
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -704,9 +704,9 @@ function dostar(ident) {
 function doPin(ident) {
        ident = ident.toString();
        $('#like-rotator-' + ident).show();
-       $.get('pinned/' + ident)
+       $.post('item/' + ident + '/pin')
        .then(function(data) {
-               if (data.match(/1/)) {
+               if (data.state === 1) {
                        $('#pinned-' + ident)
                                .addClass('pinned')
                                .removeClass('unpinned');