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

autofix pinned seasonal gear - fixes #9448 (#9570)

Browse Source 
* auto-remove officialPinned item from userPinned-array on pinning

* hide event limited message if an item was already owned by the user
This commit is contained in:
negue
2017-11-28 09:11:40 +01:00
committed by Matteo Pagliazzi
parent 218664dfcc
commit f1e200c0f5
3 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
website/common/script/ops/pinnedGearUtils.js
View File

@@ -16,6 +16,17 @@ let sortOrder = reduce(content.gearTypes, (accumulator, val, key) => {
return accumulator;
}, {});
/**
* Returns the index if found
* @param Array array
* @param String path
*/
function pathExistsInArray (array, path) {
return array.findIndex(item => {
return item.path === path;
});
}
function selectGearToPin (user) {
let changes = [];
@@ -32,9 +43,7 @@ function selectGearToPin (user) {
function addPinnedGear (user, type, path) {
const foundIndex = user.pinnedItems.findIndex(pinnedItem => {
return pinnedItem.path === path;
});
const foundIndex = pathExistsInArray(user.pinnedItems, path);
if (foundIndex === -1) {
user.pinnedItems.push({
@@ -55,9 +64,7 @@ function addPinnedGearByClass (user) {
}
function removeItemByPath (user, path) {
const foundIndex = user.pinnedItems.findIndex(pinnedItem => {
return pinnedItem.path === path;
});
const foundIndex = pathExistsInArray(user.pinnedItems, path);
if (foundIndex >= 0) {
user.pinnedItems.splice(foundIndex, 1);
@@ -148,9 +155,7 @@ function togglePinnedItem (user, {item, type, path}, req = {}) {
throw new BadRequest(i18n.t('cannotUnpinArmoirPotion', req.language));
}
let isOfficialPinned = officialPinnedItems.find(officialPinnedItem => {
return officialPinnedItem.path === path;
}) !== undefined;
const isOfficialPinned = pathExistsInArray(officialPinnedItems, path) !== -1;
if (isOfficialPinned) {
arrayToChange = user.unpinnedItems;
@@ -158,9 +163,16 @@ function togglePinnedItem (user, {item, type, path}, req = {}) {
arrayToChange = user.pinnedItems;
}
const foundIndex = arrayToChange.findIndex(pinnedItem => {
return pinnedItem.path === path;
});
if (isOfficialPinned) {
// if an offical item is also present in the user.pinnedItems array
const itemInUserItems = pathExistsInArray(user.pinnedItems, path);
if (itemInUserItems !== -1) {
removeItemByPath(user, path);
}
}
const foundIndex = pathExistsInArray(arrayToChange, path);
if (foundIndex >= 0) {
arrayToChange.splice(foundIndex, 1);