Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-19 14:02:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:designcreateplay/NodeBB

Browse Source
This commit is contained in:
Julian Lam
2014-03-13 17:15:24 -04:00
parent 553cabdcfa bddc270033
commit 401bd02748
5 changed files with 44 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/src/forum/account.js
View File

@@ -73,15 +73,6 @@ define(['forum/accountheader'], function(header) {
socket.emit('user.isOnline', theirid, Account.handleUserOnline);
socket.on('event:new_post', function(data) {
templates.preload_template('account', function() {
templates['account'].parse({posts:[]});
var html = templates.prepare(templates['account'].blocks['posts']).parse(data);
$('.user-recent-posts').prepend(html);
$('.user-recent-posts span.timeago').timeago();
});
});
});
};

4
public/src/forum/topic.js
View File

@@ -735,6 +735,10 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
});
socket.on('event:new_post', function(data) {
if(data && data.posts && data.posts.length && data.posts[0].tid !== templates.get('topic_id')) {
return;
}
if(config.usePagination) {
onNewPostPagination(data);
return;

8
src/categories.js
View File

@@ -59,8 +59,8 @@ var db = require('./database'),
};
Categories.getCategoryById = function(cid, start, end, uid, callback) {
CategoryTools.exists(cid, function(err, exists) {
if(err || !exists) {
Categories.getCategoryData(cid, function(err, category) {
if(err || !category) {
return callback(err || new Error('category-not-found [' + cid + ']'));
}
@@ -69,9 +69,6 @@ var db = require('./database'),
}
async.parallel({
category: function(next) {
Categories.getCategoryData(cid, next);
},
topics: function(next) {
Categories.getCategoryTopics(cid, start, end, uid, next);
},
@@ -83,7 +80,6 @@ var db = require('./database'),
return callback(err);
}
var category = results.category;
category.topics = results.topics.topics;
category.nextStart = results.topics.nextStart;
category.pageCount = results.pageCount;

75
src/posts.js
View File

@@ -232,48 +232,47 @@ var db = require('./database'),
return callback(err);
}
postTools.parseSignature(userData.signature, function(err, signature) {
if(err) {
post.user = {
username: userData.username || 'anonymous',
userslug: userData.userslug || '',
reputation: userData.reputation || 0,
postcount: userData.postcount || 0,
banned: parseInt(userData.banned, 10) === 1,
picture: userData.picture || gravatar.url('', {}, true)
};
for (var info in customUserInfo) {
if (customUserInfo.hasOwnProperty(info)) {
post.user[info] = userData[info] || customUserInfo[info];
}
}
async.parallel({
signature: function(next) {
if (parseInt(meta.config.disableSignatures, 10) !== 1) {
return postTools.parseSignature(userData.signature, next);
}
next();
},
editor: function(next) {
if (!post.editor) {
return next();
}
user.getUserFields(post.editor, ['username', 'userslug'], next);
},
customProfileInfo: function(next) {
plugins.fireHook('filter:posts.custom_profile_info', {profile: [], uid: post.uid, pid: post.pid}, next);
}
}, function(err, results) {
if (err) {
return callback(err);
}
post.username = userData.username || 'anonymous';
post.userslug = userData.userslug || '';
post.user_rep = userData.reputation || 0;
post.user_postcount = userData.postcount || 0;
post.user_banned = parseInt(userData.banned, 10) === 1;
post.picture = userData.picture || gravatar.url('', {}, true);
post.user.signature = results.signature;
post.editor = results.editor;
post.custom_profile_info = results.profile;
if(meta.config.disableSignatures === undefined || parseInt(meta.config.disableSignatures, 10) === 0) {
post.signature = signature;
}
for (var info in customUserInfo) {
if (customUserInfo.hasOwnProperty(info)) {
post[info] = userData[info] || customUserInfo[info];
}
}
plugins.fireHook('filter:posts.custom_profile_info', {profile: [], uid: post.uid, pid: post.pid}, function(err, profile_info) {
if(err) {
return callback(err);
}
post.custom_profile_info = profile_info.profile;
if (post.editor !== '') {
user.getUserFields(post.editor, ['username', 'userslug'], function(err, editorData) {
if (err) {
return callback(err);
}
post.editorname = editorData.username;
post.editorslug = editorData.userslug;
callback(null, post);
});
} else {
callback(null, post);
}
});
callback(null, post);
});
});
};

2
src/topics.js
View File

@@ -719,7 +719,7 @@ var async = require('async'),
if (categoryCache[topicData.cid]) {
return next(null, categoryCache[topicData.cid]);
}
categories.getCategoryFields(topicData.cid, ['name', 'slug', 'icon'], next);
categories.getCategoryFields(topicData.cid, ['name', 'slug', 'icon', 'bgColor', 'color'], next);
},
user: function(next) {
if (userCache[topicData.uid]) {