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

Adjust tavern export to send over only quest object

Browse Source
This commit is contained in:
Blade Barringer
2015-10-08 07:45:25 -05:00
parent aba3908170
commit 9e88d17a78
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
website/src/middlewares/locals.js
View File

@@ -6,7 +6,7 @@ var i18n = require('../i18n.js');
var buildManifest = require('../libs/buildManifest'); var buildManifest = require('../libs/buildManifest');
var shared = require('../../../common'); var shared = require('../../../common');
var forceRefresh = require('./forceRefresh'); var forceRefresh = require('./forceRefresh');
var tavern = require('../models/group').tavern; var tavernQuest = require('../models/group').tavernQuest;
var mods = require('../models/user').mods; var mods = require('../models/user').mods;
// To avoid stringifying more data then we need, // To avoid stringifying more data then we need,
@@ -21,7 +21,6 @@ var env = {
getBuildUrl: buildManifest.getBuildUrl, getBuildUrl: buildManifest.getBuildUrl,
_: _, _: _,
clientVars: clientVars, clientVars: clientVars,
tavern: tavern, // for world boss
mods: mods, mods: mods,
Content: shared.content, Content: shared.content,
siteVersion: forceRefresh.siteVersion, siteVersion: forceRefresh.siteVersion,
@@ -53,9 +52,9 @@ module.exports = function(req, res, next) {
args.push(language.code); args.push(language.code);
return shared.i18n.t.apply(null, args); return shared.i18n.t.apply(null, args);
}, },
// Defined here and not outside of the middleware because tavern might be an // Defined here and not outside of the middleware because tavernQuest might be an
// empty object until the query to fetch it finishes // empty object until the query to fetch it finishes
worldDmg: (tavern && tavern.quest && tavern.quest.extra && tavern.quest.extra.worldDmg) || {}, worldDmg: (tavernQuest && tavernQuest.extra && tavernQuest.extra.worldDmg) || {},
}); });
// Put query-string party (& guild but use partyInvite for backward compatibility) // Put query-string party (& guild but use partyInvite for backward compatibility)

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

@@ -269,12 +269,13 @@ GroupSchema.statics.collectQuest = function(user, progress, cb) {
} }
// to set a boss: `db.groups.update({_id:'habitrpg'},{$set:{quest:{key:'dilatory',active:true,progress:{hp:1000,rage:1500}}}})` // to set a boss: `db.groups.update({_id:'habitrpg'},{$set:{quest:{key:'dilatory',active:true,progress:{hp:1000,rage:1500}}}})`
module.exports.tavern = {}; module.exports.tavernQuest = {};
var tavernQ = {_id:'habitrpg','quest.key':{$ne:null}}; var tavernQ = {_id:'habitrpg','quest.key':{$ne:null}};
process.nextTick(function(){ process.nextTick(function(){
mongoose.model('Group').findOne(tavernQ,function(err,tavern){ mongoose.model('Group').findOne(tavernQ, function(err,tavern){
// Using _assign so we don't lose the reference to the exported tavern var quest = tavern.quest.toObject();
_.assign(module.exports.tavern, tavern); // Using _assign so we don't lose the reference to the exported tavernQuest
_.assign(module.exports.tavernQuest, quest);
}); });
}); });
@@ -291,7 +292,7 @@ GroupSchema.statics.tavernBoss = function(user,progress) {
}, },
function(tavern,cb){ function(tavern,cb){
if (!(tavern && tavern.quest && tavern.quest.key)) return cb(true); if (!(tavern && tavern.quest && tavern.quest.key)) return cb(true);
module.exports.tavern = tavern; module.exports.tavernQuest = tavern.quest.toObject();
var quest = shared.content.quests[tavern.quest.key]; var quest = shared.content.quests[tavern.quest.key];
if (tavern.quest.progress.hp <= 0) { if (tavern.quest.progress.hp <= 0) {