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

up themes, fix notif test

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2017-08-18 19:00:48 -04:00
parent 31ae8c7fd5
commit 5dfb2fb83a
4 changed files with 28 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/notifications.js
View File

@@ -13,7 +13,6 @@ var groups = require('./groups');
var meta = require('./meta');
var batch = require('./batch');
var plugins = require('./plugins');
var posts = require('./posts');
var utils = require('./utils');
var Notifications = module.exports;
@@ -23,19 +22,13 @@ Notifications.startJobs = function () {
new cron('*/30 * * * *', Notifications.prune, null, true);
};
Notifications.get = function (nid, uid, callback) {
Notifications.getMultiple([nid], uid, function (err, notifications) {
Notifications.get = function (nid, callback) {
Notifications.getMultiple([nid], function (err, notifications) {
callback(err, Array.isArray(notifications) && notifications.length ? notifications[0] : null);
});
};
Notifications.getMultiple = function (nids, uid, callback) {
if (typeof uid === 'function' && !callback) {
// no uid passed in
callback = uid;
uid = undefined;
}
Notifications.getMultiple = function (nids, callback) {
if (!Array.isArray(nids) || !nids.length) {
return setImmediate(callback, null, []);
}
@@ -44,19 +37,8 @@ Notifications.getMultiple = function (nids, uid, callback) {
});
var notifications;
var userSettings;
async.waterfall([
function (next) {
if (!uid) {
return setImmediate(next);
}
User.getSettings(uid, function (err, settings) {
userSettings = settings;
next(err);
});
},
function (next) {
db.getObjects(keys, next);
},
@@ -69,7 +51,7 @@ Notifications.getMultiple = function (nids, uid, callback) {
User.getUsersFields(userKeys, ['username', 'userslug', 'picture'], next);
},
function (usersData, next) {
async.eachOf(notifications, function (notification, index, next) {
notifications.forEach(function (notification, index) {
if (notification) {
notification.datetimeISO = utils.toISOString(notification.datetime);
@@ -86,19 +68,9 @@ Notifications.getMultiple = function (nids, uid, callback) {
} else if (notification.image === 'brand:logo' || !notification.image) {
notification.image = meta.config['brand:logo'] || nconf.get('relative_path') + '/logo.png';
}
if (notification.path.startsWith('/post/')) {
posts.getPidIndex(notification.pid, notification.tid, userSettings.topicPostSort, function (err, index) {
notification.index = index;
next(err);
});
} else {
next();
}
}
}, function (err) {
next(err, notifications);
});
next(null, notifications);
},
], callback);
};