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

fix: #9149, incorrect client-side disableChatMessageEditing value for admins/gmods

Browse Source
This commit is contained in:
Julian Lam
2020-12-28 09:50:50 -05:00
parent 20c1b684ed
commit d27815a8c0
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/controllers/api.js
View File

@@ -22,7 +22,7 @@ const socketioOrigins = nconf.get('socket.io:origins');
const websocketAddress = nconf.get('socket.io:address') || ''; const websocketAddress = nconf.get('socket.io:address') || '';
apiController.loadConfig = async function (req) { apiController.loadConfig = async function (req) {
let config = { const config = {
relative_path, relative_path,
upload_url, upload_url,
assetBaseUrl: `${relative_path}/assets`, assetBaseUrl: `${relative_path}/assets`,
@@ -83,8 +83,12 @@ apiController.loadConfig = async function (req) {
}; };
let settings = config; let settings = config;
let isAdminOrGlobalMod;
if (req.loggedIn) { if (req.loggedIn) {
settings = await user.getSettings(req.uid); ([settings, isAdminOrGlobalMod] = await Promise.all([
user.getSettings(req.uid),
user.isAdminOrGlobalMod(req.uid),
]));
} }
// Handle old skin configs // Handle old skin configs
@@ -101,8 +105,11 @@ apiController.loadConfig = async function (req) {
config.categoryTopicSort = settings.categoryTopicSort || config.categoryTopicSort; config.categoryTopicSort = settings.categoryTopicSort || config.categoryTopicSort;
config.topicSearchEnabled = settings.topicSearchEnabled || false; config.topicSearchEnabled = settings.topicSearchEnabled || false;
config.bootswatchSkin = (meta.config.disableCustomUserSkins !== 1 && settings.bootswatchSkin && settings.bootswatchSkin !== '') ? settings.bootswatchSkin : ''; config.bootswatchSkin = (meta.config.disableCustomUserSkins !== 1 && settings.bootswatchSkin && settings.bootswatchSkin !== '') ? settings.bootswatchSkin : '';
config = await plugins.hooks.fire('filter:config.get', config);
return config; // Overrides based on privilege
config.disableChatMessageEditing = isAdminOrGlobalMod ? false : config.disableChatMessageEditing;
return await plugins.hooks.fire('filter:config.get', config);
}; };
apiController.getConfig = async function (req, res) { apiController.getConfig = async function (req, res) {