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

history appending, finished up notes, #5232

Browse Source
This commit is contained in:
Julian Lam
2016-12-01 16:22:10 -05:00
parent d9d60c20bd
commit f1d144f15e
5 changed files with 98 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/flags.js
View File

@@ -24,7 +24,7 @@ Flags.get = function (flagId, callback) {
// First stage
async.apply(async.parallel, {
base: async.apply(db.getObject.bind(db), 'flag:' + flagId),
history: async.apply(db.getSortedSetRevRange.bind(db), 'flag:' + flagId + ':history', 0, -1),
history: async.apply(Flags.getHistory, flagId),
notes: async.apply(Flags.getNotes, flagId)
}),
function (data, next) {
@@ -156,7 +156,7 @@ Flags.getNotes = function (flagId, callback) {
next(null, notes, uids);
},
function (notes, uids, next) {
user.getUsersData(uids, function (err, users) {
user.getUsersFields(uids, ['username', 'userslug', 'picture'], function (err, users) {
if (err) {
return next(err);
}
@@ -398,13 +398,61 @@ Flags.update = function (flagId, uid, changeset, callback) {
async.apply(db.setObject, 'flag:' + flagId, changeset),
// Append history
async.apply(Flags.appendHistory, flagId, uid, Object.keys(changeset))
], next);
], function (err, data) {
return next(err);
});
}
], callback);
};
Flags.getHistory = function (flagId, callback) {
var history;
var uids = [];
async.waterfall([
async.apply(db.getSortedSetRevRangeWithScores.bind(db), 'flag:' + flagId + ':history', 0, -1),
function (_history, next) {
history = _history.map(function (entry) {
try {
entry.value = JSON.parse(entry.value);
} catch (e) {
return callback(e);
}
uids.push(entry.value[0]);
return {
uid: entry.value[0],
fields: entry.value[1],
datetime: entry.score,
datetimeISO: new Date(entry.score).toISOString()
};
});
user.getUsersFields(uids, ['username', 'userslug', 'picture'], next);
}
], function (err, users) {
if (err) {
return callback(err);
}
history = history.map(function (event, idx) {
event.user = users[idx];
return event;
});
callback(null, history);
});
};
Flags.appendHistory = function (flagId, uid, changeset, callback) {
return callback();
var payload;
try {
payload = JSON.stringify([uid, changeset, Date.now()]);
} catch (e) {
return callback(e);
}
db.sortedSetAdd('flag:' + flagId + ':history', Date.now(), payload, callback);
};
Flags.appendNote = function (flagId, uid, note, callback) {
@@ -417,7 +465,7 @@ Flags.appendNote = function (flagId, uid, note, callback) {
async.waterfall([
async.apply(db.sortedSetAdd, 'flag:' + flagId + ':notes', Date.now(), payload),
async.apply(Flags.getNotes, flagId)
async.apply(Flags.appendHistory, flagId, uid, ['notes'])
], callback);
};