summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/endpoints/users
diff options
context:
space:
mode:
authoranatawa12 <anatawa12@icloud.com>2024-05-20 19:25:50 +0900
committerGitHub <noreply@github.com>2024-05-20 19:25:50 +0900
commit5836bd85df4fe511f0ab766349eb4c9d1e1e5fdf (patch)
treeaa68eed9251e215fa66bea4a026433a40fee20b3 /packages/backend/src/server/api/endpoints/users
parentci: use pnpm version from packageManager field in the package.json. (#13825) (diff)
downloadsharkey-5836bd85df4fe511f0ab766349eb4c9d1e1e5fdf.tar.gz
sharkey-5836bd85df4fe511f0ab766349eb4c9d1e1e5fdf.tar.bz2
sharkey-5836bd85df4fe511f0ab766349eb4c9d1e1e5fdf.zip
fix: 複数idを指定する`users/show`が関係ないユーザを返すことがある問題を修正 (#13765)
* fix: 複数idを指定する`users/show`が関係ないユーザを返すことがある問題を修正 * test: fix misskey js test * chore: user/showがnullを返さないように * chore: pass lambda instead of pushVisibleUser
Diffstat (limited to 'packages/backend/src/server/api/endpoints/users')
-rw-r--r--packages/backend/src/server/api/endpoints/users/show.ts4
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/backend/src/server/api/endpoints/users/show.ts b/packages/backend/src/server/api/endpoints/users/show.ts
index bd81989cb9..26cfa921c5 100644
--- a/packages/backend/src/server/api/endpoints/users/show.ts
+++ b/packages/backend/src/server/api/endpoints/users/show.ts
@@ -110,9 +110,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
});
// リクエストされた通りに並べ替え
+ // 順番は保持されるけど数は減ってる可能性がある
const _users: MiUser[] = [];
for (const id of ps.userIds) {
- _users.push(users.find(x => x.id === id)!);
+ const user = users.find(x => x.id === id);
+ if (user != null) _users.push(user);
}
return await Promise.all(_users.map(u => this.userEntityService.pack(u, me, {