krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Hotfix: moving pinned items (#12935)

Browse Source 
* increase checks for moving pinned items - fixes #10406

* allow to move official pinneditems

* using common object instead of method import
This commit is contained in:
negue
2021-01-26 00:40:18 +01:00
committed by GitHub
parent 91fc5a931c
commit 1bccbc03fa
3 changed files with 111 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
website/server/controllers/api-v3/user.js
View File

@@ -1716,7 +1716,7 @@ api.movePinnedItem = {
const { user } = res.locals;
const { path } = req.params;
const position = Number(req.params.position);
let position = Number(req.params.position);
// If something has been added or removed from the inAppRewards, we need
// to reset pinnedItemsOrder to have the correct length. Since inAppRewards
@@ -1727,17 +1727,28 @@ api.movePinnedItem = {
user.pinnedItemsOrder = currentPinnedItems.map(item => item.path);
}
const officialItems = common.getOfficialPinnedItems(user);
const itemExistInPinnedArray = user.pinnedItems.findIndex(item => item.path === path);
const itemExistInOfficialItems = officialItems.findIndex(item => item.path === path);
if (itemExistInPinnedArray === -1 && itemExistInOfficialItems === -1) {
throw new BadRequest(res.t('wrongItemPath', { path }, req.language));
}
// Adjust the order
const currentIndex = user.pinnedItemsOrder.findIndex(item => item === path);
const currentPinnedItemPath = user.pinnedItemsOrder[currentIndex];
if (currentIndex === -1) {
throw new BadRequest(res.t('wrongItemPath', { path }, req.language));
if (currentIndex !== -1) {
// Remove the one we will move
user.pinnedItemsOrder.splice(currentIndex, 1);
} else {
// usually the array would be already fixed by the inAppRewards call
// but it seems something didn't work out
position = Math.min(position, user.pinnedItemsOrder.length - 1);
}
// Remove the one we will move
user.pinnedItemsOrder.splice(currentIndex, 1);
// reinsert the item in position (or just at the end)
if (position === -1) {
user.pinnedItemsOrder.push(currentPinnedItemPath);