summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints/admin/logs.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/admin/logs.ts
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/admin/logs.ts')
-rw-r--r--src/server/api/endpoints/admin/logs.ts66
1 files changed, 35 insertions, 31 deletions
diff --git a/src/server/api/endpoints/admin/logs.ts b/src/server/api/endpoints/admin/logs.ts
index 805a42b9e0..eee56a3939 100644
--- a/src/server/api/endpoints/admin/logs.ts
+++ b/src/server/api/endpoints/admin/logs.ts
@@ -1,6 +1,7 @@
import $ from 'cafy';
import define from '../../define';
-import Log from '../../../../models/log';
+import { Logs } from '../../../../models';
+import { Brackets } from 'typeorm';
export const meta = {
tags: ['admin'],
@@ -27,41 +28,44 @@ export const meta = {
};
export default define(meta, async (ps) => {
- const sort = {
- _id: -1
- };
- const query = {} as any;
+ const query = Logs.createQueryBuilder('log');
+
+ if (ps.level) query.andWhere('log.level = :level', { level: ps.level });
- if (ps.level) query.level = ps.level;
if (ps.domain) {
- for (const d of ps.domain.split(' ')) {
- const qs: any[] = [];
- let i = 0;
- for (const sd of (d.startsWith('-') ? d.substr(1) : d).split('.')) {
- qs.push({
- [`domain.${i}`]: d.startsWith('-') ? { $ne: sd } : sd
- });
- i++;
- }
- if (d.startsWith('-')) {
- if (query['$and'] == null) query['$and'] = [];
- query['$and'].push({
- $and: qs
- });
- } else {
- if (query['$or'] == null) query['$or'] = [];
- query['$or'].push({
- $and: qs
- });
- }
+ const whiteDomains = ps.domain.split(' ').filter(x => !x.startsWith('-'));
+ const blackDomains = ps.domain.split(' ').filter(x => x.startsWith('-'));
+
+ if (whiteDomains.length > 0) {
+ query.andWhere(new Brackets(qb => {
+ for (const whiteDomain of whiteDomains) {
+ let i = 0;
+ for (const subDomain of whiteDomain.split('.')) {
+ const p = `whiteSubDomain_${subDomain}_${i}`;
+ // SQL is 1 based, so we need '+ 1'
+ qb.orWhere(`log.domain[${i + 1}] = :${p}`, { [p]: subDomain });
+ i++;
+ }
+ }
+ }));
+ }
+
+ if (blackDomains.length > 0) {
+ query.andWhere(new Brackets(qb => {
+ for (const blackDomain of blackDomains) {
+ let i = 0;
+ for (const subDomain of blackDomain.split('.')) {
+ const p = `blackSubDomain_${subDomain}_${i}`;
+ // SQL is 1 based, so we need '+ 1'
+ qb.andWhere(`log.domain[${i + 1}] != :${p}`, { [p]: subDomain });
+ i++;
+ }
+ }
+ }));
}
}
- const logs = await Log
- .find(query, {
- limit: ps.limit,
- sort: sort
- });
+ const logs = await query.take(ps.limit).getMany();
return logs;
});