From b75184ec8e3436200bacdcd832e3324702553d20 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 18 Sep 2022 03:27:08 +0900
Subject: なんかもうめっちゃ変えた
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/src/server/api/openapi/gen-spec.ts     | 190 ---------------------
 1 file changed, 190 deletions(-)
 delete mode 100644 packages/backend/src/server/api/openapi/gen-spec.ts

(limited to 'packages/backend/src/server/api/openapi')

diff --git a/packages/backend/src/server/api/openapi/gen-spec.ts b/packages/backend/src/server/api/openapi/gen-spec.ts
deleted file mode 100644
index 68fa814041..0000000000
--- a/packages/backend/src/server/api/openapi/gen-spec.ts
+++ /dev/null
@@ -1,190 +0,0 @@
-import endpoints from '../endpoints.js';
-import config from '@/config/index.js';
-import { errors as basicErrors } from './errors.js';
-import { schemas, convertSchemaToOpenApiSchema } from './schemas.js';
-
-export function genOpenapiSpec() {
-	const spec = {
-		openapi: '3.0.0',
-
-		info: {
-			version: 'v1',
-			title: 'Misskey API',
-			'x-logo': { url: '/static-assets/api-doc.png' },
-		},
-
-		externalDocs: {
-			description: 'Repository',
-			url: 'https://github.com/misskey-dev/misskey',
-		},
-
-		servers: [{
-			url: config.apiUrl,
-		}],
-
-		paths: {} as any,
-
-		components: {
-			schemas: schemas,
-
-			securitySchemes: {
-				ApiKeyAuth: {
-					type: 'apiKey',
-					in: 'body',
-					name: 'i',
-				},
-			},
-		},
-	};
-
-	for (const endpoint of endpoints.filter(ep => !ep.meta.secure)) {
-		const errors = {} as any;
-
-		if (endpoint.meta.errors) {
-			for (const e of Object.values(endpoint.meta.errors)) {
-				errors[e.code] = {
-					value: {
-						error: e,
-					},
-				};
-			}
-		}
-
-		const resSchema = endpoint.meta.res ? convertSchemaToOpenApiSchema(endpoint.meta.res) : {};
-
-		let desc = (endpoint.meta.description ? endpoint.meta.description : 'No description provided.') + '\n\n';
-		desc += `**Credential required**: *${endpoint.meta.requireCredential ? 'Yes' : 'No'}*`;
-		if (endpoint.meta.kind) {
-			const kind = endpoint.meta.kind;
-			desc += ` / **Permission**: *${kind}*`;
-		}
-
-		const requestType = endpoint.meta.requireFile ? 'multipart/form-data' : 'application/json';
-		const schema = endpoint.params;
-
-		if (endpoint.meta.requireFile) {
-			schema.properties.file = {
-				type: 'string',
-				format: 'binary',
-				description: 'The file contents.',
-			};
-			schema.required.push('file');
-		}
-
-		const info = {
-			operationId: endpoint.name,
-			summary: endpoint.name,
-			description: desc,
-			externalDocs: {
-				description: 'Source code',
-				url: `https://github.com/misskey-dev/misskey/blob/develop/packages/backend/src/server/api/endpoints/${endpoint.name}.ts`,
-			},
-			...(endpoint.meta.tags ? {
-				tags: [endpoint.meta.tags[0]],
-			} : {}),
-			...(endpoint.meta.requireCredential ? {
-				security: [{
-					ApiKeyAuth: [],
-				}],
-			} : {}),
-			requestBody: {
-				required: true,
-				content: {
-					[requestType]: {
-						schema,
-					},
-				},
-			},
-			responses: {
-				...(endpoint.meta.res ? {
-					'200': {
-						description: 'OK (with results)',
-						content: {
-							'application/json': {
-								schema: resSchema,
-							},
-						},
-					},
-				} : {
-					'204': {
-						description: 'OK (without any results)',
-					},
-				}),
-				'400': {
-					description: 'Client error',
-					content: {
-						'application/json': {
-							schema: {
-								$ref: '#/components/schemas/Error',
-							},
-							examples: { ...errors, ...basicErrors['400'] },
-						},
-					},
-				},
-				'401': {
-					description: 'Authentication error',
-					content: {
-						'application/json': {
-							schema: {
-								$ref: '#/components/schemas/Error',
-							},
-							examples: basicErrors['401'],
-						},
-					},
-				},
-				'403': {
-					description: 'Forbidden error',
-					content: {
-						'application/json': {
-							schema: {
-								$ref: '#/components/schemas/Error',
-							},
-							examples: basicErrors['403'],
-						},
-					},
-				},
-				'418': {
-					description: 'I\'m Ai',
-					content: {
-						'application/json': {
-							schema: {
-								$ref: '#/components/schemas/Error',
-							},
-							examples: basicErrors['418'],
-						},
-					},
-				},
-				...(endpoint.meta.limit ? {
-					'429': {
-						description: 'To many requests',
-						content: {
-							'application/json': {
-								schema: {
-									$ref: '#/components/schemas/Error',
-								},
-								examples: basicErrors['429'],
-							},
-						},
-					},
-				} : {}),
-				'500': {
-					description: 'Internal server error',
-					content: {
-						'application/json': {
-							schema: {
-								$ref: '#/components/schemas/Error',
-							},
-							examples: basicErrors['500'],
-						},
-					},
-				},
-			},
-		};
-
-		spec.paths['/' + endpoint.name] = {
-			post: info,
-		};
-	}
-
-	return spec;
-}
-- 
cgit v1.2.3-freya


