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

Optimise chat storage by not storing both equipped and costume (#14409)

Browse Source 
* don’t store both equipped and costume

* fix lint
This commit is contained in:
Phillip Thelen
2022-12-15 21:30:15 +01:00
committed by GitHub
parent cfdef760d5
commit 2c9ee04c6d
2 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
test/api/v3/integration/chat/POST-chat.test.js
View File

@@ -541,6 +541,35 @@ describe('POST /chat', () => {
.to.eql(userWithStyle.preferences.background);
});
it('creates equipped to user styles', async () => {
const userWithStyle = await generateUser({
'preferences.costume': false,
'auth.timestamps.created': new Date('2022-01-01'),
});
await userWithStyle.sync();
const message = await userWithStyle.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage });
expect(message.message.id).to.exist;
expect(message.message.userStyles.items.gear.equipped)
.to.eql(userWithStyle.items.gear.equipped);
expect(message.message.userStyles.items.gear.costume).to.not.exist;
});
it('creates costume to user styles', async () => {
const userWithStyle = await generateUser({
'preferences.costume': true,
'auth.timestamps.created': new Date('2022-01-01'),
});
await userWithStyle.sync();
const message = await userWithStyle.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage });
expect(message.message.id).to.exist;
expect(message.message.userStyles.items.gear.costume).to.eql(userWithStyle.items.gear.costume);
expect(message.message.userStyles.items.gear.equipped).to.not.exist;
});
it('adds backer info to chat', async () => {
const backerInfo = {
npc: 'Town Crier',

3
website/server/models/message.js
View File

@@ -67,8 +67,11 @@ export function setUserStyles (newMessage, user) {
if (userCopy.items) {
userStyles.items.gear = {};
if (userCopy.preferences && userCopy.preferences.costume) {
userStyles.items.gear.costume = { ...userCopy.items.gear.costume };
} else {
userStyles.items.gear.equipped = { ...userCopy.items.gear.equipped };
}
userStyles.items.currentMount = userCopy.items.currentMount;
userStyles.items.currentPet = userCopy.items.currentPet;