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

Fixed send message for parties and added party seen message test

Browse Source
This commit is contained in:
Keith Holliday
2016-01-23 19:56:11 -06:00
parent 9405d4b054
commit ff034cf61b
2 changed files with 63 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,30 +3,65 @@ import {
} from '../../../../helpers/api-v3-integration.helper'; } from '../../../../helpers/api-v3-integration.helper';
describe('POST /groups/:id/chat/seen', () => { describe('POST /groups/:id/chat/seen', () => {
let groupWithChat, message, author, member; context('Guild', () => {
let guild, guildLeader, guildMember, guildMessage;
before(async () => { before(async () => {
let { group, groupLeader, members } = await createAndPopulateGroup({ let { group, groupLeader, members } = await createAndPopulateGroup({
groupDetails: { groupDetails: {
type: 'guild', type: 'guild',
privacy: 'public', privacy: 'public',
}, },
members: 1, members: 1,
});
guild = group;
guildLeader = groupLeader;
guildMember = members[0];
guildMessage = await guildLeader.post(`/groups/${guild._id}/chat`, { message: 'Some guild message' });
guildMessage = guildMessage.message;
}); });
groupWithChat = group; it('clears new messages for a guild', async () => {
author = groupLeader; let user = await guildMember.get('/user');
member = members[0];
message = await author.post(`/groups/${groupWithChat._id}/chat`, { message: 'Some message' }); await guildMember.post(`/groups/${guild._id}/chat/seen`);
message = message.message;
let guildThatHasSeenChat = await guildMember.get('/user');
expect(guildThatHasSeenChat.newMessages).to.be.empty;
});
}); });
it('clears new messages', async () => { context('Party', () => {
await member.post(`/groups/${groupWithChat._id}/chat/seen`); let party, partyLeader, partyMember, partyMessage;
let userThatHasSeenChat = await member.get('/user'); before(async () => {
let { group, groupLeader, members } = await createAndPopulateGroup({
groupDetails: {
type: 'party',
privacy: 'private',
},
members: 1,
});
expect(userThatHasSeenChat.newMessages).to.be.empty; party = group;
partyLeader = groupLeader;
partyMember = members[0];
partyMessage = await partyLeader.post(`/groups/${party._id}/chat`, { message: 'Some party message' });
partyMessage = partyMessage.message;
});
it('clears new messages for a party', async () => {
let user = await partyMember.get('/user');
await partyMember.post(`/groups/${party._id}/chat/seen`);
let partyMemberThatHasSeenChat = await partyMember.get('/user');
expect(partyMemberThatHasSeenChat.newMessages).to.be.empty;
});
}); });
}); });

15
website/src/models/group.js
View File

@@ -204,10 +204,17 @@ schema.methods.sendChat = function sendChat (message, user) {
// var profileNames = [] // get usernames from regex of @xyz. how to handle space-delimited profile names? // var profileNames = [] // get usernames from regex of @xyz. how to handle space-delimited profile names?
// User.update({'profile.name':{$in:profileNames}},lastSeenUpdate,{multi:true}).exec(); // User.update({'profile.name':{$in:profileNames}},lastSeenUpdate,{multi:true}).exec();
} else { } else {
User.update({ let query = {};
guilds: this._id,
_id: { $ne: user ? user._id : ''}, if (this.type === 'party') {
}, lastSeenUpdate, {multi: true}).exec(); query['party._id'] = this._id;
} else {
query.guilds = this._id;
}
query._id = { $ne: user ? user._id : ''};
User.update(query, lastSeenUpdate, {multi: true}).exec();
} }
}; };