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

feat: #7743 posts/diff, posts/edit

Browse Source
v1.18.x
Baris Usakli 6 years ago
parent acad245b4a
commit c4bb467ea5
2 changed files with 181 additions and 263 deletions
Show Stats Download Patch File Download Diff File

108
src/posts/diffs.js
Unescape Escape View File

@ -1,95 +1,70 @@
'use strict'; 'use strict';
var async = require('async'); const validator = require('validator');
var validator = require('validator'); const diff = require('diff');
var diff = require('diff');
var db = require('../database'); const db = require('../database');
var meta = require('../meta'); const meta = require('../meta');
var plugins = require('../plugins'); const plugins = require('../plugins');
var translator = require('../translator'); const translator = require('../translator');
var Diffs = {};
Diffs.exists = function (pid, callback) { module.exports = function (Posts) {
const Diffs = {};
Posts.diffs = Diffs;
Diffs.exists = async function (pid) {
if (meta.config.enablePostHistory !== 1) { if (meta.config.enablePostHistory !== 1) {
return callback(null, 0); return false;
} }
db.listLength('post:' + pid + ':diffs', function (err, numDiffs) { const numDiffs = await db.listLength('post:' + pid + ':diffs');
return callback(err, !!numDiffs); return !!numDiffs;
});
}; };
Diffs.get = function (pid, since, callback) { Diffs.get = async function (pid, since) {
async.waterfall([ const timestamps = await Diffs.list(pid);
function (next) {
Diffs.list(pid, next);
},
function (timestamps, next) {
// Pass those made after `since`, and create keys // Pass those made after `since`, and create keys
const keys = timestamps.filter(function (timestamp) { const keys = timestamps.filter(t => (parseInt(t, 10) || 0) >= since)
return (parseInt(timestamp, 10) || 0) >= since; .map(t => 'diff:' + pid + '.' + t);
}).map(function (timestamp) { return await db.getObjects(keys);
return 'diff:' + pid + '.' + timestamp;
});
db.getObjects(keys, next);
},
], callback);
}; };
Diffs.list = function (pid, callback) { Diffs.list = async function (pid) {
db.getListRange('post:' + pid + ':diffs', 0, -1, callback); return await db.getListRange('post:' + pid + ':diffs', 0, -1);
}; };
Diffs.save = function (pid, oldContent, newContent, callback) { Diffs.save = async function (pid, oldContent, newContent) {
const now = Date.now(); const now = Date.now();
const patch = diff.createPatch('', newContent, oldContent); const patch = diff.createPatch('', newContent, oldContent);
async.parallel([ await Promise.all([
async.apply(db.listPrepend.bind(db), 'post:' + pid + ':diffs', now), db.listPrepend('post:' + pid + ':diffs', now),
async.apply(db.setObject.bind(db), 'diff:' + pid + '.' + now, { db.setObject('diff:' + pid + '.' + now, {
pid: pid, pid: pid,
patch: patch, patch: patch,
}), }),
], function (err) { ]);
// No return arguments passed back
callback(err);
});
}; };
Diffs.load = function (pid, since, uid, callback) { Diffs.load = async function (pid, since, uid) {
var Posts = require('../posts');
// Retrieves all diffs made since `since` and replays them to reconstruct what the post looked like at `since` // Retrieves all diffs made since `since` and replays them to reconstruct what the post looked like at `since`
since = parseInt(since, 10); since = parseInt(since, 10);
if (isNaN(since) || since > Date.now()) { if (isNaN(since) || since > Date.now()) {
return callback(new Error('[[error:invalid-data]]')); throw new Error('[[error:invalid-data]]');
}
async.parallel({
post: async.apply(Posts.getPostSummaryByPids, [pid], uid, {
parse: false,
}),
diffs: async.apply(Posts.diffs.get, pid, since),
}, function (err, data) {
if (err) {
return callback(err);
} }
const [post, diffs] = await Promise.all([
Posts.getPostSummaryByPids([pid], uid, { parse: false }),
Posts.diffs.get(pid, since),
]);
const data = {
post: post,
diffs: diffs,
};
postDiffLoad(data); postDiffLoad(data);
const result = await plugins.fireHook('filter:parse.post', { postData: data.post });
async.waterfall([ result.postData.content = translator.escape(result.postData.content);
function (next) { return result.postData;
plugins.fireHook('filter:parse.post', { postData: data.post }, next);
},
function (data, next) {
data.postData.content = translator.escape(data.postData.content);
next(null, data.postData);
},
], callback);
});
}; };
function postDiffLoad(data) { function postDiffLoad(data) {
@ -111,11 +86,4 @@ function postDiffLoad(data) {
data.post.content = String(data.post.content || ''); data.post.content = String(data.post.content || '');
} }
module.exports = function (Posts) {
Posts.diffs = {};
Object.keys(Diffs).forEach(function (property) {
Posts.diffs[property] = Diffs[property];
});
}; };

168
src/posts/edit.js
Unescape Escape View File

@ -1,6 +1,5 @@
'use strict'; 'use strict';
var async = require('async');
var validator = require('validator'); var validator = require('validator');
var _ = require('lodash'); var _ = require('lodash');
@ -19,161 +18,112 @@ module.exports = function (Posts) {
require('./cache').del(pid); require('./cache').del(pid);
}); });
Posts.edit = function (data, callback) { Posts.edit = async function (data) {
var oldContent; // for diffing purposes const canEdit = await privileges.posts.canEdit(data.pid, data.uid);
var postData;
var results;
async.waterfall([
function (next) {
privileges.posts.canEdit(data.pid, data.uid, next);
},
function (canEdit, next) {
if (!canEdit.flag) { if (!canEdit.flag) {
return next(new Error(canEdit.message)); throw new Error(canEdit.message);
} }
Posts.getPostData(data.pid, next); let postData = await Posts.getPostData(data.pid);
}, if (!postData) {
function (_postData, next) { throw new Error('[[error:no-post]]');
if (!_postData) {
return next(new Error('[[error:no-post]]'));
} }
postData = _postData; const oldContent = postData.content; // for diffing purposes
oldContent = postData.content;
postData.content = data.content; postData.content = data.content;
postData.edited = Date.now(); postData.edited = Date.now();
postData.editor = data.uid; postData.editor = data.uid;
if (data.handle) { if (data.handle) {
postData.handle = data.handle; postData.handle = data.handle;
} }
plugins.fireHook('filter:post.edit', { req: data.req, post: postData, data: data, uid: data.uid }, next); const result = await plugins.fireHook('filter:post.edit', { req: data.req, post: postData, data: data, uid: data.uid });
},
function (result, next) {
postData = result.post; postData = result.post;
async.parallel({ const [editor, topic] = await Promise.all([
editor: function (next) { user.getUserFields(data.uid, ['username', 'userslug']),
user.getUserFields(data.uid, ['username', 'userslug'], next); editMainPost(data, postData),
}, ]);
topic: function (next) {
editMainPost(data, postData, next); await Posts.setPostFields(data.pid, postData);
},
}, next); if (meta.config.enablePostHistory === 1) {
}, await Posts.diffs.save(data.pid, oldContent, data.content);
function (_results, next) {
results = _results;
Posts.setPostFields(data.pid, postData, next);
},
function (next) {
if (meta.config.enablePostHistory !== 1) {
return setImmediate(next);
} }
await Posts.uploads.sync(data.pid);
Posts.diffs.save(data.pid, oldContent, data.content, next); postData.cid = topic.cid;
}, postData.topic = topic;
async.apply(Posts.uploads.sync, data.pid),
function (next) {
postData.cid = results.topic.cid;
postData.topic = results.topic;
plugins.fireHook('action:post.edit', { post: _.clone(postData), data: data, uid: data.uid }); plugins.fireHook('action:post.edit', { post: _.clone(postData), data: data, uid: data.uid });
require('./cache').del(String(postData.pid)); require('./cache').del(String(postData.pid));
pubsub.publish('post:edit', String(postData.pid)); pubsub.publish('post:edit', String(postData.pid));
Posts.parsePost(postData, next); postData = await Posts.parsePost(postData);
},
function (postData, next) { return {
results.post = postData; topic: topic,
next(null, results); editor: editor,
}, post: postData,
], callback); };
}; };
function editMainPost(data, postData, callback) { async function editMainPost(data, postData) {
var tid = postData.tid; const tid = postData.tid;
var title = data.title ? data.title.trim() : ''; const title = data.title ? data.title.trim() : '';
var topicData; const [topicData, isMain] = await Promise.all([
var results; topics.getTopicFields(tid, ['cid', 'title', 'timestamp']),
async.waterfall([ Posts.isMain(data.pid),
function (next) { ]);
async.parallel({
topic: function (next) { if (!isMain) {
topics.getTopicFields(tid, ['cid', 'title', 'timestamp'], next); return {
},
isMain: function (next) {
Posts.isMain(data.pid, next);
},
}, next);
},
function (_results, next) {
results = _results;
if (!results.isMain) {
return callback(null, {
tid: tid, tid: tid,
cid: results.topic.cid, cid: topicData.cid,
isMainPost: false, isMainPost: false,
renamed: false, renamed: false,
}); };
} }
topicData = { const newTopicData = {
tid: tid, tid: tid,
cid: results.topic.cid, cid: topicData.cid,
uid: postData.uid, uid: postData.uid,
mainPid: data.pid, mainPid: data.pid,
}; };
if (title) { if (title) {
topicData.title = title; newTopicData.title = title;
topicData.slug = tid + '/' + (utils.slugify(title) || 'topic'); newTopicData.slug = tid + '/' + (utils.slugify(title) || 'topic');
} }
newTopicData.thumb = data.thumb || '';
topicData.thumb = data.thumb || '';
data.tags = data.tags || []; data.tags = data.tags || [];
if (!data.tags.length) { if (data.tags.length) {
return next(null, true); const canTag = await privileges.categories.can('topics:tag', topicData.cid, data.uid);
}
privileges.categories.can('topics:tag', topicData.cid, data.uid, next);
},
function (canTag, next) {
if (!canTag) { if (!canTag) {
return next(new Error('[[error:no-privileges]]')); throw new Error('[[error:no-privileges]]');
}
} }
const results = await plugins.fireHook('filter:topic.edit', { req: data.req, topic: newTopicData, data: data });
await db.setObject('topic:' + tid, results.topic);
await topics.updateTopicTags(tid, data.tags);
const tags = await topics.getTopicTagsObjects(tid);
plugins.fireHook('filter:topic.edit', { req: data.req, topic: topicData, data: data }, next);
},
function (results, next) {
db.setObject('topic:' + tid, results.topic, next);
},
function (next) {
topics.updateTopicTags(tid, data.tags, next);
},
function (next) {
topics.getTopicTagsObjects(tid, next);
},
function (tags, next) {
topicData.tags = data.tags; topicData.tags = data.tags;
topicData.oldTitle = results.topic.title; topicData.oldTitle = topicData.title;
topicData.timestamp = results.topic.timestamp; topicData.timestamp = topicData.timestamp;
var renamed = translator.escape(validator.escape(String(title))) !== results.topic.title; const renamed = translator.escape(validator.escape(String(title))) !== topicData.title;
plugins.fireHook('action:topic.edit', { topic: topicData, uid: data.uid }); plugins.fireHook('action:topic.edit', { topic: topicData, uid: data.uid });
next(null, { return {
tid: tid, tid: tid,
cid: topicData.cid, cid: topicData.cid,
uid: postData.uid, uid: postData.uid,
title: validator.escape(String(title)), title: validator.escape(String(title)),
oldTitle: results.topic.title, oldTitle: topicData.title,
slug: topicData.slug, slug: topicData.slug,
isMainPost: true, isMainPost: true,
renamed: renamed, renamed: renamed,
tags: tags, tags: tags,
}); };
},
], callback);
} }
}; };

Write Preview
Loading…
Cancel
Save