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

Fix lint and test

Browse Source
This commit is contained in:
Phillip Thelen
2024-02-05 15:03:48 +01:00
committed by Sabe Jones
parent d11e95ab26
commit 93011f182f
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/api/unit/libs/content.test.js
View File

@@ -34,7 +34,7 @@ describe('contentLib', () => {
});
it('generates a hash for a filter', () => {
const hash = contentLib.hashForFilter('backgroundsFlat,gear.flat');
const hash = contentLib.hashForFilter(['backgroundsFlat', 'gear.flat']);
expect(hash).to.equal('-1791877526');
});
@@ -46,7 +46,7 @@ describe('contentLib', () => {
it('serves filtered content', () => {
const resSpy = generateRes();
contentLib.serveContent(resSpy, 'en', 'backgroundsFlat,gear.flat', false);
contentLib.serveContent(resSpy, 'en', ['backgroundsFlat', 'gear.flat'], false);
expect(resSpy.send).to.have.been.calledOnce;
});
@@ -81,7 +81,7 @@ describe('contentLib', () => {
});
it('caches filtered requests', async () => {
const filter = 'backgroundsFlat,gear.flat';
const filter = ['backgroundsFlat', 'gear.flat'];
const hash = contentLib.hashForFilter(filter);
expect(fs.existsSync(`${contentLib.CONTENT_CACHE_PATH}en${hash}.json`)).to.be.false;
contentLib.serveContent(resSpy, 'en', filter, true);
@@ -89,7 +89,7 @@ describe('contentLib', () => {
});
it('serves filtered cached requests', async () => {
const filter = 'backgroundsFlat,gear.flat';
const filter = ['backgroundsFlat', 'gear.flat'];
const hash = contentLib.hashForFilter(filter);
fs.writeFileSync(
`${contentLib.CONTENT_CACHE_PATH}en${hash}.json`,

20
website/server/controllers/api-v3/content.js
View File

@@ -7,10 +7,10 @@ const IS_PROD = nconf.get('IS_PROD');
const api = {};
const MOBILE_FILTER = ['achievements', 'questSeriesAchievements', 'animalColorAchievements', 'animalSetAchievements',
'stableAchievements', 'mystery', 'bundles', 'loginIncentives', 'pets', 'premiumPets', 'specialPets', 'questPets',
'wackyPets', 'mounts', 'premiumMounts,specialMounts,questMounts', 'events', 'dropEggs', 'questEggs', 'dropHatchingPotions',
'premiumHatchingPotions', 'wackyHatchingPotions', 'backgroundsFlat', 'questsByLevel', 'gear.tree', 'tasksByCategory',
'userDefaults', 'timeTravelStable', 'gearTypes', 'cardTypes'];
'stableAchievements', 'mystery', 'bundles', 'loginIncentives', 'pets', 'premiumPets', 'specialPets', 'questPets',
'wackyPets', 'mounts', 'premiumMounts,specialMounts,questMounts', 'events', 'dropEggs', 'questEggs', 'dropHatchingPotions',
'premiumHatchingPotions', 'wackyHatchingPotions', 'backgroundsFlat', 'questsByLevel', 'gear.tree', 'tasksByCategory',
'userDefaults', 'timeTravelStable', 'gearTypes', 'cardTypes'];
const ANDROID_FILTER = [...MOBILE_FILTER, 'appearances.background'];
const IOS_FILTER = [...MOBILE_FILTER, 'backgrounds'];
@@ -74,20 +74,20 @@ api.getContent = {
language = proposedLang;
}
let filter_list = [];
let filter = req.query.filter || '';
let filterList = [];
const filter = req.query.filter || '';
// apply defaults for mobile clients
if (filter === '') {
if (req.headers['x-client'] === 'habitica-android') {
filter_list = ANDROID_FILTER;
filterList = ANDROID_FILTER;
} else if (req.headers['x-client'] === 'habitica-ios') {
filter_list = IOS_FILTER;
filterList = IOS_FILTER;
}
} else {
filter_list = filter.split(',');
filterList = filter.split(',');
}
serveContent(res, language, filter_list, IS_PROD);
serveContent(res, language, filterList, IS_PROD);
},
};