This commit is contained in:
syuilo
2018-04-25 22:37:08 +09:00
parent 76c8e05e3a
commit 7ea42af0ba
7 changed files with 179 additions and 29 deletions

View File

@ -8,7 +8,7 @@ import resolveRemoteUser from '../../../../remote/resolve-user';
const cursorOption = { fields: { data: false } };
/**
* Show a user
* Show user(s)
*/
module.exports = (params, me) => new Promise(async (res, rej) => {
let user;
@ -17,6 +17,10 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
const [userId, userIdErr] = $(params.userId).optional.type(ID).$;
if (userIdErr) return rej('invalid userId param');
// Get 'userIds' parameter
const [userIds, userIdsErr] = $(params.userIds).optional.array($().type(ID)).$;
if (userIdsErr) return rej('invalid userIds param');
// Get 'username' parameter
const [username, usernameErr] = $(params.username).optional.string().$;
if (usernameErr) return rej('invalid username param');
@ -25,32 +29,40 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
const [host, hostErr] = $(params.host).nullable.optional.string().$;
if (hostErr) return rej('invalid host param');
if (userId === undefined && typeof username !== 'string') {
return rej('userId or pair of username and host is required');
}
if (userIds) {
const users = await User.find({
_id: {
$in: userIds
}
});
// Lookup user
if (typeof host === 'string') {
try {
user = await resolveRemoteUser(username, host, cursorOption);
} catch (e) {
console.warn(`failed to resolve remote user: ${e}`);
return rej('failed to resolve remote user');
}
res(await Promise.all(users.map(u => pack(u, me, {
detail: true
}))));
} else {
const q = userId !== undefined
? { _id: userId }
: { usernameLower: username.toLowerCase(), host: null };
// Lookup user
if (typeof host === 'string') {
try {
user = await resolveRemoteUser(username, host, cursorOption);
} catch (e) {
console.warn(`failed to resolve remote user: ${e}`);
return rej('failed to resolve remote user');
}
} else {
const q = userId !== undefined
? { _id: userId }
: { usernameLower: username.toLowerCase(), host: null };
user = await User.findOne(q, cursorOption);
user = await User.findOne(q, cursorOption);
if (user === null) {
return rej('user not found');
if (user === null) {
return rej('user not found');
}
}
}
// Send response
res(await pack(user, me, {
detail: true
}));
// Send response
res(await pack(user, me, {
detail: true
}));
}
});