allow plugins to add new links to user profile menu

public/src/forum/account/header.js

@@ -15,12 +15,15 @@ define('forum/account/header', function() {
 			favouritesLink = $('#favouritesLink');
 
 		if (parseInt(yourid, 10) !== 0 && parseInt(yourid, 10) === parseInt(theirid, 10)) {
-			editLink.removeClass('hide');
+			$('#editLink, #settingsLink, #favouritesLink').removeClass('hide');
-			settingsLink.removeClass('hide');
+		} else {
-			favouritesLink.removeClass('hide');
+			$('.account-sub-links .plugin-link').each(function() {
+				$this = $(this);
+				$this.toggleClass('hide', $this.hasClass('private'));
+			});
 		}
 
-		if(app.isAdmin) {
+		if (app.isAdmin) {
 			editLink.removeClass('hide');
 		}
 	}

src/controllers/accounts.js

@@ -8,17 +8,17 @@ var fs = require('fs'),
 	nconf = require('nconf'),
 	async= require('async'),
 
-	user = require('./../user'),
+	user = require('../user'),
-	posts = require('./../posts'),
+	posts = require('../posts'),
-	topics = require('./../topics'),
+	topics = require('../topics'),
 	messaging = require('../messaging'),
 	postTools = require('../postTools'),
-	utils = require('./../../public/src/utils'),
+	utils = require('../../public/src/utils'),
-	meta = require('./../meta'),
+	meta = require('../meta'),
-	plugins = require('./../plugins'),
+	plugins = require('../plugins'),
-	languages = require('./../languages'),
+	languages = require('../languages'),
-	image = require('./../image'),
+	image = require('../image'),
-	file = require('./../file');
+	file = require('../file');
 
 function userNotFound(res) {
 	if (res.locals.isAPI) {
@@ -65,6 +65,9 @@ function getUserDataByUserSlug(userslug, callerUID, callback) {
 			},
 			ips: function(next) {
 				user.getIPs(uid, 4, next);
+			},
+			profile_links: function(next) {
+				plugins.fireHook('filter:user.profileLinks', [], next);
 			}
 		}, function(err, results) {
 			if(err || !results.userData) {
@@ -111,7 +114,7 @@ function getUserDataByUserSlug(userslug, callerUID, callback) {
 			userData.isSelf = parseInt(callerUID, 10) === parseInt(userData.uid, 10);
 			userData.disableSignatures = meta.config.disableSignatures !== undefined && parseInt(meta.config.disableSignatures, 10) === 1;
 			userData['email:confirmed'] = !!parseInt(userData['email:confirmed'], 10);
-
+			userData.profile_links = results.profile_links;
 
 			userData.followingCount = results.followStats.followingCount;
 			userData.followerCount = results.followStats.followerCount;
@@ -141,32 +144,33 @@ accountsController.getAccount = function(req, res, next) {
 			return userNotFound(res);
 		}
 
-		user.isFollowing(callerUID, userData.theirid, function (err, isFollowing) {
+		async.parallel({
+			isFollowing: function(next) {
+				user.isFollowing(callerUID, userData.theirid, next);
+			},
+			posts: function(next) {
+				posts.getPostsByUid(callerUID, userData.theirid, 0, 9, next);
+			},
+			signature: function(next) {
+				postTools.parse(userData.signature, next);
+			}
+		}, function(err, results) {
 			if(err) {
 				return next(err);
 			}
 
-			posts.getPostsByUid(callerUID, userData.theirid, 0, 9, function (err, userPosts) {
+			userData.posts = results.posts.posts.filter(function (p) {
-				if(err) {
+				return p && parseInt(p.deleted, 10) !== 1;
-					return next(err);
+			});
-				}
-
-				userData.posts = userPosts.posts.filter(function (p) {
-					return p && parseInt(p.deleted, 10) !== 1;
-				});
 
-				userData.isFollowing = isFollowing;
+			userData.isFollowing = results.isFollowing;
 
-				if (!userData.profileviews) {
+			if (!userData.profileviews) {
-					userData.profileviews = 1;
+				userData.profileviews = 1;
-				}
+			}
-
-				postTools.parse(userData.signature, function (err, signature) {
-					userData.signature = signature;
 
-					res.render('account/profile', userData);
+			userData.signature = results.signature;
-				});
+			res.render('account/profile', userData);
-			});
 		});
 	});
 };
@@ -209,36 +213,30 @@ function getFollow(route, name, req, res, next) {
 accountsController.getFavourites = function(req, res, next) {
 	var callerUID = req.user ? parseInt(req.user.uid, 10) : 0;
 
-	user.getUidByUserslug(req.params.userslug, function (err, uid) {
+	getBaseUser(req.params.userslug, function(err, userData) {
-		if (!uid) {
+		if (err) {
+			return next(err);
+		}
+
+		if (!userData) {
 			return userNotFound(res);
 		}
 
-		if (parseInt(uid, 10) !== callerUID) {
+		if (parseInt(userData.uid, 10) !== callerUID) {
 			return userNotAllowed(res);
 		}
 
-		user.getUserFields(uid, ['username', 'userslug'], function (err, userData) {
+		posts.getFavourites(userData.uid, 0, 9, function (err, favourites) {
 			if (err) {
 				return next(err);
 			}
 
-			if (!userData) {
+			userData.theirid = userData.uid;
-				return userNotFound(res);
+			userData.yourid = callerUID;
-			}
+			userData.posts = favourites.posts;
-
+			userData.nextStart = favourites.nextStart;
-			posts.getFavourites(uid, 0, 9, function (err, favourites) {
-				if (err) {
-					return next(err);
-				}
-
-				userData.theirid = uid;
-				userData.yourid = callerUID;
-				userData.posts = favourites.posts;
-				userData.nextStart = favourites.nextStart;
 
-				res.render('account/favourites', userData);
+			res.render('account/favourites', userData);
-			});
 		});
 	});
 };
@@ -304,7 +302,23 @@ function getBaseUser(userslug, callback) {
 			return callback(err);
 		}
 
-		user.getUserFields(uid, ['uid', 'username', 'userslug'], callback);
+		async.parallel({
+			user: function(next) {
+				user.getUserFields(uid, ['uid', 'username', 'userslug'], next);
+			},
+			profile_links: function(next) {
+				plugins.fireHook('filter:user.profileLinks', [], next);
+			}
+		}, function(err, results) {
+			if (err) {
+				return callback(err);
+			}
+			if (!results.user) {
+				return callback();
+			}
+			results.user.profile_links = results.profile_links;
+			callback(null, results.user);
+		});
 	});
 }
 
@@ -323,53 +337,37 @@ accountsController.accountEdit = function(req, res, next) {
 accountsController.accountSettings = function(req, res, next) {
 	var callerUID = req.user ? parseInt(req.user.uid, 10) : 0;
 
-	user.getUidByUserslug(req.params.userslug, function(err, uid) {
+	getBaseUser(req.params.userslug, function(err, userData) {
-
 		if (err) {
 			return next(err);
 		}
 
-		if (!uid) {
+		if (!userData) {
 			return userNotFound(res);
 		}
 
-		if (parseInt(uid, 10) !== callerUID) {
+		if (parseInt(userData.uid, 10) !== callerUID) {
 			return userNotAllowed(res);
 		}
 
-		plugins.fireHook('filter:user.settings', [], function(err, settings) {
+		async.parallel({
+			settings: function(next) {
+				plugins.fireHook('filter:user.settings', [], next);
+			},
+			languages: function(next) {
+				languages.list(next);
+			}
+		}, function(err, results) {
 			if (err) {
 				return next(err);
 			}
 
-			async.parallel({
+			userData.yourid = callerUID;
-				user: function(next) {
+			userData.theirid = userData.uid;
-					user.getUserFields(uid, ['username', 'userslug'], next);
+			userData.settings = results.settings;
-				},
+			userData.languages = results.languages;
-				languages: function(next) {
-					languages.list(next);
-				}
-			}, function(err, results) {
-				if (err) {
-					return next(err);
-				}
-
-				if(!results.user) {
-					return userNotFound(res);
-				}
 
-				results = {
+			res.render('account/settings', userData);
-					username: results.user.username,
-					userslug: results.user.userslug,
-					uid: uid,
-					yourid: req.user.uid,
-					theirid: uid,
-					settings: settings,
-					languages: results.languages
-				};
-
-				res.render('account/settings', results);
-			});
 		});
 	});
 };