mirror of
				https://github.com/NodeBB/NodeBB.git
				synced 2025-11-03 20:45:58 +01:00 
			
		
		
		
	closes #476
This commit is contained in:
		@@ -80,7 +80,6 @@ define(function () {
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	Category.onNewTopic = function(data) {
 | 
			
		||||
		console.log(data);
 | 
			
		||||
		var html = templates.prepare(templates['category'].blocks['topics']).parse({
 | 
			
		||||
			topics: [data]
 | 
			
		||||
		}),
 | 
			
		||||
@@ -106,9 +105,27 @@ define(function () {
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		socket.emit('api:categories.getRecentReplies', templates.get('category_id'));
 | 
			
		||||
 | 
			
		||||
		addActiveUser(data);
 | 
			
		||||
 | 
			
		||||
		$('#topics-container span.timeago').timeago();
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	function addActiveUser(data) {
 | 
			
		||||
		var activeUser = $('.category-sidebar .active-users').find('a[data-uid="' + data.uid + '"]');
 | 
			
		||||
		if(!activeUser.length) {
 | 
			
		||||
			var newUser = templates.prepare(templates['category'].blocks['active_users']).parse({
 | 
			
		||||
				active_users: [{
 | 
			
		||||
					uid: data.uid,
 | 
			
		||||
					username: data.username,
 | 
			
		||||
					userslug: data.userslug,
 | 
			
		||||
					picture: data.teaser_userpicture
 | 
			
		||||
				}]
 | 
			
		||||
			});
 | 
			
		||||
			$(newUser).appendTo($('.category-sidebar .active-users'));
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	Category.onTopicsLoaded = function(topics) {
 | 
			
		||||
 | 
			
		||||
		var html = templates.prepare(templates['category'].blocks['topics']).parse({
 | 
			
		||||
 
 | 
			
		||||
@@ -76,9 +76,9 @@
 | 
			
		||||
			<div class="block-header">
 | 
			
		||||
				[[category:sidebar.active_participants]]
 | 
			
		||||
			</div>
 | 
			
		||||
			<div class="block-content">
 | 
			
		||||
			<div class="block-content active-users">
 | 
			
		||||
				<!-- BEGIN active_users -->
 | 
			
		||||
				<a href="/user/{active_users.userslug}"><img title="{active_users.username}" src="{active_users.picture}" class="img-rounded" /></a>
 | 
			
		||||
				<a data-uid="{active_users.uid}" href="/user/{active_users.userslug}"><img title="{active_users.username}" src="{active_users.picture}" class="img-rounded" /></a>
 | 
			
		||||
				<!-- END active_users -->
 | 
			
		||||
			</div>
 | 
			
		||||
		</div>
 | 
			
		||||
 
 | 
			
		||||
@@ -96,7 +96,7 @@ var RDB = require('./redis.js'),
 | 
			
		||||
				}
 | 
			
		||||
 | 
			
		||||
				function getActiveUsers(next) {
 | 
			
		||||
					user.getMultipleUserFields(active_users, ['username', 'userslug', 'picture'], function(err, users) {
 | 
			
		||||
					user.getMultipleUserFields(active_users, ['uid', 'username', 'userslug', 'picture'], function(err, users) {
 | 
			
		||||
						next(err, users);
 | 
			
		||||
					});
 | 
			
		||||
				}
 | 
			
		||||
 
 | 
			
		||||
@@ -461,6 +461,7 @@ var RDB = require('./redis.js'),
 | 
			
		||||
			topicData.badgeclass = hasRead ? '' : 'badge-important';
 | 
			
		||||
			topicData.teaser_text = teaser.text || '';
 | 
			
		||||
			topicData.teaser_username = teaser.username || '';
 | 
			
		||||
			topicData.userslug = teaser.userslug || '';
 | 
			
		||||
			topicData.teaser_timestamp = teaser.timestamp ? (new Date(parseInt(teaser.timestamp,10)).toISOString()) : '';
 | 
			
		||||
			topicData.teaser_userpicture = teaser.picture;
 | 
			
		||||
 | 
			
		||||
@@ -606,7 +607,7 @@ var RDB = require('./redis.js'),
 | 
			
		||||
			if (!err) {
 | 
			
		||||
				posts.getPostFields(pid, ['pid', 'content', 'uid', 'timestamp'], function(postData) {
 | 
			
		||||
 | 
			
		||||
					user.getUserFields(postData.uid, ['username', 'picture'], function(err, userData) {
 | 
			
		||||
					user.getUserFields(postData.uid, ['username', 'userslug', 'picture'], function(err, userData) {
 | 
			
		||||
						if (err)
 | 
			
		||||
							return callback(err, null);
 | 
			
		||||
 | 
			
		||||
@@ -615,6 +616,7 @@ var RDB = require('./redis.js'),
 | 
			
		||||
							returnObj = {
 | 
			
		||||
								"pid": postData.pid,
 | 
			
		||||
								"username": userData.username,
 | 
			
		||||
								"userslug": userData.userslug,
 | 
			
		||||
								"picture": userData.picture,
 | 
			
		||||
								"timestamp": timestamp
 | 
			
		||||
							};
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user