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

Changed invite to RSVPNeeded

Browse Source
This commit is contained in:
hairlessbear
2015-05-27 09:18:05 -04:00
parent 0fa93506f5
commit cfcfb8fd02
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/public/js/controllers/notificationCtrl.js
View File

@@ -148,7 +148,7 @@ habitrpg.controller('NotificationCtrl',
}); });
// Quest invitation modal // Quest invitation modal
$rootScope.$watch('user.party.quest.invited == true', function(after, before){ $rootScope.$watch('user.party.quest.RSVPNeeded == true', function(after, before){
if (after != true) return; if (after != true) return;
$rootScope.party.$get(); $rootScope.party.$get();
$rootScope.openModal('questInvitation'); $rootScope.openModal('questInvitation');

8
website/src/controllers/groups.js
View File

@@ -912,7 +912,7 @@ api.questAccept = function(req, res, next) {
group.quest.members[m] = true; group.quest.members[m] = true;
group.quest.leader = user._id; group.quest.leader = user._id;
} else { } else {
User.update({_id:m},{$set: {'party.quest.invited': true}}).exec(); User.update({_id:m},{$set: {'party.quest.RSVPNeeded': true}}).exec();
group.quest.members[m] = undefined; group.quest.members[m] = undefined;
User.findById(m, function(err,groupMember){ User.findById(m, function(err,groupMember){
@@ -948,7 +948,7 @@ api.questAccept = function(req, res, next) {
} else { } else {
if (!group.quest.key) return res.json(400,{err:'No quest invitation has been sent out yet.'}); if (!group.quest.key) return res.json(400,{err:'No quest invitation has been sent out yet.'});
group.quest.members[user._id] = true; group.quest.members[user._id] = true;
User.update({_id:user._id}, {$set: {'party.quest.invited': false}}).exec(); User.update({_id:user._id}, {$set: {'party.quest.RSVPNeeded': false}}).exec();
questStart(req,res,next); questStart(req,res,next);
} }
} }
@@ -959,7 +959,7 @@ api.questReject = function(req, res, next) {
if (!group.quest.key) return res.json(400,{err:'No quest invitation has been sent out yet.'}); if (!group.quest.key) return res.json(400,{err:'No quest invitation has been sent out yet.'});
group.quest.members[user._id] = false; group.quest.members[user._id] = false;
User.update({_id:user._id}, {$set: {'party.quest.invited': false}}).exec(); User.update({_id:user._id}, {$set: {'party.quest.RSVPNeeded': false}}).exec();
questStart(req,res,next); questStart(req,res,next);
} }
@@ -978,7 +978,7 @@ api.questCancel = function(req, res, next){
group.markModified('quest'); group.markModified('quest');
group.save(cb); group.save(cb);
_.each(group.members, function(m){ _.each(group.members, function(m){
User.update({_id:m}, {$set: {'party.quest.invited': false}}).exec(); User.update({_id:m}, {$set: {'party.quest.RSVPNeeded': false}}).exec();
}); });
} }
} }

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

@@ -142,7 +142,7 @@ var cleanQuestProgress = function(merge){
collect: {} collect: {}
}, },
completed: null, completed: null,
invited: false RSVPNeeded: false
}; };
merge = merge || {progress:{}}; merge = merge || {progress:{}};
_.merge(clean, _.omit(merge,'progress')); _.merge(clean, _.omit(merge,'progress'));

2
website/src/models/user.js
View File

@@ -281,7 +281,7 @@ var UserSchema = new Schema({
collect: {type: Schema.Types.Mixed, 'default': {}} // {feather:1, ingot:2} collect: {type: Schema.Types.Mixed, 'default': {}} // {feather:1, ingot:2}
}, },
completed: String, // When quest is done, we move it from key => completed, and it's a one-time flag (for modal) that they unset by clicking "ok" in browser completed: String, // When quest is done, we move it from key => completed, and it's a one-time flag (for modal) that they unset by clicking "ok" in browser
invited: {type: Boolean, 'default': false} // Set to true when invite is pending, set to false when quest invite is accepted or rejected RSVPNeeded: {type: Boolean, 'default': false} // Set to true when invite is pending, set to false when quest invite is accepted or rejected, quest starts, or quest is cancelled
} }
}, },
preferences: { preferences: {