if there is no description tag add one, fix missing winston

src/meta/tags.js

@@ -1,46 +1,55 @@
+'use strict';
+
 var nconf = require('nconf'),
 	validator = require('validator'),
 	async = require('async'),
+	winston = require('winston'),
 	plugins = require('../plugins');
 
 module.exports = function(Meta) {
 	Meta.tags = {};
 
 	Meta.tags.parse = function(meta, link, callback) {
-		async.parallel([
+		async.parallel({
-			async.apply(plugins.fireHook, 'filter:meta.getMetaTags', [{
+			tags: function(next) {
-				name: 'viewport',
+				var defaultTags = [{
-				content: 'width=device-width, initial-scale=1.0, user-scalable=no'
+					name: 'viewport',
-			}, {
+					content: 'width=device-width, initial-scale=1.0, user-scalable=no'
-				name: 'content-type',
+				}, {
-				content: 'text/html; charset=UTF-8'
+					name: 'content-type',
-			}, {
+					content: 'text/html; charset=UTF-8'
-				name: 'apple-mobile-web-app-capable',
+				}, {
-				content: 'yes'
+					name: 'apple-mobile-web-app-capable',
-			}, {
+					content: 'yes'
-				property: 'og:site_name',
+				}, {
-				content: Meta.config.title || 'NodeBB'
+					property: 'og:site_name',
-			}, {
+					content: Meta.config.title || 'NodeBB'
-				name: 'keywords',
+				}, {
-				content: Meta.config.keywords || ''
+					name: 'keywords',
-			}, {
+					content: Meta.config.keywords || ''
-				name: 'msapplication-badge',
+				}, {
-				content: 'frequency=30; polling-uri=' + nconf.get('url') + '/sitemap.xml'
+					name: 'msapplication-badge',
-			}, {
+					content: 'frequency=30; polling-uri=' + nconf.get('url') + '/sitemap.xml'
-				name: 'msapplication-square150x150logo',
+				}, {
-				content: Meta.config['brand:logo'] || ''
+					name: 'msapplication-square150x150logo',
-			}]),
+					content: Meta.config['brand:logo'] || ''
-			async.apply(plugins.fireHook, 'filter:meta.getLinkTags', [{
+				}];
-				rel: "icon",
+				plugins.fireHook('filter:meta.getMetaTags', defaultTags, next);
-				type: "image/x-icon",
+			},
-				href: nconf.get('relative_path') + '/favicon.ico'
+			links: function(next) {
-			}, {
+				var defaultLinks = [{
-				rel: 'apple-touch-icon',
+					rel: "icon",
-				href: nconf.get('relative_path') + '/apple-touch-icon'
+					type: "image/x-icon",
-			}])
+					href: nconf.get('relative_path') + '/favicon.ico'
-		], function(err, tags) {
+				}, {
-			meta = tags[0].concat(meta || []).map(function(tag) {
+					rel: 'apple-touch-icon',
-				if(!tag || typeof tag.content !== 'string') {
+					href: nconf.get('relative_path') + '/apple-touch-icon'
+				}];
+				plugins.fireHook('filter:meta.getLinkTags', defaultLinks, next);
+			}
+		}, function(err, results) {
+			meta = results.tags.concat(meta || []).map(function(tag) {
+				if (!tag || typeof tag.content !== 'string') {
 					winston.warn('Invalid meta tag. ', tag);
 					return tag;
 				}
@@ -49,7 +58,9 @@ module.exports = function(Meta) {
 				return tag;
 			});
 
-			link = tags[1].concat(link || []);
+			addDescription(meta);
+
+			link = results.links.concat(link || []);
 
 			callback(null, {
 				meta: meta,
@@ -57,4 +68,20 @@ module.exports = function(Meta) {
 			});
 		});
 	};
+
+	function addDescription(meta) {
+		var hasDescription = false;
+		meta.forEach(function(tag) {
+			if (tag.name === 'description') {
+				hasDescription = true;
+			}
+		});
+
+		if (!hasDescription) {
+			meta.push({
+				name: 'description',
+				content: validator.escape(Meta.config.description || '')
+			});
+		}
+	}
 };