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

Preventing users from buying already gifted subscriber items (#7734)

Browse Source 
* Adding the unopened mystery items to the call to get not obtained subscriber items. closes #7712

* refactoring according to pr

* Refactoring according to pr. moved time-travelers to it's own file and added new tests.
This commit is contained in:
Travis
2016-12-15 08:00:49 -08:00
committed by Keith Holliday
parent 0817cf96e1
commit fa788f49fc
8 changed files with 79 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
website/common/script/content/index.js
View File

@@ -14,8 +14,6 @@ let api = module.exports;
import achievements from './achievements';
import mysterySets from './mystery-sets';
import eggs from './eggs';
import hatchingPotions from './hatching-potions';
import stable from './stable';
@@ -25,39 +23,19 @@ import appearances from './appearance';
import backgrounds from './appearance/backgrounds.js'
import spells from './spells';
import faq from './faq';
import timeTravelers from './time-travelers';
import loginIncentives from './loginIncentives';
api.achievements = achievements;
api.mystery = mysterySets;
api.itemList = ITEM_LIST;
api.gear = gear;
api.spells = spells;
/*
Time Traveler Store, mystery sets need their items mapped in
*/
_.each(api.mystery, function(v, k) {
return v.items = _.where(api.gear.flat, {
mystery: k
});
});
api.timeTravelerStore = function(owned) {
var ownedKeys;
ownedKeys = _.keys((typeof owned.toObject === "function" ? owned.toObject() : void 0) || owned);
return _.reduce(api.mystery, function(m, v, k) {
if (k === 'wondercon' || ~ownedKeys.indexOf(v.items[0].key)) {
return m;
}
m[k] = v;
return m;
}, {});
};
api.mystery = timeTravelers.mystery;
api.timeTravelerStore = timeTravelers.timeTravelerStore;
/*
---------------------------------------------------------------

31
website/common/script/content/time-travelers.js Normal file
View File

@@ -0,0 +1,31 @@
import _ from 'lodash';
import mysterySets from './mystery-sets';
import gear from './gear';
let mystery = mysterySets;
_.each(mystery, (v, k) => {
return v.items = _.where(gear.flat, {
mystery: k,
});
});
let timeTravelerStore = (user) => {
let ownedKeys;
let owned = user.items.gear.owned;
let unopenedGifts = user.purchased.plan.mysteryItems;
ownedKeys = _.keys((typeof owned.toObject === 'function' ? owned.toObject() : undefined) || owned);
ownedKeys = _.union(ownedKeys, unopenedGifts);
return _.reduce(mystery, (m, v, k) => {
if (k === 'wondercon' || ownedKeys.indexOf(v.items[0].key) !== -1) {
return m;
}
m[k] = v;
return m;
}, {});
};
module.exports = {
timeTravelerStore,
mystery,
};