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

fix: purge uploaded images accordingly #9606 (#9611)

Browse Source 
* fix: purge uploaded images accordingly

* fix: tests

* fix: relative paths
This commit is contained in:
gasoved
2021-06-18 16:21:23 +03:00
committed by GitHub
parent ab5e2a4163
commit 8168c6c407
7 changed files with 149 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/socket.io/user/picture.js
View File

@@ -1,11 +1,7 @@
'use strict';
const path = require('path');
const nconf = require('nconf');
const user = require('../../user');
const plugins = require('../../plugins');
const file = require('../../file');
module.exports = function (SocketUser) {
SocketUser.changePicture = async function (socket, data) {
@@ -50,18 +46,8 @@ module.exports = function (SocketUser) {
throw new Error('[[error:invalid-data]]');
}
await user.isAdminOrSelf(socket.uid, data.uid);
const userData = await user.getUserFields(data.uid, ['uploadedpicture', 'picture']);
if (userData.uploadedpicture && !userData.uploadedpicture.startsWith('http')) {
const pathToFile = path.join(nconf.get('base_dir'), 'public', userData.uploadedpicture);
if (pathToFile.startsWith(nconf.get('upload_path'))) {
file.delete(pathToFile);
}
}
await user.setUserFields(data.uid, {
uploadedpicture: '',
// if current picture is uploaded picture, reset to user icon
picture: userData.uploadedpicture === userData.picture ? '' : userData.picture,
});
// 'keepAllUserImages' is ignored, since there is explicit user intent
const userData = await user.removeProfileImage(data.uid);
plugins.hooks.fire('action:user.removeUploadedPicture', {
callerUid: socket.uid,
uid: data.uid,

3
src/socket.io/user/profile.js
View File

@@ -46,6 +46,7 @@ module.exports = function (SocketUser) {
}
await user.isAdminOrGlobalModOrSelf(socket.uid, data.uid);
const userData = await user.getUserFields(data.uid, ['cover:url']);
// 'keepAllUserImages' is ignored, since there is explicit user intent
await user.removeCoverPicture(data);
plugins.hooks.fire('action:user.removeCoverPicture', {
callerUid: socket.uid,
@@ -114,7 +115,7 @@ module.exports = function (SocketUser) {
throw new Error('[[error:invalid-uid]]');
}
if (!data || !(parseInt(data.uid, 10) > 0)) {
if (!data || parseInt(data.uid, 10) <= 0) {
throw new Error('[[error:invalid-data]]');
}