From 567c5501209d370c98a08ba7d25bfb274244a1ac Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 20 Sep 2022 05:32:18 +0900
Subject: lint

---
 packages/backend/src/core/DriveService.ts                   |  6 +++---
 packages/backend/src/misc/gen-identicon.ts                  |  2 +-
 packages/backend/src/misc/is-instance-muted.ts              | 10 +++++-----
 packages/backend/src/misc/is-quote.ts                       |  2 +-
 packages/backend/src/misc/show-machine-info.ts              |  2 +-
 packages/backend/src/server/api/common/GetterService.ts     |  2 +-
 packages/backend/src/server/api/common/inject-featured.ts   | 13 +++++--------
 packages/backend/src/server/api/common/inject-promo.ts      |  5 ++---
 packages/backend/src/server/api/endpoints/endpoint.ts       |  2 +-
 .../src/server/api/endpoints/notes/thread-muting/create.ts  |  6 +++---
 .../src/server/api/endpoints/notes/thread-muting/delete.ts  |  2 +-
 packages/backend/src/server/api/openapi/schemas.ts          |  5 +++--
 packages/client/.eslintrc.js                                |  2 +-
 13 files changed, 28 insertions(+), 31 deletions(-)

(limited to 'packages/backend/src/server/api/openapi')

diff --git a/packages/backend/src/core/DriveService.ts b/packages/backend/src/core/DriveService.ts
index 467f3c1cde..e356fa0009 100644
--- a/packages/backend/src/core/DriveService.ts
+++ b/packages/backend/src/core/DriveService.ts
@@ -147,7 +147,7 @@ export class DriveService {
 			}
 
 			const baseUrl = meta.objectStorageBaseUrl
-			|| `${ meta.objectStorageUseSSL ? 'https' : 'http' }://${ meta.objectStorageEndpoint }${ meta.objectStoragePort ? `:${meta.objectStoragePort}` : '' }/${ meta.objectStorageBucket }`;
+				?? `${ meta.objectStorageUseSSL ? 'https' : 'http' }://${ meta.objectStorageEndpoint }${ meta.objectStoragePort ? `:${meta.objectStoragePort}` : '' }/${ meta.objectStorageBucket }`;
 
 			// for original
 			const key = `${meta.objectStoragePrefix}/${uuid()}${ext}`;
