summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints/users/recommendation.ts
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2019-04-07 21:50:36 +0900
committerGitHub <noreply@github.com>2019-04-07 21:50:36 +0900
commitf0a29721c9fb10f97faf386bc9d6b1b2fad97895 (patch)
treeb5c1d38d698589bb444c0881a431391db91eb5bc /src/server/api/endpoints/users/recommendation.ts
parentUpdate README.md [AUTOGEN] (#4639) (diff)
downloadmisskey-f0a29721c9fb10f97faf386bc9d6b1b2fad97895.tar.gz
misskey-f0a29721c9fb10f97faf386bc9d6b1b2fad97895.tar.bz2
misskey-f0a29721c9fb10f97faf386bc9d6b1b2fad97895.zip
Use PostgreSQL instead of MongoDB (#4572)
* wip * Update note.ts * Update timeline.ts * Update core.ts * wip * Update generate-visibility-query.ts * wip * wip * wip * wip * wip * Update global-timeline.ts * wip * wip * wip * Update vote.ts * wip * wip * Update create.ts * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * Update files.ts * wip * wip * Update CONTRIBUTING.md * wip * wip * wip * wip * wip * wip * wip * wip * Update read-notification.ts * wip * wip * wip * wip * wip * wip * wip * Update cancel.ts * wip * wip * wip * Update show.ts * wip * wip * Update gen-id.ts * Update create.ts * Update id.ts * wip * wip * wip * wip * wip * wip * wip * Docker: Update files about Docker (#4599) * Docker: Use cache if files used by `yarn install` was not updated This patch reduces the number of times to installing node_modules. For example, `yarn install` step will be skipped when only ".config/default.yml" is updated. * Docker: Migrate MongoDB to Postgresql Misskey uses Postgresql as a database instead of Mongodb since version 11. * Docker: Uncomment about data persistence This patch will save a lot of databases. * wip * wip * wip * Update activitypub.ts * wip * wip * wip * Update logs.ts * wip * Update drive-file.ts * Update register.ts * wip * wip * Update mentions.ts * wip * wip * wip * Update recommendation.ts * wip * Update index.ts * wip * Update recommendation.ts * Doc: Update docker.ja.md and docker.en.md (#1) (#4608) Update how to set up misskey. * wip * :v: * wip * Update note.ts * Update postgre.ts * wip * wip * wip * wip * Update add-file.ts * wip * wip * wip * Clean up * Update logs.ts * wip * :pizza: * wip * Ad notes * wip * Update api-visibility.ts * Update note.ts * Update add-file.ts * tests * tests * Update postgre.ts * Update utils.ts * wip * wip * Refactor * wip * Refactor * wip * wip * Update show-users.ts * Update update-instance.ts * wip * Update feed.ts * Update outbox.ts * Update outbox.ts * Update user.ts * wip * Update list.ts * Update update-hashtag.ts * wip * Update update-hashtag.ts * Refactor * Update update.ts * wip * wip * :v: * clean up * docs * Update push.ts * wip * Update api.ts * wip * :v: * Update make-pagination-query.ts * :v: * Delete hashtags.ts * Update instances.ts * Update instances.ts * Update create.ts * Update search.ts * Update reversi-game.ts * Update signup.ts * Update user.ts * id * Update example.yml * :art: * objectid * fix * reversi * reversi * Fix bug of chart engine * Add test of chart engine * Improve test * Better testing * Improve chart engine * Refactor * Add test of chart engine * Refactor * Add chart test * Fix bug * コミットし忘れ * Refactoring * :v: * Add tests * Add test * Extarct note tests * Refactor * 存在しないユーザーにメンションできなくなっていた問題を修正 * Fix bug * Update update-meta.ts * Fix bug * Update mention.vue * Fix bug * Update meta.ts * Update CONTRIBUTING.md * Fix bug * Fix bug * Fix bug * Clean up * Clean up * Update notification.ts * Clean up * Add mute tests * Add test * Refactor * Add test * Fix test * Refactor * Refactor * Add tests * Update utils.ts * Update utils.ts * Fix test * Update package.json * Update update.ts * Update manifest.ts * Fix bug * Fix bug * Add test * :art: * Update endpoint permissions * Updaye permisison * Update person.ts #4299 * データベースと同期しないように * Fix bug * Fix bug * Update reversi-game.ts * Use a feature of Node v11.7.0 to extract a public key (#4644) * wip * wip * :v: * Refactoring #1540 * test * test * test * test * test * test * test * Fix bug * Fix test * :sushi: * wip * #4471 * Add test for #4335 * Refactor * Fix test * Add tests * :clock4: * Fix bug * Add test * Add test * rename * Fix bug
Diffstat (limited to 'src/server/api/endpoints/users/recommendation.ts')
-rw-r--r--src/server/api/endpoints/users/recommendation.ts99
1 files changed, 17 insertions, 82 deletions
diff --git a/src/server/api/endpoints/users/recommendation.ts b/src/server/api/endpoints/users/recommendation.ts
index 60710fffca..2c82d6613e 100644
--- a/src/server/api/endpoints/users/recommendation.ts
+++ b/src/server/api/endpoints/users/recommendation.ts
@@ -1,14 +1,8 @@
import * as ms from 'ms';
import $ from 'cafy';
-import User, { pack, ILocalUser } from '../../../../models/user';
-import { getFriendIds } from '../../common/get-friends';
-import * as request from 'request-promise-native';
-import config from '../../../../config';
import define from '../../define';
-import fetchMeta from '../../../../misc/fetch-meta';
-import resolveUser from '../../../../remote/resolve-user';
-import { getHideUserIds } from '../../common/get-hide-users';
-import { apiLogger } from '../../logger';
+import { Users, Followings } from '../../../../models';
+import { generateMuteQueryForUsers } from '../../common/generate-mute-query';
export const meta = {
desc: {
@@ -19,7 +13,7 @@ export const meta = {
requireCredential: true,
- kind: 'account-read',
+ kind: 'read:account',
params: {
limit: {
@@ -42,83 +36,24 @@ export const meta = {
};
export default define(meta, async (ps, me) => {
- const instance = await fetchMeta();
+ const query = Users.createQueryBuilder('user')
+ .where('user.isLocked = FALSE')
+ .where('user.host IS NULL')
+ .where('user.updatedAt >= :date', { date: new Date(Date.now() - ms('7days')) })
+ .orderBy('user.followersCount', 'DESC');
- if (instance.enableExternalUserRecommendation) {
- const userName = me.username;
- const hostName = config.hostname;
- const limit = ps.limit;
- const offset = ps.offset;
- const timeout = instance.externalUserRecommendationTimeout;
- const engine = instance.externalUserRecommendationEngine;
- const url = engine
- .replace('{{host}}', hostName)
- .replace('{{user}}', userName)
- .replace('{{limit}}', limit.toString())
- .replace('{{offset}}', offset.toString());
+ generateMuteQueryForUsers(query, me);
- const users = await request({
- url: url,
- proxy: config.proxy,
- timeout: timeout,
- json: true,
- followRedirect: true,
- followAllRedirects: true
- })
- .then(body => convertUsers(body, me));
+ const followingQuery = Followings.createQueryBuilder('following')
+ .select('following.followeeId')
+ .where('following.followerId = :followerId', { followerId: me.id });
- return users;
- } else {
- // ID list of the user itself and other users who the user follows
- const followingIds = await getFriendIds(me._id);
+ query
+ .andWhere(`user.id NOT IN (${ followingQuery.getQuery() })`);
- // 隠すユーザーを取得
- const hideUserIds = await getHideUserIds(me);
+ query.setParameters(followingQuery.getParameters());
- 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 query.take(ps.limit).skip(ps.offset).getMany();
- return await Promise.all(users.map(user => pack(user, me, { detail: true })));
- }
+ return await Users.packMany(users, me, { detail: true });
});
-
-type IRecommendUser = {
- name: string;
- username: string;
- host: string;
- description: string;
- avatarUrl: string;
-};
-
-/**
- * Resolve/Pack dummy users
- */
-async function convertUsers(src: IRecommendUser[], me: ILocalUser) {
- const packed = await Promise.all(src.map(async x => {
- const user = await resolveUser(x.username, x.host)
- .catch(() => {
- apiLogger.warn(`Can't resolve ${x.username}@${x.host}`);
- return null;
- });
-
- if (user == null) return x;
-
- return await pack(user, me, { detail: true });
- }));
-
- return packed;
-}