Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-20 23:40:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

allow plugins to add new links to user profile menu

Browse Source
This commit is contained in:
barisusakli
2014-06-18 12:40:44 -04:00
parent 6f218857cb
commit f8afb8da3e
2 changed files with 88 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
public/src/forum/account/header.js
View File

@@ -15,12 +15,15 @@ define('forum/account/header', function() {
favouritesLink = $('#favouritesLink'); favouritesLink = $('#favouritesLink');
if (parseInt(yourid, 10) !== 0 && parseInt(yourid, 10) === parseInt(theirid, 10)) { 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'); editLink.removeClass('hide');
} }
} }

124
src/controllers/accounts.js
View File

@@ -8,17 +8,17 @@ var fs = require('fs'),
nconf = require('nconf'), nconf = require('nconf'),
async= require('async'), async= require('async'),
user = require('./../user'), user = require('../user'),
posts = require('./../posts'), posts = require('../posts'),
topics = require('./../topics'), topics = require('../topics'),
messaging = require('../messaging'), messaging = require('../messaging'),
postTools = require('../postTools'), 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) { function userNotFound(res) {
if (res.locals.isAPI) { if (res.locals.isAPI) {
@@ -65,6 +65,9 @@ function getUserDataByUserSlug(userslug, callerUID, callback) {
}, },
ips: function(next) { ips: function(next) {
user.getIPs(uid, 4, next); user.getIPs(uid, 4, next);
},
profile_links: function(next) {
plugins.fireHook('filter:user.profileLinks', [], next);
} }
}, function(err, results) { }, function(err, results) {
if(err || !results.userData) { if(err || !results.userData) {
@@ -111,7 +114,7 @@ function getUserDataByUserSlug(userslug, callerUID, callback) {
userData.isSelf = parseInt(callerUID, 10) === parseInt(userData.uid, 10); userData.isSelf = parseInt(callerUID, 10) === parseInt(userData.uid, 10);
userData.disableSignatures = meta.config.disableSignatures !== undefined && parseInt(meta.config.disableSignatures, 10) === 1; userData.disableSignatures = meta.config.disableSignatures !== undefined && parseInt(meta.config.disableSignatures, 10) === 1;
userData['email:confirmed'] = !!parseInt(userData['email:confirmed'], 10); userData['email:confirmed'] = !!parseInt(userData['email:confirmed'], 10);
userData.profile_links = results.profile_links;
userData.followingCount = results.followStats.followingCount; userData.followingCount = results.followStats.followingCount;
userData.followerCount = results.followStats.followerCount; userData.followerCount = results.followStats.followerCount;
@@ -141,34 +144,35 @@ accountsController.getAccount = function(req, res, next) {
return userNotFound(res); 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) { if(err) {
return next(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 next(err);
}
userData.posts = userPosts.posts.filter(function (p) {
return p && parseInt(p.deleted, 10) !== 1; 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 = results.signature;
userData.signature = signature;
res.render('account/profile', userData); res.render('account/profile', userData);
}); });
}); });
});
});
}; };
accountsController.getFollowing = function(req, res, next) { accountsController.getFollowing = function(req, res, next) {
@@ -209,16 +213,7 @@ function getFollow(route, name, req, res, next) {
accountsController.getFavourites = function(req, res, next) { accountsController.getFavourites = function(req, res, next) {
var callerUID = req.user ? parseInt(req.user.uid, 10) : 0; 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) {
return userNotFound(res);
}
if (parseInt(uid, 10) !== callerUID) {
return userNotAllowed(res);
}
user.getUserFields(uid, ['username', 'userslug'], function (err, userData) {
if (err) { if (err) {
return next(err); return next(err);
} }
@@ -227,12 +222,16 @@ accountsController.getFavourites = function(req, res, next) {
return userNotFound(res); return userNotFound(res);
} }
posts.getFavourites(uid, 0, 9, function (err, favourites) { if (parseInt(userData.uid, 10) !== callerUID) {
return userNotAllowed(res);
}
posts.getFavourites(userData.uid, 0, 9, function (err, favourites) {
if (err) { if (err) {
return next(err); return next(err);
} }
userData.theirid = uid; userData.theirid = userData.uid;
userData.yourid = callerUID; userData.yourid = callerUID;
userData.posts = favourites.posts; userData.posts = favourites.posts;
userData.nextStart = favourites.nextStart; userData.nextStart = favourites.nextStart;
@@ -240,7 +239,6 @@ accountsController.getFavourites = function(req, res, next) {
res.render('account/favourites', userData); res.render('account/favourites', userData);
}); });
}); });
});
}; };
accountsController.getPosts = function(req, res, next) { accountsController.getPosts = function(req, res, next) {
@@ -304,7 +302,23 @@ function getBaseUser(userslug, callback) {
return callback(err); 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,28 +337,22 @@ accountsController.accountEdit = function(req, res, next) {
accountsController.accountSettings = function(req, res, next) { accountsController.accountSettings = function(req, res, next) {
var callerUID = req.user ? parseInt(req.user.uid, 10) : 0; 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) { if (err) {
return next(err); return next(err);
} }
if (!uid) { if (!userData) {
return userNotFound(res); return userNotFound(res);
} }
if (parseInt(uid, 10) !== callerUID) { if (parseInt(userData.uid, 10) !== callerUID) {
return userNotAllowed(res); return userNotAllowed(res);
} }
plugins.fireHook('filter:user.settings', [], function(err, settings) {
if (err) {
return next(err);
}
async.parallel({ async.parallel({
user: function(next) { settings: function(next) {
user.getUserFields(uid, ['username', 'userslug'], next); plugins.fireHook('filter:user.settings', [], next);
}, },
languages: function(next) { languages: function(next) {
languages.list(next); languages.list(next);
@@ -354,22 +362,12 @@ accountsController.accountSettings = function(req, res, next) {
return next(err); return next(err);
} }
if(!results.user) { userData.yourid = callerUID;
return userNotFound(res); userData.theirid = userData.uid;
} userData.settings = results.settings;
userData.languages = results.languages;
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);
});
}); });
}); });
}; };