sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-04-14 19:47:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add end date to seasonal gear in market

Browse source
This commit is contained in:
Phillip Thelen 2024-05-22 15:47:02 +02:00
parent 2303d5de32
commit 88a0b57335
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
test/common/libs/shops.test.js
View file

@ -150,6 +150,16 @@ describe('shops', () => {
expect(rogueItems.length, 'Rogue seasonal gear').to.eql(4);
});
it('seasonal gear contains end date', () => {
const categories = shared.shops.getMarketGearCategories(user);
categories.forEach(category => {
category.items.filter(x => x.key.indexOf('spring2024') !== -1).forEach(item => {
expect(item.end, item.key).to.exist;
});
});
});
it('only shows gear for the current season', () => {
const categories = shared.shops.getMarketGearCategories(user);
categories.forEach(category => {

9
website/common/script/libs/shops.js
View file

@ -148,6 +148,8 @@ shops.getMarketGearCategories = function getMarketGear (user, language) {
const officialPinnedItems = getOfficialPinnedItems(user);
const { pinnedSets } = seasonalShopConfig();
const gearMatcher = getScheduleMatchingGroup('seasonalGear');
for (const classType of content.classes) {
const category = {
identifier: classType,
@ -164,7 +166,12 @@ shops.getMarketGearCategories = function getMarketGear (user, language) {
return false;
});
category.items = map(result, e => getItemInfo(user, 'marketGear', e, officialPinnedItems));
category.items = map(result, e => {
if (e.set === pinnedSets[e.specialClass]) {
return getItemInfo(user, 'marketGear', e, officialPinnedItems, language, gearMatcher);
}
return getItemInfo(user, 'marketGear', e, officialPinnedItems);
});
const specialGear = filter(content.gear.flat, gear => user.items.gear.owned[gear.key] === false
&& gear.specialClass === classType