fix: MkUserSelectDialog/search-by-username-and-hostでローカルユーザーを絞って検索できない問題を修正 (#9943)

* fix: MkUserSelectDialog/search-by-username-and-hostでローカルユーザーを絞って検索できない問題を修正
Fix #9627

* update CHANGELOG.md

* clean up

* search-by-username-and-host大改造

CHANGELOG.md

@@ -23,6 +23,7 @@ You should also include the user name that made the change.
 - enhance(client): MFMのx3, x4が含まれていたらノートをたたむように
 
 ### Bugfixes
+- ユーザー検索ダイアログでローカルユーザーを絞って検索できない問題を修正
 - fix(client): MkHeader及びデッキのカラムでチャンネル一覧を選択したとき、最大5個までしか表示されない
 - 管理画面の広告を10個以上見えるように
 

packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts

@@ -1,6 +1,7 @@
 import { Brackets } from 'typeorm';
 import { Inject, Injectable } from '@nestjs/common';
 import type { UsersRepository, FollowingsRepository } from '@/models/index.js';
+import type { Config } from '@/config.js';
 import type { User } from '@/models/entities/User.js';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
@@ -53,6 +54,9 @@ export const paramDef = {
 @Injectable()
 export default class extends Endpoint<typeof meta, typeof paramDef> {
 	constructor(
+		@Inject(DI.config)
+		private config: Config,
+
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
 
@@ -62,24 +66,26 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 		private userEntityService: UserEntityService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			const activeThreshold = new Date(Date.now() - (1000 * 60 * 60 * 24 * 30)); // 30日
+			const setUsernameAndHostQuery = (query = this.usersRepository.createQueryBuilder('user')) => {
-
-			if (ps.host) {
-				const q = this.usersRepository.createQueryBuilder('user')
-					.where('user.isSuspended = FALSE')
-					.andWhere('user.host LIKE :host', { host: sqlLikeEscape(ps.host.toLowerCase()) + '%' });
-
 				if (ps.username) {
-					q.andWhere('user.usernameLower LIKE :username', { username: sqlLikeEscape(ps.username.toLowerCase()) + '%' });
+					query.andWhere('user.usernameLower LIKE :username', { username: sqlLikeEscape(ps.username.toLowerCase()) + '%' })
 				}
 
-				q.andWhere('user.updatedAt IS NOT NULL');
+				if (ps.host) {
-				q.orderBy('user.updatedAt', 'DESC');
+					if (ps.host === this.config.hostname || ps.host === '.') {
+						query.andWhere('user.host IS NULL');
+					} else {
+						query.andWhere('user.host LIKE :host', {
+							host: sqlLikeEscape(ps.host.toLowerCase()) + '%'
+						});
+					}
+				}
 
-				const users = await q.take(ps.limit).getMany();
+				return query;
+			};
+
+			const activeThreshold = new Date(Date.now() - (1000 * 60 * 60 * 24 * 30)); // 30日
 
-				return await this.userEntityService.packMany(users, me, { detail: ps.detail });
-			} else if (ps.username) {
 			let users: User[] = [];
 
 			if (me) {
@@ -87,11 +93,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 					.select('following.followeeId')
 					.where('following.followerId = :followerId', { followerId: me.id });
 
-					const query = this.usersRepository.createQueryBuilder('user')
+				const query = setUsernameAndHostQuery()
-						.where(`user.id IN (${ followingQuery.getQuery() })`)
+					.andWhere(`user.id IN (${ followingQuery.getQuery() })`)
 					.andWhere('user.id != :meId', { meId: me.id })
 					.andWhere('user.isSuspended = FALSE')
-						.andWhere('user.usernameLower LIKE :username', { username: sqlLikeEscape(ps.username.toLowerCase()) + '%' })
 					.andWhere(new Brackets(qb => { qb
 						.where('user.updatedAt IS NULL')
 						.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold });
@@ -105,11 +110,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 					.getMany();
 
 				if (users.length < ps.limit) {
-						const otherQuery = await this.usersRepository.createQueryBuilder('user')
+					const otherQuery = setUsernameAndHostQuery()
-							.where(`user.id NOT IN (${ followingQuery.getQuery() })`)
+						.andWhere(`user.id NOT IN (${ followingQuery.getQuery() })`)
-							.andWhere('user.id != :meId', { meId: me.id })
 						.andWhere('user.isSuspended = FALSE')
-							.andWhere('user.usernameLower LIKE :username', { username: sqlLikeEscape(ps.username.toLowerCase()) + '%' })
 						.andWhere('user.updatedAt IS NOT NULL');
 
 					otherQuery.setParameters(followingQuery.getParameters());
@@ -122,19 +125,17 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 					users = users.concat(otherUsers);
 				}
 			} else {
-					users = await this.usersRepository.createQueryBuilder('user')
+				const query = setUsernameAndHostQuery()
-						.where('user.isSuspended = FALSE')
+					.andWhere('user.isSuspended = FALSE')
-						.andWhere('user.usernameLower LIKE :username', { username: sqlLikeEscape(ps.username.toLowerCase()) + '%' })
+					.andWhere('user.updatedAt IS NOT NULL');
-						.andWhere('user.updatedAt IS NOT NULL')
+
+				users = await query
 					.orderBy('user.updatedAt', 'DESC')
 					.take(ps.limit - users.length)
 					.getMany();
 			}
 
 			return await this.userEntityService.packMany(users, me, { detail: !!ps.detail });
-			}
-
-			return [];
 		});
 	}
 }

packages/frontend/src/components/MkInput.vue

@@ -23,7 +23,7 @@
 			@input="onInput"
 		>
 		<datalist v-if="datalist" :id="id">
-			<option v-for="data in datalist" :value="data"/>
+			<option v-for="data in datalist" :key="data" :value="data"/>
 		</datalist>
 		<div ref="suffixEl" class="suffix"><slot name="suffix"></slot></div>
 	</div>

packages/frontend/src/components/MkUserSelectDialog.vue

@@ -16,7 +16,7 @@
 					<template #label>{{ i18n.ts.username }}</template>
 					<template #prefix>@</template>
 				</MkInput>
-				<MkInput v-model="host" @update:model-value="search">
+				<MkInput v-model="host" @update:model-value="search" :datalist="[hostname]">
 					<template #label>{{ i18n.ts.host }}</template>
 					<template #prefix>@</template>
 				</MkInput>
@@ -61,6 +61,7 @@ import * as os from '@/os';
 import { defaultStore } from '@/store';
 import { i18n } from '@/i18n';
 import { $i } from '@/account';
+import { hostname } from '@/config';
 
 const emit = defineEmits<{
 	(ev: 'ok', selected: misskey.entities.UserDetailed): void;
@@ -115,7 +116,7 @@ onMounted(() => {
 	os.api('users/show', {
 		userIds: defaultStore.state.recentlyUsedUsers,
 	}).then(users => {
-		if (props.includeSelf) {
+		if (props.includeSelf && users.find(x => $i ? x.id === $i.id : true) == null) {
 			recentUsers = [$i, ...users];
 		} else {
 			recentUsers = users;