From e5c002bcdb417d260a29afebbaaa22eb3ff6dbce Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Sun, 29 Jun 2014 16:20:38 -0600 Subject: [PATCH] feat(chat): dynamic list of tavern mods (see http://goo.gl/9XhIZ6) --- src/middleware.js | 1 + src/models/user.js | 4 ++++ views/options/social/tavern.jade | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/middleware.js b/src/middleware.js index 184b23f189..409f829668 100644 --- a/src/middleware.js +++ b/src/middleware.js @@ -168,6 +168,7 @@ module.exports.locals = function(req, res, next) { }, siteVersion: siteVersion, Content: shared.content, + mods: require('./models/user').mods, tavern: tavern, // for world boss worldDmg: (tavern && tavern.quest && tavern.quest.extra && tavern.quest.extra.worldDmg) || {} diff --git a/src/models/user.js b/src/models/user.js index df0789fae2..4dd29c35ec 100644 --- a/src/models/user.js +++ b/src/models/user.js @@ -442,3 +442,7 @@ UserSchema.methods.unlink = function(options, cb) { module.exports.schema = UserSchema; module.exports.model = mongoose.model("User", UserSchema); + +mongoose.model("User").find({'contributor.admin':true},function(err,mods){ + module.exports.mods = _.map(mods,function(m){return ' '+ m.profile.name}); +}); \ No newline at end of file diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade index bb3ecf7ce8..a7b7a12014 100644 --- a/views/options/social/tavern.jade +++ b/views/options/social/tavern.jade @@ -129,6 +129,6 @@ h3=env.t('tavernTalk') include ./chat-box .alert.alert-info.alert-sm - != ' ' + env.t('tavernAlert1') + ' ' + env.t('tavernAlert2') + '.
' + env.t('moderatorIntro1') + env.t('moderatorList') + env.t('moderatorIntro2') + != ' ' + env.t('tavernAlert1') + ' ' + env.t('tavernAlert2') + '.
' + env.t('moderatorIntro1') + env.mods + env.t('moderatorIntro2') ul.list-unstyled.tavern-chat include ./chat-message