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

#6431 add private upload info

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-04-09 20:22:36 -04:00
parent b35bfb81ce
commit 927537c759
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/language/en-GB/uploads.json
View File

@@ -3,5 +3,7 @@
"select-file-to-upload": "Select a file to upload!", "select-file-to-upload": "Select a file to upload!",
"upload-success": "File uploaded successfully!", "upload-success": "File uploaded successfully!",
"maximum-file-size": "Maximum %1 kb", "maximum-file-size": "Maximum %1 kb",
"no-uploads-found": "No uploads found" "no-uploads-found": "No uploads found",
"public-uploads-info": "Uploads are public, all visitors can see them.",
"private-uploads": "Uploads are private, only logged in users can see them."
} }

2
public/src/client/account/uploads.js
View File

@@ -10,7 +10,7 @@ define('forum/account/uploads', ['forum/account/header'], function (header) {
var el = $(this).parents('[data-url]'); var el = $(this).parents('[data-url]');
var url = el.attr('data-url'); var url = el.attr('data-url');
socket.emit('user.deleteUpload', url, function (err) { socket.emit('user.deleteUpload', { url: url, uid: ajaxify.data.uid }, function (err) {
if (err) { if (err) {
return app.alertError(err.message); return app.alertError(err.message);
} }

2
src/controllers/accounts/uploads.js
View File

@@ -5,6 +5,7 @@ var async = require('async');
var db = require('../../database'); var db = require('../../database');
var helpers = require('../helpers'); var helpers = require('../helpers');
var meta = require('../../meta');
var pagination = require('../../pagination'); var pagination = require('../../pagination');
var accountHelpers = require('./helpers'); var accountHelpers = require('./helpers');
@@ -45,6 +46,7 @@ uploadsController.get = function (req, res, callback) {
}); });
var pageCount = Math.ceil(results.itemCount / itemsPerPage); var pageCount = Math.ceil(results.itemCount / itemsPerPage);
userData.pagination = pagination.create(page, pageCount, req.query); userData.pagination = pagination.create(page, pageCount, req.query);
userData.privateUploads = parseInt(meta.config.privateUploads, 10) === 1;
userData.title = '[[pages:account/uploads, ' + userData.username + ']]'; userData.title = '[[pages:account/uploads, ' + userData.username + ']]';
userData.breadcrumbs = helpers.buildBreadcrumbs([{ text: userData.username, url: '/user/' + userData.userslug }, { text: '[[global:uploads]]' }]); userData.breadcrumbs = helpers.buildBreadcrumbs([{ text: userData.username, url: '/user/' + userData.userslug }, { text: '[[global:uploads]]' }]);
res.render('account/uploads', userData); res.render('account/uploads', userData);

6
src/socket.io/user.js
View File

@@ -341,11 +341,11 @@ SocketUser.setModerationNote = function (socket, data, callback) {
], callback); ], callback);
}; };
SocketUser.deleteUpload = function (socket, url, callback) { SocketUser.deleteUpload = function (socket, data, callback) {
if (!url) { if (!data || !data.url || !data.uid) {
return callback(new Error('[[error:invalid-data]]')); return callback(new Error('[[error:invalid-data]]'));
} }
user.deleteUpload(socket.uid, url, callback); user.deleteUpload(socket.uid, data.uid, data.url, callback);
}; };
SocketUser.gdpr = {}; SocketUser.gdpr = {};

9
src/user/uploads.js
View File

@@ -6,15 +6,15 @@ var db = require('../database');
var file = require('../file'); var file = require('../file');
module.exports = function (User) { module.exports = function (User) {
User.deleteUpload = function (uid, url, callback) { User.deleteUpload = function (callerUid, uid, url, callback) {
async.waterfall([ async.waterfall([
function (next) { function (next) {
async.parallel({ async.parallel({
isUsersUpload: function (next) { isUsersUpload: function (next) {
db.isSortedSetMember('uid:' + uid + ':uploads', url, next); db.isSortedSetMember('uid:' + callerUid + ':uploads', url, next);
}, },
isAdminOrGlobalMod: function (next) { isAdminOrGlobalMod: function (next) {
User.isAdminOrGlobalMod(uid, next); User.isAdminOrGlobalMod(callerUid, next);
}, },
}, next); }, next);
}, },
@@ -25,6 +25,9 @@ module.exports = function (User) {
file.delete(file.uploadUrlToPath(url), next); file.delete(file.uploadUrlToPath(url), next);
}, },
function (next) {
db.sortedSetRemove('uid:' + uid + ':uploads', url, next);
},
], callback); ], callback);
}; };
}; };