Merge pull request #11874 from misskey-dev/develop

Release: 2023.9.0

1 files changed, 17 insertions, 26 deletions

diff --git a/packages/backend/src/server/api/endpoints/clips/create.ts b/packages/backend/src/server/api/endpoints/clips/create.ts
index 5395a5c373..b4c7b52e72 100644
--- a/packages/backend/src/server/api/endpoints/clips/create.ts
+++ b/packages/backend/src/server/api/endpoints/clips/create.ts
@@ -1,11 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 import { Inject, Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
-import { IdService } from '@/core/IdService.js';
-import type { ClipsRepository } from '@/models/index.js';
+import type { MiClip } from '@/models/_.js';
 import { ClipEntityService } from '@/core/entities/ClipEntityService.js';
-import { DI } from '@/di-symbols.js';
-import { RoleService } from '@/core/RoleService.js';
 import { ApiError } from '@/server/api/error.js';
+import { ClipService } from '@/core/ClipService.js';
 
 export const meta = {
 	tags: ['clips'],
@@ -41,34 +44,22 @@ export const paramDef = {
 	required: ['name'],
 } as const;
 
-// eslint-disable-next-line import/no-default-export
 @Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> {
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
 	constructor(
-		@Inject(DI.clipsRepository)
-		private clipsRepository: ClipsRepository,
-
 		private clipEntityService: ClipEntityService,
-		private roleService: RoleService,
-		private idService: IdService,
+		private clipService: ClipService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			const currentCount = await this.clipsRepository.countBy({
-				userId: me.id,
-			});
-			if (currentCount > (await this.roleService.getUserPolicies(me.id)).clipLimit) {
-				throw new ApiError(meta.errors.tooManyClips);
+			let clip: MiClip;
+			try {
+				clip = await this.clipService.create(me, ps.name, ps.isPublic, ps.description ?? null);
+			} catch (e) {
+				if (e instanceof ClipService.TooManyClipsError) {
+					throw new ApiError(meta.errors.tooManyClips);
+				}
+				throw e;
 			}
-
-			const clip = await this.clipsRepository.insert({
-				id: this.idService.genId(),
-				createdAt: new Date(),
-				userId: me.id,
-				name: ps.name,
-				isPublic: ps.isPublic,
-				description: ps.description,
-			}).then(x => this.clipsRepository.findOneByOrFail(x.identifiers[0]));
-
 			return await this.clipEntityService.pack(clip, me);
 		});
 	}