mirror of
				https://github.com/NodeBB/NodeBB.git
				synced 2025-10-31 11:05:54 +01:00 
			
		
		
		
	Merge branch 'master' of https://github.com/NodeBB/NodeBB
This commit is contained in:
		| @@ -25,6 +25,7 @@ events.types = [ | |||||||
| 	'post-delete', | 	'post-delete', | ||||||
| 	'post-restore', | 	'post-restore', | ||||||
| 	'post-purge', | 	'post-purge', | ||||||
|  | 	'post-change-owner', | ||||||
| 	'topic-delete', | 	'topic-delete', | ||||||
| 	'topic-restore', | 	'topic-restore', | ||||||
| 	'topic-purge', | 	'topic-purge', | ||||||
|   | |||||||
| @@ -163,6 +163,7 @@ module.exports = function (Posts) { | |||||||
| 			reduceCounters(postsByUser), | 			reduceCounters(postsByUser), | ||||||
| 			updateTopicPosters(postData, toUid), | 			updateTopicPosters(postData, toUid), | ||||||
| 		]); | 		]); | ||||||
|  | 		return postData; | ||||||
| 	}; | 	}; | ||||||
|  |  | ||||||
| 	async function reduceCounters(postsByUser) { | 	async function reduceCounters(postsByUser) { | ||||||
|   | |||||||
| @@ -172,6 +172,17 @@ module.exports = function (SocketPosts) { | |||||||
| 			throw new Error('[[error:no-privileges]]'); | 			throw new Error('[[error:no-privileges]]'); | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		await posts.changeOwner(data.pids, data.toUid); | 		var postData = await posts.changeOwner(data.pids, data.toUid); | ||||||
|  | 		var logs = postData.map(({ pid, uid, cid }) => (events.log({ | ||||||
|  | 			type: 'post-change-owner', | ||||||
|  | 			uid: socket.uid, | ||||||
|  | 			ip: socket.ip, | ||||||
|  | 			targetUid: data.toUid, | ||||||
|  | 			pid: pid, | ||||||
|  | 			originalUid: uid, | ||||||
|  | 			cid: cid, | ||||||
|  | 		}))); | ||||||
|  |  | ||||||
|  | 		await Promise.all(logs); | ||||||
| 	}; | 	}; | ||||||
| }; | }; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user