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

v3 client: fix ability to send cards

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-05-17 17:35:49 +02:00
parent bb6809fd6b
commit d293b2d6ee
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common/script/content/spells.js
View File

@@ -396,7 +396,10 @@ spells.special = {
if (!target.items.special.nyeReceived) target.items.special.nyeReceived = []; if (!target.items.special.nyeReceived) target.items.special.nyeReceived = [];
target.items.special.nyeReceived.push(user.profile.name); target.items.special.nyeReceived.push(user.profile.name);
if (!target.flags) target.flags = {};
target.flags.cardReceived = true; target.flags.cardReceived = true;
user.stats.gp -= 10; user.stats.gp -= 10;
}, },
}, },
@@ -421,7 +424,10 @@ spells.special = {
if (!target.items.special.valentineReceived) target.items.special.valentineReceived = []; if (!target.items.special.valentineReceived) target.items.special.valentineReceived = [];
target.items.special.valentineReceived.push(user.profile.name); target.items.special.valentineReceived.push(user.profile.name);
if (!target.flags) target.flags = {};
target.flags.cardReceived = true; target.flags.cardReceived = true;
user.stats.gp -= 10; user.stats.gp -= 10;
}, },
}, },
@@ -445,7 +451,10 @@ spells.special = {
if (!target.items.special.greetingReceived) target.items.special.greetingReceived = []; if (!target.items.special.greetingReceived) target.items.special.greetingReceived = [];
target.items.special.greetingReceived.push(user.profile.name); target.items.special.greetingReceived.push(user.profile.name);
if (!target.flags) target.flags = {};
target.flags.cardReceived = true; target.flags.cardReceived = true;
user.stats.gp -= 10; user.stats.gp -= 10;
}, },
}, },
@@ -470,7 +479,10 @@ spells.special = {
if (!target.items.special.thankyouReceived) target.items.special.thankyouReceived = []; if (!target.items.special.thankyouReceived) target.items.special.thankyouReceived = [];
target.items.special.thankyouReceived.push(user.profile.name); target.items.special.thankyouReceived.push(user.profile.name);
if (!target.flags) target.flags = {};
target.flags.cardReceived = true; target.flags.cardReceived = true;
user.stats.gp -= 10; user.stats.gp -= 10;
}, },
}, },
@@ -492,9 +504,13 @@ spells.special = {
u.achievements.birthday++; u.achievements.birthday++;
}); });
} }
if (!target.items.special.birthdayReceived) target.items.special.birthdayReceived = []; if (!target.items.special.birthdayReceived) target.items.special.birthdayReceived = [];
target.items.special.birthdayReceived.push(user.profile.name); target.items.special.birthdayReceived.push(user.profile.name);
if (!target.flags) target.flags = {};
target.flags.cardReceived = true; target.flags.cardReceived = true;
user.stats.gp -= 10; user.stats.gp -= 10;
}, },
}, },

8
website/client/js/services/chatServices.js
View File

@@ -70,6 +70,10 @@ angular.module('habitrpg')
}); });
} }
function clearCards () {
User.user._wrapped && User.set({'flags.cardReceived':false});
}
return { return {
getChat: getChat, getChat: getChat,
postChat: postChat, postChat: postChat,
@@ -80,8 +84,4 @@ angular.module('habitrpg')
markChatSeen: markChatSeen, markChatSeen: markChatSeen,
clearCards: clearCards, clearCards: clearCards,
} }
function clearCards() {
User.user._wrapped && User.set({'flags.cardReceived':false});
}
}]); }]);

5
website/server/controllers/api-v3/chat.js
View File

@@ -327,8 +327,9 @@ api.seenChat = {
let validationErrors = req.validationErrors(); let validationErrors = req.validationErrors();
if (validationErrors) throw validationErrors; if (validationErrors) throw validationErrors;
let group = await Group.getGroup({user, groupId}); // Do not validate group existence, it doesn't really matter and make it works if the group gets deleted
if (!group) throw new NotFound(res.t('groupNotFound')); // let group = await Group.getGroup({user, groupId});
// if (!group) throw new NotFound(res.t('groupNotFound'));
let update = {$unset: {}}; let update = {$unset: {}};
update.$unset[`newMessages.${groupId}`] = true; update.$unset[`newMessages.${groupId}`] = true;