summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints/federation
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/federation
parentUpdate README.md [AUTOGEN] (#4639) (diff)
downloadsharkey-f0a29721c9fb10f97faf386bc9d6b1b2fad97895.tar.gz
sharkey-f0a29721c9fb10f97faf386bc9d6b1b2fad97895.tar.bz2
sharkey-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/federation')
-rw-r--r--src/server/api/endpoints/federation/instances.ts126
-rw-r--r--src/server/api/endpoints/federation/show-instance.ts4
2 files changed, 47 insertions, 83 deletions
diff --git a/src/server/api/endpoints/federation/instances.ts b/src/server/api/endpoints/federation/instances.ts
index f81f81822e..1946d26dec 100644
--- a/src/server/api/endpoints/federation/instances.ts
+++ b/src/server/api/endpoints/federation/instances.ts
@@ -1,6 +1,7 @@
import $ from 'cafy';
import define from '../../define';
-import Instance from '../../../../models/instance';
+import { Instances } from '../../../../models';
+import fetchMeta from '../../../../misc/fetch-meta';
export const meta = {
tags: ['federation'],
@@ -37,92 +38,55 @@ export const meta = {
};
export default define(meta, async (ps, me) => {
- let sort;
+ const query = Instances.createQueryBuilder('instance');
- if (ps.sort) {
- if (ps.sort == '+notes') {
- sort = {
- notesCount: -1
- };
- } else if (ps.sort == '-notes') {
- sort = {
- notesCount: 1
- };
- } else if (ps.sort == '+users') {
- sort = {
- usersCount: -1
- };
- } else if (ps.sort == '-users') {
- sort = {
- usersCount: 1
- };
- } else if (ps.sort == '+following') {
- sort = {
- followingCount: -1
- };
- } else if (ps.sort == '-following') {
- sort = {
- followingCount: 1
- };
- } else if (ps.sort == '+followers') {
- sort = {
- followersCount: -1
- };
- } else if (ps.sort == '-followers') {
- sort = {
- followersCount: 1
- };
- } else if (ps.sort == '+caughtAt') {
- sort = {
- caughtAt: -1
- };
- } else if (ps.sort == '-caughtAt') {
- sort = {
- caughtAt: 1
- };
- } else if (ps.sort == '+lastCommunicatedAt') {
- sort = {
- lastCommunicatedAt: -1
- };
- } else if (ps.sort == '-lastCommunicatedAt') {
- sort = {
- lastCommunicatedAt: 1
- };
- } else if (ps.sort == '+driveUsage') {
- sort = {
- driveUsage: -1
- };
- } else if (ps.sort == '-driveUsage') {
- sort = {
- driveUsage: 1
- };
- } else if (ps.sort == '+driveFiles') {
- sort = {
- driveFiles: -1
- };
- } else if (ps.sort == '-driveFiles') {
- sort = {
- driveFiles: 1
- };
+ switch (ps.sort) {
+ case '+notes': query.orderBy('instance.notesCount', 'DESC'); break;
+ case '-notes': query.orderBy('instance.notesCount', 'ASC'); break;
+ case '+usersCount': query.orderBy('instance.usersCount', 'DESC'); break;
+ case '-usersCount': query.orderBy('instance.usersCount', 'ASC'); break;
+ case '+followingCount': query.orderBy('instance.followingCount', 'DESC'); break;
+ case '-followingCount': query.orderBy('instance.followingCount', 'ASC'); break;
+ case '+followersCount': query.orderBy('instance.followersCount', 'DESC'); break;
+ case '-followersCount': query.orderBy('instance.followersCount', 'ASC'); break;
+ case '+caughtAt': query.orderBy('instance.caughtAt', 'DESC'); break;
+ case '-caughtAt': query.orderBy('instance.caughtAt', 'ASC'); break;
+ case '+lastCommunicatedAt': query.orderBy('instance.lastCommunicatedAt', 'DESC'); break;
+ case '-lastCommunicatedAt': query.orderBy('instance.lastCommunicatedAt', 'ASC'); break;
+ case '+driveUsage': query.orderBy('instance.driveUsage', 'DESC'); break;
+ case '-driveUsage': query.orderBy('instance.driveUsage', 'ASC'); break;
+ case '+driveFiles': query.orderBy('instance.driveFiles', 'DESC'); break;
+ case '-driveFiles': query.orderBy('instance.driveFiles', 'ASC'); break;
+
+ default: query.orderBy('instance.id', 'DESC'); break;
+ }
+
+ if (typeof ps.blocked === 'boolean') {
+ const meta = await fetchMeta();
+ if (ps.blocked) {
+ query.andWhere('instance.host IN (:...blocks)', { blocks: meta.blockedHosts });
+ } else {
+ query.andWhere('instance.host NOT IN (:...blocks)', { blocks: meta.blockedHosts });
}
- } else {
- sort = {
- _id: -1
- };
}
- const q = {} as any;
+ if (typeof ps.notResponding === 'boolean') {
+ if (ps.notResponding) {
+ query.andWhere('instance.isNotResponding = TRUE');
+ } else {
+ query.andWhere('instance.isNotResponding = FALSE');
+ }
+ }
- if (typeof ps.blocked === 'boolean') q.isBlocked = ps.blocked;
- if (typeof ps.notResponding === 'boolean') q.isNotResponding = ps.notResponding;
- if (typeof ps.markedAsClosed === 'boolean') q.isMarkedAsClosed = ps.markedAsClosed;
+ if (typeof ps.markedAsClosed === 'boolean') {
+ if (ps.markedAsClosed) {
+ query.andWhere('instance.isMarkedAsClosed = TRUE');
+ } else {
+ query.andWhere('instance.isMarkedAsClosed = FALSE');
+ }
+ }
- const instances = await Instance
- .find(q, {
- limit: ps.limit,
- sort: sort,
- skip: ps.offset
- });
+ const instances = await query.take(ps.limit).skip(ps.offset).getMany();
return instances;
});
diff --git a/src/server/api/endpoints/federation/show-instance.ts b/src/server/api/endpoints/federation/show-instance.ts
index e7f68620af..875afa05b2 100644
--- a/src/server/api/endpoints/federation/show-instance.ts
+++ b/src/server/api/endpoints/federation/show-instance.ts
@@ -1,6 +1,6 @@
import $ from 'cafy';
import define from '../../define';
-import Instance from '../../../../models/instance';
+import { Instances } from '../../../../models';
export const meta = {
tags: ['federation'],
@@ -15,7 +15,7 @@ export const meta = {
};
export default define(meta, async (ps, me) => {
- const instance = await Instance
+ const instance = await Instances
.findOne({ host: ps.host });
return instance;