よく話すユーザーからサスペンドされたユーザーを隠すなど (#4228)
* Resolve #4226 * fix * Fix: anonymousでアクセスするとサスペンドユーザーが隠れない * fix
This commit is contained in:
		
							parent
							
								
									52c3f9e98c
								
							
						
					
					
						commit
						f3ce8564ea
					
				
					 2 changed files with 6 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -4,7 +4,7 @@ import User, { IUser } from '../../../models/user';
 | 
			
		|||
import { unique } from '../../../prelude/array';
 | 
			
		||||
 | 
			
		||||
export async function getHideUserIds(me: IUser) {
 | 
			
		||||
	return me ? await getHideUserIdsById(me._id) : [];
 | 
			
		||||
	return await getHideUserIdsById(me ? me._id : null);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export async function getHideUserIdsById(meId?: mongo.ObjectID) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,6 +4,7 @@ import Note from '../../../../models/note';
 | 
			
		|||
import User, { pack } from '../../../../models/user';
 | 
			
		||||
import define from '../../define';
 | 
			
		||||
import { maximum } from '../../../../prelude/array';
 | 
			
		||||
import { getHideUserIds } from '../../common/get-hide-users';
 | 
			
		||||
 | 
			
		||||
export const meta = {
 | 
			
		||||
	requireCredential: false,
 | 
			
		||||
| 
						 | 
				
			
			@ -62,12 +63,15 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 | 
			
		|||
		return res([]);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	const hideUserIds = await getHideUserIds(me);
 | 
			
		||||
	hideUserIds.push(user._id);
 | 
			
		||||
 | 
			
		||||
	const replyTargetNotes = await Note.find({
 | 
			
		||||
		_id: {
 | 
			
		||||
			$in: recentNotes.map(p => p.replyId)
 | 
			
		||||
		},
 | 
			
		||||
		userId: {
 | 
			
		||||
			$ne: user._id
 | 
			
		||||
			$nin: hideUserIds
 | 
			
		||||
		}
 | 
			
		||||
	}, {
 | 
			
		||||
		fields: {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue