diff --git a/migrations/20130518_setup_groups.js b/migrations/20130518_setup_groups.js index 85f3bbb431..0e04bfa1b9 100644 --- a/migrations/20130518_setup_groups.js +++ b/migrations/20130518_setup_groups.js @@ -21,6 +21,16 @@ db.parties.renameCollection('groups',true); db.groups.update({}, {$set:{type:'party'}}, {multi:true}); +//migrate invitation mechanisms +db.users.update( + {}, + { + $remove:{party:1}, + $set:{invitations:{party:null,guilds:[]}} + }, + {multi:1} +); + tavern = db.tavern.findOne(); db.tavern.drop(); diff --git a/src/app/groups.coffee b/src/app/groups.coffee index d2d3989324..87242fc59b 100644 --- a/src/app/groups.coffee +++ b/src/app/groups.coffee @@ -12,14 +12,6 @@ module.exports.app = (appExports, model, app) -> user = model.at('_user') - model.on 'set', '_user.party.invitation', (after, before) -> - if !before? and after? # they just got invited - partyQ = model.query('groups').withId(after) - partyQ.fetch (err, party) -> - return next(err) if err - model.ref '_party', party - browser.resetDom(model) - appExports.groupCreate = (e,el) -> model.add('groups', name: model.get("_newGroup") @@ -29,33 +21,56 @@ module.exports.app = (appExports, model, app) -> , ->location.reload()) appExports.groupInvite = (e,el) -> - id = model.get('_groupInvitee').replace(/[\s"]/g, '') + uid = model.get('_groupInvitee').replace(/[\s"]/g, '') model.set '_groupInvitee', '' - return if _.isEmpty(id) + return if _.isEmpty(uid) - model.query('users').publicInfo([id]).fetch (err, profiles) -> + model.query('users').publicInfo([uid]).fetch (err, profiles) -> throw err if err - profile = profiles.at(0) - return model.set("_groupError", "User with id #{id} not found.") unless profile.get() + profile = profiles.at(0).get() + return model.set("_groupError", "User with id #{uid} not found.") unless profile + model.query('groups').withMember(uid).fetch (err, g) -> + throw err if err - invite = -> - $.bootstrapGrowl "Invitation Sent." - model.set("users.#{id}.party.invitation", e.get('id'), ->location.reload()) - if e.get('type') is 'party' - model.query('groups').withMember(id).fetch (err,groups) -> - if profile.get('party.invitation') or !_.isEmpty(groups.get()) - return model.set("_groupError", "User already in a party or pending invitation.") + {type, name} = e.get() + gid = e.get('id') + groups = g.get() + groupError =(msg) -> model.set("_groupError", msg) + invite = -> + debugger + $.bootstrapGrowl "Invitation Sent." + if type is 'guild' + model.push("users.#{uid}.invitations.guilds", {id:gid, name}, ->location.reload()) + else model.set "users.#{uid}.invitations.party", {id:gid, name}, -> + debugger + location.reload() + + if type is 'guild' + if _.find(profile.invitations.guilds, {id:gid}) + return groupError("User already invited to that group") + else if _.find groups, ((group)-> uid in group.members) + return groupError("User already in that group") else invite() - else invite() + if type is 'party' + if profile.invitations.party + return groupError("User already pending invitation.") + else if _.find(groups, {type:'party'}) + return groupError("User already in a party.") + else invite() - appExports.partyAccept = -> - partyId = user.get('party.invitation') - user.set 'party.invitation', null, -> - model.push("groups.#{partyId}.members", user.get('id'), ->location.reload()) + appExports.acceptInvitation = (e,el) -> + group = e.at().get() + pushMember = -> model.push("groups.#{group.id}.members", user.get('id'), ->location.reload()) + if $(el).attr('data-type') is 'party' + user.set 'invitations.party', null, pushMember + else + e.at().remove pushMember - appExports.partyReject = -> - user.set 'party.invitation', null - browser.resetDom(model) + appExports.rejectInvitation = (e, el) -> + clear = -> browser.resetDom(model) + if e.at().path().indexOf('party') != -1 + model.del e.at().path(), clear + else e.at().remove clear appExports.groupLeave = (e,el) -> members = e.get('members') diff --git a/src/app/index.coffee b/src/app/index.coffee index dcfdb9856b..f83c9dd18a 100644 --- a/src/app/index.coffee +++ b/src/app/index.coffee @@ -88,7 +88,7 @@ setupSubscriptions = (page, model, params, next, cb) -> groupsObj = groups.get() # (1) Solo player - return finished([selfQ, "groups.habitrpg"], ['_user', '_habitRPG']) if _.isEmpty(groupsObj) + return finished(["groups.habitrpg", selfQ], ['_habitRPG', '_user']) if _.isEmpty(groupsObj) ## (2) Party or Guild has members, fetch those users too # Subscribe to the groups themselves. We separate them by _party, _guilds, and _habitRPG (the "global" guild). diff --git a/src/server/store.coffee b/src/server/store.coffee index 5219ec7133..5d93b2dcf4 100644 --- a/src/server/store.coffee +++ b/src/server/store.coffee @@ -48,7 +48,7 @@ userAccess = (store) -> return accept(false) # we can only manually set this stuff in the database # public access to users.*.party.invitation (TODO, lock down a bit more) - if attrPath is 'party.invitation' + if attrPath.indexOf('invitations.') is 0 return accept(true) # Same session (user.id = this.session.userId) @@ -100,7 +100,7 @@ groupSystem = (store) -> @where("id").within(ids) .only('stats', 'items', - 'party', + 'invitations', 'profile', 'achievements', 'backer', diff --git a/views/app/challenges.html b/views/app/challenges.html index 1f631fbb31..a6bb089394 100644 --- a/views/app/challenges.html +++ b/views/app/challenges.html @@ -49,7 +49,7 @@
{#each _habitRPG.challenges as :challenge} - + {/}
diff --git a/views/app/groups.html b/views/app/groups.html index 57a7dbeb70..5870afe288 100644 --- a/views/app/groups.html +++ b/views/app/groups.html @@ -8,11 +8,13 @@
{#if _party.id} - {else if _user.party.invitation} + {else if _user.invitations.party} -

You're Invited To {_party.name}

- Accept - Reject +

You're Invited To {_user.invitations.party.name}

+ {#with _user.invitations.party} + Accept + Reject + {/} {else}

Create A Party

@@ -30,9 +32,16 @@ {/}
+
+ {#each _user.invitations.guilds as :invitation} +

You're Invited To {:invitation.name}

+ Accept + Reject + {/}
+ {#each _guilds as :guild}