summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints/users
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-04-07 23:06:07 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-04-07 23:06:07 +0900
commitd9780606b3f69fc7fff96245c032c2e443dc3432 (patch)
tree4df09a9e31ea23fd9620a9678f5ca763c423439e /src/server/api/endpoints/users
parentFix bug (diff)
downloadsharkey-d9780606b3f69fc7fff96245c032c2e443dc3432.tar.gz
sharkey-d9780606b3f69fc7fff96245c032c2e443dc3432.tar.bz2
sharkey-d9780606b3f69fc7fff96245c032c2e443dc3432.zip
Refactor
Diffstat (limited to 'src/server/api/endpoints/users')
-rw-r--r--src/server/api/endpoints/users/show.ts6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/api/endpoints/users/show.ts b/src/server/api/endpoints/users/show.ts
index a605eaf30a..ae93e40eaa 100644
--- a/src/server/api/endpoints/users/show.ts
+++ b/src/server/api/endpoints/users/show.ts
@@ -1,5 +1,5 @@
import $ from 'cafy';
-import resolveRemoteUser from '../../../../remote/resolve-user';
+import { resolveUser } from '../../../../remote/resolve-user';
import define from '../../define';
import { apiLogger } from '../../logger';
import { ApiError } from '../../error';
@@ -75,7 +75,7 @@ export default define(meta, async (ps, me) => {
} else {
// Lookup user
if (typeof ps.host === 'string') {
- user = await resolveRemoteUser(ps.username, ps.host).catch(e => {
+ user = await resolveUser(ps.username, ps.host).catch(e => {
apiLogger.warn(`failed to resolve remote user: ${e}`);
throw new ApiError(meta.errors.failedToResolveRemoteUser);
});
@@ -94,7 +94,7 @@ export default define(meta, async (ps, me) => {
// ユーザー情報更新
if (Users.isRemoteUser(user)) {
if (user.lastFetchedAt == null || Date.now() - user.lastFetchedAt.getTime() > 1000 * 60 * 60 * 24) {
- resolveRemoteUser(ps.username, ps.host, { }, true);
+ resolveUser(ps.username, ps.host, { }, true);
}
}