Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #8077, show continue chat on all profile pages

Browse Source
This commit is contained in:
Baris Usakli
2019-12-05 14:56:01 -05:00
parent eb18c182a6
commit 7af1c873a3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/controllers/accounts/helpers.js
View File

@@ -11,6 +11,7 @@ const meta = require('../../meta');
const utils = require('../../utils'); const utils = require('../../utils');
const privileges = require('../../privileges'); const privileges = require('../../privileges');
const translator = require('../../translator'); const translator = require('../../translator');
const messaging = require('../../messaging');
const helpers = module.exports; const helpers = module.exports;
@@ -75,6 +76,7 @@ helpers.getUserDataByUserSlug = async function (userslug, callerUID) {
userData.canChangePassword = isAdmin || (isSelf && !meta.config['password:disableEdit']); userData.canChangePassword = isAdmin || (isSelf && !meta.config['password:disableEdit']);
userData.isSelf = isSelf; userData.isSelf = isSelf;
userData.isFollowing = results.isFollowing; userData.isFollowing = results.isFollowing;
userData.hasPrivateChat = results.hasPrivateChat;
userData.showHidden = isSelf || isAdmin || (isGlobalModerator && !results.isTargetAdmin); userData.showHidden = isSelf || isAdmin || (isGlobalModerator && !results.isTargetAdmin);
userData.groups = Array.isArray(results.groups) && results.groups.length ? results.groups[0] : []; userData.groups = Array.isArray(results.groups) && results.groups.length ? results.groups[0] : [];
userData.disableSignatures = meta.config.disableSignatures === 1; userData.disableSignatures = meta.config.disableSignatures === 1;
@@ -132,6 +134,7 @@ async function getAllData(uid, callerUID) {
canBanUser: privileges.users.canBanUser(callerUID, uid), canBanUser: privileges.users.canBanUser(callerUID, uid),
isBlocked: user.blocks.is(uid, callerUID), isBlocked: user.blocks.is(uid, callerUID),
canViewInfo: privileges.global.can('view:users:info', callerUID), canViewInfo: privileges.global.can('view:users:info', callerUID),
hasPrivateChat: messaging.hasPrivateChat(callerUID, uid),
}); });
} }

5
src/controllers/accounts/profile.js
View File

@@ -10,7 +10,6 @@ const plugins = require('../../plugins');
const meta = require('../../meta'); const meta = require('../../meta');
const accountHelpers = require('./helpers'); const accountHelpers = require('./helpers');
const helpers = require('../helpers'); const helpers = require('../helpers');
const messaging = require('../../messaging');
const utils = require('../../utils'); const utils = require('../../utils');
const profileController = module.exports; const profileController = module.exports;
@@ -33,8 +32,7 @@ profileController.get = async function (req, res, next) {
await incrementProfileViews(req, userData); await incrementProfileViews(req, userData);
const [hasPrivateChat, latestPosts, bestPosts] = await Promise.all([ const [latestPosts, bestPosts] = await Promise.all([
messaging.hasPrivateChat(req.uid, userData.uid),
getLatestPosts(req.uid, userData), getLatestPosts(req.uid, userData),
getBestPosts(req.uid, userData), getBestPosts(req.uid, userData),
posts.parseSignature(userData, req.uid), posts.parseSignature(userData, req.uid),
@@ -47,7 +45,6 @@ profileController.get = async function (req, res, next) {
userData.posts = latestPosts; // for backwards compat. userData.posts = latestPosts; // for backwards compat.
userData.latestPosts = latestPosts; userData.latestPosts = latestPosts;
userData.bestPosts = bestPosts; userData.bestPosts = bestPosts;
userData.hasPrivateChat = hasPrivateChat;
userData.breadcrumbs = helpers.buildBreadcrumbs([{ text: userData.username }]); userData.breadcrumbs = helpers.buildBreadcrumbs([{ text: userData.username }]);
userData.title = userData.username; userData.title = userData.username;
userData.allowCoverPicture = !userData.isSelf || !!meta.config['reputation:disabled'] || userData.reputation >= meta.config['min:rep:cover-picture']; userData.allowCoverPicture = !userData.isSelf || !!meta.config['reputation:disabled'] || userData.reputation >= meta.config['min:rep:cover-picture'];