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

add /user/<uid> and /post/<pid> redirects

Browse Source 
change notifications to use new redirects
This commit is contained in:
barisusakli
2016-05-05 20:24:03 +03:00
parent b0747ad10e
commit eb0aea6390
15 changed files with 142 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
src/user/notifications.js
View File

@@ -1,19 +1,14 @@
'use strict';
var async = require('async'),
nconf = require('nconf'),
winston = require('winston'),
S = require('string'),
var async = require('async');
var winston = require('winston');
var S = require('string');
user = require('../user'),
db = require('../database'),
meta = require('../meta'),
notifications = require('../notifications'),
posts = require('../posts'),
topics = require('../topics'),
privileges = require('../privileges'),
utils = require('../../public/src/utils');
var db = require('../database');
var meta = require('../meta');
var notifications = require('../notifications');
var privileges = require('../privileges');
(function(UserNotifications) {
@@ -103,89 +98,13 @@ var async = require('async'),
if (err) {
return callback(err);
}
UserNotifications.generateNotificationPaths(notifications, uid, callback);
});
};
UserNotifications.generateNotificationPaths = function (notifications, uid, callback) {
var pids = notifications.map(function(notification) {
return notification ? notification.pid : null;
});
generatePostPaths(pids, uid, function(err, pidToPaths) {
if (err) {
return callback(err);
}
notifications = notifications.map(function(notification, index) {
if (!notification) {
return null;
}
notification.path = pidToPaths[notification.pid] || notification.path || null;
if (notification.nid.startsWith('follow')) {
notification.path = '/user/' + notification.user.userslug;
}
notification.datetimeISO = utils.toISOString(notification.datetime);
return notification;
}).filter(function(notification) {
// Remove notifications that do not resolve to a path
return notification && notification.path !== null;
notifications = notifications.filter(function(notification) {
return notification && notification.path;
});
callback(null, notifications);
});
};
function generatePostPaths(pids, uid, callback) {
pids = pids.filter(Boolean);
var postKeys = pids.map(function(pid) {
return 'post:' + pid;
});
db.getObjectsFields(postKeys, ['pid', 'tid'], function(err, postData) {
if (err) {
return callback(err);
}
var topicKeys = postData.map(function(post) {
return post ? 'topic:' + post.tid : null;
});
async.parallel({
indices: function(next) {
posts.getPostIndices(postData, uid, next);
},
topics: function(next) {
db.getObjectsFields(topicKeys, ['slug', 'deleted'], next);
}
}, function(err, results) {
if (err) {
return callback(err);
}
var pidToPaths = {};
pids.forEach(function(pid, index) {
if (parseInt(results.topics[index].deleted, 10) === 1) {
pidToPaths[pid] = null;
return;
}
var slug = results.topics[index] ? results.topics[index].slug : null;
var postIndex = utils.isNumber(results.indices[index]) ? parseInt(results.indices[index], 10) + 1 : null;
if (slug && postIndex) {
pidToPaths[pid] = '/topic/' + slug + '/' + postIndex;
}
});
callback(null, pidToPaths);
});
});
}
UserNotifications.getDailyUnread = function(uid, callback) {
var yesterday = Date.now() - (1000 * 60 * 60 * 24); // Approximate, can be more or less depending on time changes, makes no difference really.
@@ -300,6 +219,7 @@ var async = require('async'),
bodyShort: '[[notifications:user_posted_topic, ' + postData.user.username + ', ' + title + ']]',
bodyLong: postData.content,
pid: postData.pid,
path: '/post/' + postData.pid,
nid: 'tid:' + postData.tid + ':uid:' + uid,
tid: postData.tid,
from: uid