Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve error handling of API (#4345)

Browse source 
* wip

* wip

* wip

* Update attached_notes.ts

* wip

* Refactor

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update call.ts

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* ✌️

* Fix
This commit is contained in:
syuilo 2019-02-22 11:46:58 +09:00 • committed by GitHub
parent fc52e95ad0
commit 2756f553c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
181 changed files with 2010 additions and 1322 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/server/api/endpoints/users/recommendation.ts
View file

@ -32,7 +32,7 @@ export const meta = {
}
};
export default define(meta, (ps, me) => new Promise(async (res, rej) => {
export default define(meta, async (ps, me) => {
const instance = await fetchMeta();
if (instance.enableExternalUserRecommendation) {
@ -48,7 +48,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
.replace('{{limit}}', limit.toString())
.replace('{{offset}}', offset.toString());
request({
const users = await request({
url: url,
proxy: config.proxy,
timeout: timeout,
@ -56,37 +56,36 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
followRedirect: true,
followAllRedirects: true
})
.then(body => convertUsers(body, me))
.then(packed => res(packed))
.catch(e => rej(e));
.then(body => convertUsers(body, me));
return users;
} else {
// ID list of the user itself and other users who the user follows
const followingIds = await getFriendIds(me._id);
// 隠すユーザーを取得
const hideUserIds = await getHideUserIds(me);
// 隠すユーザーを取得
const hideUserIds = await getHideUserIds(me);
const users = await User
.find({
_id: {
$nin: followingIds.concat(hideUserIds)
},
isLocked: { $ne: true },
updatedAt: {
$gte: new Date(Date.now() - ms('7days'))
},
host: null
}, {
limit: ps.limit,
skip: ps.offset,
sort: {
followersCount: -1
}
});
const users = await User.find({
_id: {
$nin: followingIds.concat(hideUserIds)
},
isLocked: { $ne: true },
updatedAt: {
$gte: new Date(Date.now() - ms('7days'))
},
host: null
}, {
limit: ps.limit,
skip: ps.offset,
sort: {
followersCount: -1
}
});
res(await Promise.all(users.map(user => pack(user, me, { detail: true }))));
return await Promise.all(users.map(user => pack(user, me, { detail: true })));
}
}));
});
type IRecommendUser = {
name: string;