hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

closes #1015

Browse Source
v1.18.x
Baris Soner Usakli 11 years ago
parent 42a7c037e6
commit b6d97281d3
3 changed files with 121 additions and 102 deletions
Show Stats Download Patch File Download Diff File

124
src/postTools.js
Unescape Escape View File

@ -1,3 +1,5 @@
'use strict';
var winston = require('winston'), var winston = require('winston'),
async = require('async'), async = require('async'),
nconf = require('nconf'), nconf = require('nconf'),
@ -14,15 +16,20 @@ var winston = require('winston'),
meta = require('./meta'); meta = require('./meta');
(function(PostTools) { (function(PostTools) {
PostTools.isMain = function(pid, tid, callback) { PostTools.isMain = function(pid, tid, callback) {
db.getSortedSetRange('tid:' + tid + ':posts', 0, 0, function(err, pids) { db.getSortedSetRange('tid:' + tid + ':posts', 0, 0, function(err, pids) {
if(err) { if(err) {
return callback(err); return callback(err);
} }
if(!Array.isArray(pids) || !pids.length) {
callback(null, false);
}
callback(null, parseInt(pids[0], 10) === parseInt(pid, 10)); callback(null, parseInt(pids[0], 10) === parseInt(pid, 10));
}); });
} };
PostTools.privileges = function(pid, uid, callback) { PostTools.privileges = function(pid, uid, callback) {
async.parallel({ async.parallel({
@ -48,7 +55,6 @@ var winston = require('winston'),
}); });
} }
} }
// [getThreadPrivileges, isOwnPost, hasEnoughRep]
}, function(err, results) { }, function(err, results) {
if(err) { if(err) {
return callback(err); return callback(err);
@ -61,71 +67,78 @@ var winston = require('winston'),
move: results.topicPrivs.admin || results.topicPrivs.moderator move: results.topicPrivs.admin || results.topicPrivs.moderator
}); });
}); });
} };
PostTools.edit = function(uid, pid, title, content, options) { PostTools.edit = function(uid, pid, title, content, options, callback) {
options || (options = {}); options = options || (options = {});
var websockets = require('./socket.io'), function success(postData) {
success = function() { posts.setPostFields(pid, {
posts.setPostFields(pid, { edited: Date.now(),
edited: Date.now(), editor: uid,
editor: uid, content: postData.content
content: content });
});
events.logPostEdit(uid, pid); events.logPostEdit(uid, pid);
async.parallel([ async.parallel({
function(next) { topic: function(next) {
posts.getPostField(pid, 'tid', function(err, tid) { var tid = postData.tid;
PostTools.isMain(pid, tid, function(err, isMainPost) { PostTools.isMain(pid, tid, function(err, isMainPost) {
if (isMainPost) { if (err) {
title = title.trim(); return next(err);
var slug = tid + '/' + utils.slugify(title); }
if (isMainPost) {
title = title.trim();
var slug = tid + '/' + utils.slugify(title);
topics.setTopicField(tid, 'title', title); topics.setTopicField(tid, 'title', title);
topics.setTopicField(tid, 'slug', slug); topics.setTopicField(tid, 'slug', slug);
topics.setTopicField(tid, 'thumb', options.topic_thumb); topics.setTopicField(tid, 'thumb', options.topic_thumb);
plugins.fireHook('action:topic.edit', tid); plugins.fireHook('action:topic.edit', tid);
} }
posts.getPostData(pid, function(err, postData) { plugins.fireHook('action:post.edit', postData);
plugins.fireHook('action:post.edit', postData);
});
next(null, { next(null, {
tid: tid, tid: tid,
isMainPost: isMainPost title: validator.escape(title),
}); isMainPost: isMainPost
});
}); });
},
function(next) {
PostTools.parse(content, next);
}
], function(err, results) {
websockets.in('topic_' + results[0].tid).emit('event:post_edited', {
pid: pid,
title: validator.escape(title),
isMainPost: results[0].isMainPost,
content: results[1]
}); });
});
}; },
content: function(next) {
PostTools.parse(postData.content, next);
}
}, callback);
}
PostTools.privileges(pid, uid, function(err, privileges) { PostTools.privileges(pid, uid, function(err, privileges) {
if (privileges.editable) { if (err || !privileges.editable) {
plugins.fireHook('filter:post.save', content, function(err, parsedContent) { return callback(err || new Error('not-privileges-to-edit'));
if (!err) content = parsedContent;
success();
});
} }
posts.getPostData(pid, function(err, postData) {
if (err) {
return callback(err);
}
postData.content = content;
plugins.fireHook('filter:post.save', postData, function(err, postData) {
if (err) {
return callback(err);
}
success(postData);
});
});
}); });
} };
PostTools.delete = function(uid, pid, callback) { PostTools.delete = function(uid, pid, callback) {
var success = function() { var success = function() {
@ -183,7 +196,7 @@ var winston = require('winston'),
} }
}); });
}); });
} };
PostTools.restore = function(uid, pid, callback) { PostTools.restore = function(uid, pid, callback) {
var success = function() { var success = function() {
@ -238,7 +251,7 @@ var winston = require('winston'),
} }
}); });
}); });
} };
PostTools.parse = function(raw, callback) { PostTools.parse = function(raw, callback) {
raw = raw || ''; raw = raw || '';
@ -246,7 +259,7 @@ var winston = require('winston'),
plugins.fireHook('filter:post.parse', raw, function(err, parsed) { plugins.fireHook('filter:post.parse', raw, function(err, parsed) {
callback(null, !err ? parsed : raw); callback(null, !err ? parsed : raw);
}); });
} };
PostTools.parseSignature = function(raw, callback) { PostTools.parseSignature = function(raw, callback) {
raw = raw || ''; raw = raw || '';
@ -254,5 +267,6 @@ var winston = require('winston'),
plugins.fireHook('filter:post.parseSignature', raw, function(err, parsedSignature) { plugins.fireHook('filter:post.parseSignature', raw, function(err, parsedSignature) {
callback(null, !err ? parsedSignature : raw); callback(null, !err ? parsedSignature : raw);
}); });
} };
}(exports)); }(exports));

