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

Merge pull request #7941 from gambtho/develop

Browse source 
When blocking a user, make them rest at the inn - fixes #7935
This commit is contained in:
Blade Barringer 2016-08-27 10:52:30 -05:00 committed by GitHub
commit e5f2a06491
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
test/api/v3/integration/hall/PUT-hall_heores_heroId.test.js
View file

@ -68,6 +68,7 @@ describe('PUT /heroes/:heroId', () => {
expect(hero.contributor.level).to.equal(1);
expect(hero.purchased.ads).to.equal(true);
expect(hero.auth.blocked).to.equal(true);
expect(hero.preferences.sleep).to.equal(true);
expect(hero.notifications.length).to.equal(1);
expect(hero.notifications[0].type).to.equal('NEW_CONTRIBUTOR_LEVEL');
});

5
website/server/controllers/api-v3/hall.js
View file

@ -169,7 +169,10 @@ api.updateHero = {
_.set(hero, updateData.itemPath, updateData.itemVal); // Sanitization at 5c30944 (deemed unnecessary)
}
if (updateData.auth && _.isBoolean(updateData.auth.blocked)) hero.auth.blocked = updateData.auth.blocked;
if (updateData.auth && _.isBoolean(updateData.auth.blocked)) {
hero.auth.blocked = updateData.auth.blocked;
hero.preferences.sleep = true; // when blocking, have them rest at an inn to prevent damage
}
if (updateData.flags && _.isBoolean(updateData.flags.chatRevoked)) hero.flags.chatRevoked = updateData.flags.chatRevoked;
let savedHero = await hero.save();