friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

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

This commit is contained in:
Hypolite Petovan 2021-01-30 18:42:23 -05:00
parent b3b2bc96ba
commit 188f7b0eb0
3 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/Module/Pinned.php → src/Module/Item/Pin.php
View File

@ -19,42 +19,58 @@
* *
*/ */
namespace Friendica\Module; namespace Friendica\Module\Item;
use Friendica\BaseModule; use Friendica\BaseModule;
use Friendica\Core\Session;
use Friendica\Core\System;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Network\HTTPException;
/** /**
* Toggle pinned items * Toggle pinned items
*/ */
class Pinned extends BaseModule class Pin extends BaseModule
{ {
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
if (!local_user()) { $l10n = DI::l10n();
throw new \Friendica\Network\HTTPException\ForbiddenException();
if (!Session::isAuthenticated()) {
throw new HttpException\ForbiddenException($l10n->t('Access denied.'));
} }
if (empty($parameters['item'])) { if (empty($parameters['id'])) {
throw new \Friendica\Network\HTTPException\BadRequestException(); throw new HTTPException\BadRequestException();
} }
$itemId = intval($parameters['item']); $itemId = intval($parameters['id']);
$pinned = !Item::getPinned($itemId, local_user()); $pinned = !Item::getPinned($itemId, local_user());
Item::setPinned($itemId, local_user(), $pinned); Item::setPinned($itemId, local_user(), $pinned);
// See if we've been passed a return path to redirect to // See if we've been passed a return path to redirect to
$returnPath = $_REQUEST['return'] ?? ''; $return_path = $_REQUEST['return'] ?? '';
if (!empty($returnPath)) { if (!empty($return_path)) {
$rand = '_=' . time() . (strpos($returnPath, '?') ? '&' : '?') . 'rand'; $rand = '_=' . time();
DI::baseUrl()->redirect($returnPath . $rand); if (strpos($return_path, '?')) {
$rand = "&$rand";
} else {
$rand = "?$rand";
}
DI::baseUrl()->redirect($return_path . $rand);
} }
// the json doesn't really matter, it will either be 0 or 1 $return = [
echo json_encode((int)$pinned); 'status' => 'ok',
exit(); 'item_id' => $itemId,
'verb' => 'pin',
'state' => (int)$pinned,
];
System::jsonExit($return);
} }
} }

2
static/routes.config.php
View File

@ -292,6 +292,7 @@ return [
'/item' => [ '/item' => [
'/ignore/{id}' => [Module\Item\Ignore::class, [R::GET]], '/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]], '/like/{item:\d+}' => [Module\Like::class, [R::GET]],
@ -351,7 +352,6 @@ return [
'/{type}/{customize}/{name}' => [Module\Photo::class, [R::GET]], '/{type}/{customize}/{name}' => [Module\Photo::class, [R::GET]],
], ],
'/pinned/{item:\d+}' => [Module\Pinned::class, [R::GET]],
'/pretheme' => [Module\ThemeDetails::class, [R::GET]], '/pretheme' => [Module\ThemeDetails::class, [R::GET]],
'/probe' => [Module\Debug\Probe::class, [R::GET]], '/probe' => [Module\Debug\Probe::class, [R::GET]],

4
view/js/main.js
View File

@ -704,9 +704,9 @@ function dostar(ident) {
function doPin(ident) { function doPin(ident) {
ident = ident.toString(); ident = ident.toString();
$('#like-rotator-' + ident).show(); $('#like-rotator-' + ident).show();
$.get('pinned/' + ident) $.post('item/' + ident + '/pin')
.then(function(data) { .then(function(data) {
if (data.match(/1/)) { if (data.state === 1) {
$('#pinned-' + ident) $('#pinned-' + ident)
.addClass('pinned') .addClass('pinned')
.removeClass('unpinned'); .removeClass('unpinned');