diff options
| author | Hakaba Hitoyo <tsukadayoshio@gmail.com> | 2018-11-21 23:44:59 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2018-11-21 23:44:59 +0900 |
| commit | ac14adfd3e9f3ad8b4d91ce1ede7a3916b7324f3 (patch) | |
| tree | 6b2ea196061adc9c9fcaf1747b9c161be512bfaa /src/server/api/endpoints/users | |
| parent | Improve usability (diff) | |
| download | sharkey-ac14adfd3e9f3ad8b4d91ce1ede7a3916b7324f3.tar.gz sharkey-ac14adfd3e9f3ad8b4d91ce1ede7a3916b7324f3.tar.bz2 sharkey-ac14adfd3e9f3ad8b4d91ce1ede7a3916b7324f3.zip | |
Feature / user recommendation config in admin ui (#3357)
* add config for external user recommendation into admin ui
* debug
* correct admin ui
* switch external user recommendation to admin ui config
* debug
* debug
* debug
* Revert "debug"
This reverts commit f4a0460e5bde21cd1f39a735f496a2d74233ef3f.
* explicit parseInt radix
* add Japanese message
* change default engine to https
* remove unused settings
* debug
* nullable externalUserRecommendationTimeout
Diffstat (limited to 'src/server/api/endpoints/users')
| -rw-r--r-- | src/server/api/endpoints/users/recommendation.ts | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/server/api/endpoints/users/recommendation.ts b/src/server/api/endpoints/users/recommendation.ts index 127029f83c..52e075006f 100644 --- a/src/server/api/endpoints/users/recommendation.ts +++ b/src/server/api/endpoints/users/recommendation.ts @@ -6,6 +6,8 @@ import Mute from '../../../../models/mute'; import * as request from 'request'; import config from '../../../../config'; import define from '../../define'; +import fetchMeta from '../../../../misc/fetch-meta'; + export const meta = { desc: { @@ -30,13 +32,15 @@ export const meta = { }; export default define(meta, (ps, me) => new Promise(async (res, rej) => { - if (config.user_recommendation && config.user_recommendation.external) { + const instance = await fetchMeta(); + + if (instance.enableExternalUserRecommendation) { const userName = me.username; const hostName = config.hostname; const limit = ps.limit; const offset = ps.offset; - const timeout = config.user_recommendation.timeout; - const engine = config.user_recommendation.engine; + const timeout = instance.externalUserRecommendationTimeout; + const engine = instance.externalUserRecommendationEngine; const url = engine .replace('{{host}}', hostName) .replace('{{user}}', userName) |