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

fixed conflicts

Browse Source
This commit is contained in:
Baris Usakli
2013-09-17 13:42:07 -04:00
parent 564662ee00 678db837fd
commit ce61138351
67 changed files with 1844 additions and 1371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/postTools.js
View File

@@ -1,4 +1,4 @@
var RDB = require('./redis.js'),
var RDB = require('./redis.js'),
posts = require('./posts.js'),
topics = require('./topics'),
threadTools = require('./threadTools.js'),
@@ -56,6 +56,7 @@ var RDB = require('./redis.js'),
});
}
PostTools.edit = function(uid, pid, title, content) {
var success = function() {
posts.setPostField(pid, 'content', content);
@@ -77,7 +78,10 @@ var RDB = require('./redis.js'),
});
}
next(null, {tid:tid, isMainPost:isMainPost});
next(null, {
tid: tid,
isMainPost: isMainPost
});
});
});
},
@@ -85,12 +89,12 @@ var RDB = require('./redis.js'),
PostTools.toHTML(content, next);
}
], function(err, results) {
console.log("TEEEST");
io.sockets.in('topic_' + results[0].tid).emit('event:post_edited', {
pid: pid,
title: title,
isMainPost: results[0].isMainPost,
content: results[1]
});
});
};
@@ -112,13 +116,13 @@ var RDB = require('./redis.js'),
postSearch.remove(pid);
posts.getPostFields(pid, ['tid', 'uid'], function(postData) {
RDB.hincrby('topic:'+postData.tid, 'postcount', -1);
RDB.hincrby('topic:' + postData.tid, 'postcount', -1);
user.decrementUserFieldBy(postData.uid, 'postcount', 1, function(err, postcount) {
RDB.zadd('users:postcount', postcount, postData.uid);
});
io.sockets.in('topic_' + postData.tid).emit('event:post_deleted', {
io.sockets. in ('topic_' + postData.tid).emit('event:post_deleted', {
pid: pid
});
@@ -148,35 +152,35 @@ var RDB = require('./redis.js'),
PostTools.restore = function(uid, pid) {
var success = function() {
posts.setPostField(pid, 'deleted', 0);
posts.setPostField(pid, 'deleted', 0);
posts.getPostFields(pid, ['tid', 'uid', 'content'], function(postData) {
RDB.hincrby('topic:'+postData.tid, 'postcount', 1);
posts.getPostFields(pid, ['tid', 'uid', 'content'], function(postData) {
RDB.hincrby('topic:' + postData.tid, 'postcount', 1);
user.incrementUserFieldBy(postData.uid, 'postcount', 1);
user.incrementUserFieldBy(postData.uid, 'postcount', 1);
io.sockets.in('topic_' + postData.tid).emit('event:post_restored', {
pid: pid
});
threadTools.get_latest_undeleted_pid(postData.tid, function(err, pid) {
posts.getPostField(pid, 'timestamp', function(timestamp) {
topics.updateTimestamp(postData.tid, timestamp);
});
});
// Restore topic if it is the only post
topics.getTopicField(postData.tid, 'postcount', function(err, count) {
if (count === '1') {
threadTools.restore(postData.tid, uid);
}
});
Feed.updateTopic(postData.tid);
postSearch.index(postData.content, pid);
io.sockets. in ('topic_' + postData.tid).emit('event:post_restored', {
pid: pid
});
};
threadTools.get_latest_undeleted_pid(postData.tid, function(err, pid) {
posts.getPostField(pid, 'timestamp', function(timestamp) {
topics.updateTimestamp(postData.tid, timestamp);
});
});
// Restore topic if it is the only post
topics.getTopicField(postData.tid, 'postcount', function(err, count) {
if (count === '1') {
threadTools.restore(postData.tid, uid);
}
});
Feed.updateTopic(postData.tid);
postSearch.index(postData.content, pid);
});
};
PostTools.privileges(pid, uid, function(privileges) {
if (privileges.editable) {
@@ -188,11 +192,11 @@ var RDB = require('./redis.js'),
PostTools.toHTML = function(raw, callback) {
raw = raw || '';
plugins.fireHook('filter:post.parse', raw, function(parsed) {
var cheerio = require('cheerio');
var cheerio = require('cheerio');
if (parsed && parsed.length > 0) {
var parsedContentDOM = cheerio.load(parsed);
var domain = nconf.get('url');
var parsedContentDOM = cheerio.load(parsed);
var domain = nconf.get('url');
parsedContentDOM('a').each(function() {
this.attr('rel', 'nofollow');