mirror of
				https://github.com/NodeBB/NodeBB.git
				synced 2025-10-31 02:55:58 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin' into posts-refactor
This commit is contained in:
		
							
								
								
									
										10
									
								
								src/posts.js
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								src/posts.js
									
									
									
									
									
								
							| @@ -150,8 +150,8 @@ var	RDB = require('./redis.js'), | ||||
| 				timeout: 2000 | ||||
| 			}); | ||||
|  | ||||
| 			user.get_user_postdetails([uid], function(user_details) { | ||||
| 				user.get_gravatars_by_uids([uid], '', function(gravatars) { | ||||
| 			user.get_user_postdetails(uid, function(user_details) { | ||||
| 				user.get_gravatars_by_uids(uid, '', function(gravatars) { | ||||
| 					var timestamp = new Date().getTime(); | ||||
|  | ||||
| 					socket.in('topic_' + tid).emit('event:new_post', { | ||||
| @@ -201,7 +201,9 @@ var	RDB = require('./redis.js'), | ||||
| 			Posts.hasFavourited(pid, uid, function(hasFavourited) { | ||||
| 				if (hasFavourited == false) { | ||||
| 					RDB.sadd('pid:' + pid + ':users_favourited', uid); | ||||
| 					RDB.incr('uid:' + uid_of_poster + ':rep'); | ||||
|  | ||||
| 					RDB.db.hincrby(String(uid_of_poster), 'reputation', 1); | ||||
| 					 | ||||
| 					RDB.incr('pid:' + pid + ':rep'); | ||||
|  | ||||
| 					if (room_id) { | ||||
| @@ -217,7 +219,7 @@ var	RDB = require('./redis.js'), | ||||
| 			Posts.hasFavourited(pid, uid, function(hasFavourited) { | ||||
| 				if (hasFavourited == true) { | ||||
| 					RDB.srem('pid:' + pid + ':users_favourited', uid); | ||||
| 					RDB.decr('uid:' + uid_of_poster + ':rep'); | ||||
| 					RDB.db.hincrby(String(uid_of_poster), 'reputation', -1); | ||||
| 					RDB.decr('pid:' + pid + ':rep'); | ||||
|  | ||||
| 					if (room_id) { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user