feat: #7743 meta/tags.js

src/meta/tags.js

@@ -1,19 +1,17 @@
 'use strict';
 
-var nconf = require('nconf');
-var async = require('async');
-var winston = require('winston');
+const nconf = require('nconf');
+const winston = require('winston');
 
-var plugins = require('../plugins');
-var Meta = require('../meta');
-var utils = require('../utils');
+const plugins = require('../plugins');
+const Meta = require('../meta');
+const utils = require('../utils');
 
-var Tags = module.exports;
+const Tags = module.exports;
 
-Tags.parse = function (req, data, meta, link, callback) {
-	async.parallel({
-		tags: function (next) {
-			var defaultTags = [{
+Tags.parse = async (req, data, meta, link) => {
+	// Meta tags
+	const defaultTags = [{
 		name: 'viewport',
 		content: 'width=device-width, initial-scale=1.0',
 	}, {
@@ -50,9 +48,7 @@ Tags.parse = function (req, data, meta, link, callback) {
 		});
 	}
 
-			plugins.fireHook('filter:meta.getMetaTags', { req: req, data: data, tags: defaultTags }, next);
-		},
-		links: function (next) {
+	// Link Tags
 	var defaultLinks = [{
 		rel: 'icon',
 		type: 'image/x-icon',
@@ -102,12 +98,11 @@ Tags.parse = function (req, data, meta, link, callback) {
 			href: nconf.get('relative_path') + nconf.get('upload_url') + '/system/touchicon-192.png',
 		});
 	}
-			plugins.fireHook('filter:meta.getLinkTags', { req: req, data: data, links: defaultLinks }, next);
-		},
-	}, async function (err, results) {
-		if (err) {
-			return callback(err);
-		}
+
+	const results = await utils.promiseParallel({
+		tags: plugins.fireHook('filter:meta.getMetaTags', { req: req, data: data, tags: defaultTags }),
+		links: plugins.fireHook('filter:meta.getLinkTags', { req: req, data: data, links: defaultLinks }),
+	});
 
 	meta = results.tags.tags.concat(meta || []).map(function (tag) {
 		if (!tag || typeof tag.content !== 'string') {
@@ -132,11 +127,10 @@ Tags.parse = function (req, data, meta, link, callback) {
 
 	link = results.links.links.concat(link || []);
 
-		callback(null, {
+	return {
 		meta: meta,
 		link: link,
-		});
-	});
+	};
 };
 
 function addIfNotExists(meta, keyName, tagName, value) {