summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2018-10-08 18:31:00 +0900
committerGitHub <noreply@github.com>2018-10-08 18:31:00 +0900
commit1329721440c19df33dc8c5319fac38ee06d7537c (patch)
tree68d8330cb74714e103dc06144aed8f9dc473d8db /src/server
parentMerge pull request #2851 from mei23/mei-1008-fix-apshow2 (diff)
parentreplace var by const (diff)
downloadsharkey-1329721440c19df33dc8c5319fac38ee06d7537c.tar.gz
sharkey-1329721440c19df33dc8c5319fac38ee06d7537c.tar.bz2
sharkey-1329721440c19df33dc8c5319fac38ee06d7537c.zip
Merge pull request #2828 from hakaba-hitoyo/feature/external-user-recommendation
External user recommendation
Diffstat (limited to 'src/server')
-rw-r--r--src/server/api/endpoints/users/recommendation.ts100
1 files changed, 66 insertions, 34 deletions
diff --git a/src/server/api/endpoints/users/recommendation.ts b/src/server/api/endpoints/users/recommendation.ts
index e0a5cb9e36..6538a303b8 100644
--- a/src/server/api/endpoints/users/recommendation.ts
+++ b/src/server/api/endpoints/users/recommendation.ts
@@ -3,6 +3,8 @@ import $ from 'cafy';
import User, { pack, ILocalUser } from '../../../../models/user';
import { getFriendIds } from '../../common/get-friends';
import Mute from '../../../../models/mute';
+import * as request from 'request'
+import config from '../../../../config'
export const meta = {
desc: {
@@ -15,44 +17,74 @@ export const meta = {
};
export default (params: any, me: ILocalUser) => new Promise(async (res, rej) => {
- // Get 'limit' parameter
- const [limit = 10, limitErr] = $.num.optional.range(1, 100).get(params.limit);
- if (limitErr) return rej('invalid limit param');
+ if (config.user_recommendation && config.user_recommendation.external) {
+ const userName = me.username
+ const hostName = config.hostname
+ const limit = params.limit
+ const offset = params.offset
+ const timeout = config.user_recommendation.timeout
+ const engine = config.user_recommendation.engine
+ const url = engine
+ .replace('{{host}}', hostName)
+ .replace('{{user}}', userName)
+ .replace('{{limit}}', limit)
+ .replace('{{offset}}', offset)
+ request(
+ {
+ url: url,
+ timeout: timeout,
+ json: true,
+ followRedirect: true,
+ followAllRedirects: true
+ },
+ (error: any, response: any, body: any) => {
+ if (!error && response.statusCode == 200) {
+ res(body)
+ } else {
+ res([])
+ }
+ }
+ )
+ } else {
+ // Get 'limit' parameter
+ const [limit = 10, limitErr] = $.num.optional.range(1, 100).get(params.limit);
+ if (limitErr) return rej('invalid limit param');
- // Get 'offset' parameter
- const [offset = 0, offsetErr] = $.num.optional.min(0).get(params.offset);
- if (offsetErr) return rej('invalid offset param');
+ // Get 'offset' parameter
+ const [offset = 0, offsetErr] = $.num.optional.min(0).get(params.offset);
+ if (offsetErr) return rej('invalid offset param');
- // ID list of the user itself and other users who the user follows
- const followingIds = await getFriendIds(me._id);
+ // ID list of the user itself and other users who the user follows
+ const followingIds = await getFriendIds(me._id);
- // ミュートしているユーザーを取得
- const mutedUserIds = (await Mute.find({
- muterId: me._id
- })).map(m => m.muteeId);
+ // ミュートしているユーザーを取得
+ const mutedUserIds = (await Mute.find({
+ muterId: me._id
+ })).map(m => m.muteeId);
- const users = await User
- .find({
- _id: {
- $nin: followingIds.concat(mutedUserIds)
- },
- isLocked: false,
- $or: [{
- lastUsedAt: {
- $gte: new Date(Date.now() - ms('7days'))
- }
+ const users = await User
+ .find({
+ _id: {
+ $nin: followingIds.concat(mutedUserIds)
+ },
+ isLocked: false,
+ $or: [{
+ lastUsedAt: {
+ $gte: new Date(Date.now() - ms('7days'))
+ }
+ }, {
+ host: null
+ }]
}, {
- host: null
- }]
- }, {
- limit: limit,
- skip: offset,
- sort: {
- followersCount: -1
- }
- });
+ limit: limit,
+ skip: offset,
+ sort: {
+ followersCount: -1
+ }
+ });
- // Serialize
- res(await Promise.all(users.map(async user =>
- await pack(user, me, { detail: true }))));
+ // Serialize
+ res(await Promise.all(users.map(async user =>
+ await pack(user, me, { detail: true }))));
+ }
});