83
src/posts.js
Unescape Escape View File

@ -29,9 +29,12 @@ var db = require('./database'),
toPid = data.toPid; toPid = data.toPid;
if (uid === null) { if (uid === null) {
return callback(new Error('invalid-user'), null); return callback(new Error('invalid-user'));
} }
var timestamp = Date.now(),
postData;
async.waterfall([ async.waterfall([
function(next) { function(next) {
topics.isLocked(tid, next); topics.isLocked(tid, next);
@ -44,46 +47,38 @@ var db = require('./database'),
db.incrObjectField('global', 'nextPid', next); db.incrObjectField('global', 'nextPid', next);
}, },
function(pid, next) { function(pid, next) {
plugins.fireHook('filter:post.save', content, function(err, newContent) {
next(err, pid, newContent); postData = {
}); 'pid': pid,
}, 'uid': uid,
function(pid, newContent, next) { 'tid': tid,
var timestamp = Date.now(), 'content': content,
postData = { 'timestamp': timestamp,
'pid': pid, 'reputation': 0,
'uid': uid, 'votes': 0,
'tid': tid, 'editor': '',
'content': newContent, 'edited': 0,
'timestamp': timestamp, 'deleted': 0
'reputation': '0', };
'votes': '0',
'editor': '',
'edited': 0,
'deleted': 0
};
if (toPid) { if (toPid) {
postData.toPid = toPid; postData.toPid = toPid;
} }
db.setObject('post:' + pid, postData, function(err) { plugins.fireHook('filter:post.save', postData, next);
if(err) { },
return next(err); function(postData, next) {
} db.setObject('post:' + postData.pid, postData, next);
},
db.sortedSetAdd('posts:pid', timestamp, pid); function(result, next) {
db.sortedSetAdd('posts:pid', timestamp, postData.pid);
db.incrObjectField('global', 'postCount'); db.incrObjectField('global', 'postCount');
topics.onNewPostMade(tid, pid, timestamp); topics.onNewPostMade(tid, postData.pid, timestamp);
categories.onNewPostMade(uid, tid, pid, timestamp); categories.onNewPostMade(uid, tid, postData.pid, timestamp);
user.onNewPostMade(uid, tid, pid, timestamp); user.onNewPostMade(uid, tid, postData.pid, timestamp);
next(null, postData);
});
},
function(postData, next) {
plugins.fireHook('filter:post.get', postData, next); plugins.fireHook('filter:post.get', postData, next);
}, },
function(postData, next) { function(postData, next) {
@ -103,36 +98,34 @@ var db = require('./database'),
}; };
Posts.getPostsByTid = function(tid, start, end, reverse, callback) { Posts.getPostsByTid = function(tid, start, end, reverse, callback) {
if (typeof reverse === 'function') {
callback = reverse;
reverse = false;
}
db[reverse ? 'getSortedSetRevRange' : 'getSortedSetRange']('tid:' + tid + ':posts', start, end, function(err, pids) { db[reverse ? 'getSortedSetRevRange' : 'getSortedSetRange']('tid:' + tid + ':posts', start, end, function(err, pids) {
if(err) { if(err) {
return callback(err); return callback(err);
} }
if(!pids.length) { if(!Array.isArray(pids) || !pids.length) {
return callback(null, []); return callback(null, []);
} }
plugins.fireHook('filter:post.getTopic', pids, function(err, posts) { Posts.getPostsByPids(pids, function(err, posts) {
if(err) { if(err) {
return callback(err); return callback(err);
} }
if(!posts.length) { if(!Array.isArray(posts) || !posts.length) {
return callback(null, []); return callback(null, []);
} }
plugins.fireHook('filter:post.getPosts', {tid: tid, posts: posts}, function(err, data) {
Posts.getPostsByPids(pids, function(err, posts) {
if(err) { if(err) {
return callback(err); return callback(err);
} }
plugins.fireHook('action:post.gotTopic', posts);
callback(null, posts); if(!data || !Array.isArray(data.posts)) {
return callback(null, []);
}
callback(null, data.posts);
}); });
}); });
}); });

16
src/socket.io/posts.js
Unescape Escape View File

@ -151,8 +151,20 @@ SocketPosts.edit = function(socket, data, callback) {
return callback(new Error('content-too-short')); return callback(new Error('content-too-short'));
} }
postTools.edit(socket.uid, data.pid, data.title, data.content, {topic_thumb: data.topic_thumb}); postTools.edit(socket.uid, data.pid, data.title, data.content, {topic_thumb: data.topic_thumb}, function(err, results) {
callback(); if(err) {
return callback(err);
}
index.server.sockets.in('topic_' + results.topic.tid).emit('event:post_edited', {
pid: data.pid,
title: results.topic.title,
isMainPost: results.topic.isMainPost,
content: results.content
});
callback();
});
}; };
SocketPosts.delete = function(socket, data, callback) { SocketPosts.delete = function(socket, data, callback) {

Write Preview
Loading…
Cancel
Save