summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2022-09-20 05:32:18 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2022-09-20 05:32:18 +0900
commit567c5501209d370c98a08ba7d25bfb274244a1ac (patch)
treeabeb42212ba1fc984f2a0e1f0d1a9e11d89702fc /packages/backend/src/server/api
parentMerge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff)
downloadsharkey-567c5501209d370c98a08ba7d25bfb274244a1ac.tar.gz
sharkey-567c5501209d370c98a08ba7d25bfb274244a1ac.tar.bz2
sharkey-567c5501209d370c98a08ba7d25bfb274244a1ac.zip
lint
Diffstat (limited to 'packages/backend/src/server/api')
-rw-r--r--packages/backend/src/server/api/common/GetterService.ts2
-rw-r--r--packages/backend/src/server/api/common/inject-featured.ts13
-rw-r--r--packages/backend/src/server/api/common/inject-promo.ts5
-rw-r--r--packages/backend/src/server/api/endpoints/endpoint.ts2
-rw-r--r--packages/backend/src/server/api/endpoints/notes/thread-muting/create.ts6
-rw-r--r--packages/backend/src/server/api/endpoints/notes/thread-muting/delete.ts2
-rw-r--r--packages/backend/src/server/api/openapi/schemas.ts5
7 files changed, 16 insertions, 19 deletions
diff --git a/packages/backend/src/server/api/common/GetterService.ts b/packages/backend/src/server/api/common/GetterService.ts
index a6b60d1f5a..5523539b91 100644
--- a/packages/backend/src/server/api/common/GetterService.ts
+++ b/packages/backend/src/server/api/common/GetterService.ts
@@ -1,6 +1,6 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
-import type { NotesRepository, UsersRepository } from '@/models/index.js';
+import { NotesRepository, UsersRepository } from '@/models/index.js';
import { IdentifiableError } from '@/misc/identifiable-error.js';
import type { User } from '@/models/entities/User.js';
import type { Note } from '@/models/entities/Note.js';
diff --git a/packages/backend/src/server/api/common/inject-featured.ts b/packages/backend/src/server/api/common/inject-featured.ts
index 75126fa304..d59bec33ab 100644
--- a/packages/backend/src/server/api/common/inject-featured.ts
+++ b/packages/backend/src/server/api/common/inject-featured.ts
@@ -1,9 +1,6 @@
import rndstr from 'rndstr';
-import { Note } from '@/models/entities/Note.js';
-import { User } from '@/models/entities/User.js';
-import { Notes, UserProfiles, NoteReactions } from '@/models/index.js';
-import { generateMutedUserQuery } from './generate-muted-user-query.js';
-import { generateBlockedUserQuery } from './generate-block-query.js';
+import type { Note } from '@/models/entities/Note.js';
+import type { User } from '@/models/entities/User.js';
// TODO: リアクション、Renote、返信などをしたノートは除外する
@@ -21,9 +18,9 @@ export async function injectFeatured(timeline: Note[], user?: User | null) {
const query = Notes.createQueryBuilder('note')
.addSelect('note.score')
.where('note.userHost IS NULL')
- .andWhere(`note.score > 0`)
- .andWhere(`note.createdAt > :date`, { date: new Date(Date.now() - day) })
- .andWhere(`note.visibility = 'public'`)
+ .andWhere('note.score > 0')
+ .andWhere('note.createdAt > :date', { date: new Date(Date.now() - day) })
+ .andWhere('note.visibility = \'public\'')
.innerJoinAndSelect('note.user', 'user');
if (user) {
diff --git a/packages/backend/src/server/api/common/inject-promo.ts b/packages/backend/src/server/api/common/inject-promo.ts
index 454f5dbb0e..fe02897509 100644
--- a/packages/backend/src/server/api/common/inject-promo.ts
+++ b/packages/backend/src/server/api/common/inject-promo.ts
@@ -1,7 +1,6 @@
import rndstr from 'rndstr';
-import { Note } from '@/models/entities/Note.js';
-import { User } from '@/models/entities/User.js';
-import { PromoReads, PromoNotes, Notes, Users } from '@/models/index.js';
+import type { Note } from '@/models/entities/Note.js';
+import type { User } from '@/models/entities/User.js';
export async function injectPromo(timeline: Note[], user?: User | null) {
if (timeline.length < 5) return;
diff --git a/packages/backend/src/server/api/endpoints/endpoint.ts b/packages/backend/src/server/api/endpoints/endpoint.ts
index 2141dfbeb0..a337a05f8c 100644
--- a/packages/backend/src/server/api/endpoints/endpoint.ts
+++ b/packages/backend/src/server/api/endpoints/endpoint.ts
@@ -25,7 +25,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
const ep = endpoints.find(x => x.name === ps.endpoint);
if (ep == null) return null;
return {
- params: Object.entries(ep.params.properties || {}).map(([k, v]) => ({
+ params: Object.entries(ep.params.properties ?? {}).map(([k, v]) => ({
name: k,
type: v.type.charAt(0).toUpperCase() + v.type.slice(1),
})),
diff --git a/packages/backend/src/server/api/endpoints/notes/thread-muting/create.ts b/packages/backend/src/server/api/endpoints/notes/thread-muting/create.ts
index 1c83adddff..060581d74b 100644
--- a/packages/backend/src/server/api/endpoints/notes/thread-muting/create.ts
+++ b/packages/backend/src/server/api/endpoints/notes/thread-muting/create.ts
@@ -53,9 +53,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
const mutedNotes = await this.notesRepository.find({
where: [{
- id: note.threadId || note.id,
+ id: note.threadId ?? note.id,
}, {
- threadId: note.threadId || note.id,
+ threadId: note.threadId ?? note.id,
}],
});
@@ -64,7 +64,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
await this.noteThreadMutingsRepository.insert({
id: this.idService.genId(),
createdAt: new Date(),
- threadId: note.threadId || note.id,
+ threadId: note.threadId ?? note.id,
userId: me.id,
});
});
diff --git a/packages/backend/src/server/api/endpoints/notes/thread-muting/delete.ts b/packages/backend/src/server/api/endpoints/notes/thread-muting/delete.ts
index 1f896734d1..aed15852d4 100644
--- a/packages/backend/src/server/api/endpoints/notes/thread-muting/delete.ts
+++ b/packages/backend/src/server/api/endpoints/notes/thread-muting/delete.ts
@@ -45,7 +45,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
});
await this.noteThreadMutingsRepository.delete({
- threadId: note.threadId || note.id,
+ threadId: note.threadId ?? note.id,
userId: me.id,
});
});
diff --git a/packages/backend/src/server/api/openapi/schemas.ts b/packages/backend/src/server/api/openapi/schemas.ts
index 14bef9cab1..796383f5e3 100644
--- a/packages/backend/src/server/api/openapi/schemas.ts
+++ b/packages/backend/src/server/api/openapi/schemas.ts
@@ -1,4 +1,5 @@
-import { refs, Schema } from '@/misc/schema.js';
+import type { Schema } from '@/misc/schema.js';
+import { refs } from '@/misc/schema.js';
export function convertSchemaToOpenApiSchema(schema: Schema) {
const res: any = schema;
@@ -55,6 +56,6 @@ export const schemas = {
},
...Object.fromEntries(
- Object.entries(refs).map(([key, schema]) => [key, convertSchemaToOpenApiSchema(schema)])
+ Object.entries(refs).map(([key, schema]) => [key, convertSchemaToOpenApiSchema(schema)]),
),
};