@@ -285,7 +285,7 @@ export class DriveService {
 
 			satisfyWebpublic = !!(
 				type !== 'image/svg+xml' && type !== 'image/webp' &&
-			!(metadata.exif || metadata.iptc || metadata.xmp || metadata.tifftagPhotoshop) &&
+			!(metadata.exif ?? metadata.iptc ?? metadata.xmp ?? metadata.tifftagPhotoshop) &&
 			metadata.width && metadata.width <= 2048 &&
 			metadata.height && metadata.height <= 2048
 			);
@@ -438,7 +438,7 @@ export class DriveService {
 		//}
 
 		// detect name
-		const detectedName = name || (info.type.ext ? `untitled.${info.type.ext}` : 'untitled');
+		const detectedName = name ?? (info.type.ext ? `untitled.${info.type.ext}` : 'untitled');
 
 		if (user && !force) {
 		// Check if there is a file with the same hash
diff --git a/packages/backend/src/misc/gen-identicon.ts b/packages/backend/src/misc/gen-identicon.ts
index 322ffee22e..4a70d7a4bb 100644
--- a/packages/backend/src/misc/gen-identicon.ts
+++ b/packages/backend/src/misc/gen-identicon.ts
@@ -3,9 +3,9 @@
  * https://en.wikipedia.org/wiki/Identicon
  */
 
-import { WriteStream } from 'node:fs';
 import * as p from 'pureimage';
 import gen from 'random-seed';
+import type { WriteStream } from 'node:fs';
 
 const size = 128; // px
 const n = 5; // resolution
diff --git a/packages/backend/src/misc/is-instance-muted.ts b/packages/backend/src/misc/is-instance-muted.ts
index a74ba524e3..e11a18bb70 100644
--- a/packages/backend/src/misc/is-instance-muted.ts
+++ b/packages/backend/src/misc/is-instance-muted.ts
@@ -1,15 +1,15 @@
-import { Packed } from './schema.js';
+import type { Packed } from './schema.js';
 
 export function isInstanceMuted(note: Packed<'Note'>, mutedInstances: Set<string>): boolean {
-	if (mutedInstances.has(note?.user?.host ?? '')) return true;
-	if (mutedInstances.has(note?.reply?.user?.host ?? '')) return true;
-	if (mutedInstances.has(note?.renote?.user?.host ?? '')) return true;
+	if (mutedInstances.has(note.user.host ?? '')) return true;
+	if (mutedInstances.has(note.reply?.user.host ?? '')) return true;
+	if (mutedInstances.has(note.renote?.user.host ?? '')) return true;
 
 	return false;
 }
 
 export function isUserFromMutedInstance(notif: Packed<'Notification'>, mutedInstances: Set<string>): boolean {
-	if (mutedInstances.has(notif?.user?.host ?? '')) return true;
+	if (mutedInstances.has(notif.user?.host ?? '')) return true;
 
 	return false;
 }
diff --git a/packages/backend/src/misc/is-quote.ts b/packages/backend/src/misc/is-quote.ts
index 6ea71cd878..248b25a0bf 100644
--- a/packages/backend/src/misc/is-quote.ts
+++ b/packages/backend/src/misc/is-quote.ts
@@ -1,4 +1,4 @@
-import { Note } from '@/models/entities/Note.js';
+import type { Note } from '@/models/entities/Note.js';
 
 export default function(note: Note): boolean {
 	return note.renoteId != null && (note.text != null || note.hasPoll || (note.fileIds != null && note.fileIds.length > 0));
diff --git a/packages/backend/src/misc/show-machine-info.ts b/packages/backend/src/misc/show-machine-info.ts
index bfb1b85f33..fa5a53e313 100644
--- a/packages/backend/src/misc/show-machine-info.ts
+++ b/packages/backend/src/misc/show-machine-info.ts
@@ -1,6 +1,6 @@
 import * as os from 'node:os';
 import sysUtils from 'systeminformation';
-import Logger from '@/core/logger.js';
+import type Logger from '@/logger.js';
 
 export async function showMachineInfo(parentLogger: Logger) {
 	const logger = parentLogger.createSubLogger('machine');
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)]),
 	),
 };
diff --git a/packages/client/.eslintrc.js b/packages/client/.eslintrc.js
index 01dedd1c69..c3a78bd5fd 100644
--- a/packages/client/.eslintrc.js
+++ b/packages/client/.eslintrc.js
@@ -38,7 +38,7 @@ module.exports = {
 		'vue/no-multi-spaces': ['error', {
 			'ignoreProperties': false,
 		}],
-		'vue/no-v-html': 'error',
+		'vue/no-v-html': 'warn',
 		'vue/order-in-components': 'error',
 		'vue/html-indent': ['warn', 'tab', {
 			'attribute': 1,
-- 
cgit v1.2.3-freya