wip: clip

3 files changed, 93 insertions, 2 deletions

diff --git a/src/server/api/endpoints/clips/add-note.ts b/src/server/api/endpoints/clips/add-note.ts
new file mode 100644
index 0000000000..4f5cc649e3
--- /dev/null
+++ b/src/server/api/endpoints/clips/add-note.ts
@@ -0,0 +1,76 @@
+import $ from 'cafy';
+import { ID } from '../../../../misc/cafy-id';
+import define from '../../define';
+import { ClipNotes, Clips } from '../../../../models';
+import { ApiError } from '../../error';
+import { genId } from '../../../../misc/gen-id';
+import { getNote } from '../../common/getters';
+
+export const meta = {
+	tags: ['account', 'notes', 'clips'],
+
+	requireCredential: true as const,
+
+	kind: 'write:account',
+
+	params: {
+		clipId: {
+			validator: $.type(ID),
+		},
+
+		noteId: {
+			validator: $.type(ID),
+		},
+	},
+
+	errors: {
+		noSuchClip: {
+			message: 'No such clip.',
+			code: 'NO_SUCH_CLIP',
+			id: 'd6e76cc0-a1b5-4c7c-a287-73fa9c716dcf'
+		},
+
+		noSuchNote: {
+			message: 'No such note.',
+			code: 'NO_SUCH_NOTE',
+			id: 'fc8c0b49-c7a3-4664-a0a6-b418d386bb8b'
+		},
+
+		alreadyClipped: {
+			message: 'The note has already been clipped.',
+			code: 'ALREADY_CLIPPED',
+			id: '734806c4-542c-463a-9311-15c512803965'
+		},
+	}
+};
+
+export default define(meta, async (ps, user) => {
+	const clip = await Clips.findOne({
+		id: ps.clipId,
+		userId: user.id
+	});
+
+	if (clip == null) {
+		throw new ApiError(meta.errors.noSuchClip);
+	}
+
+	const note = await getNote(ps.noteId).catch(e => {
+		if (e.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote);
+		throw e;
+	});
+
+	const exist = await ClipNotes.findOne({
+		noteId: note.id,
+		clipId: clip.id
+	});
+
+	if (exist != null) {
+		throw new ApiError(meta.errors.alreadyClipped);
+	}
+
+	await ClipNotes.save({
+		id: genId(),
+		noteId: note.id,
+		clipId: clip.id
+	});
+});
diff --git a/src/server/api/endpoints/clips/create.ts b/src/server/api/endpoints/clips/create.ts
index f1b20c1157..0d122dbb9b 100644
--- a/src/server/api/endpoints/clips/create.ts
+++ b/src/server/api/endpoints/clips/create.ts
@@ -13,6 +13,14 @@ export const meta = {
 	params: {
 		name: {
 			validator: $.str.range(1, 100)
+		},
+
+		isPublic: {
+			validator: $.optional.bool
+		},
+
+		description: {
+			validator: $.optional.nullable.str.range(1, 2048)
 		}
 	},
 };
@@ -23,6 +31,8 @@ export default define(meta, async (ps, user) => {
 		createdAt: new Date(),
 		userId: user.id,
 		name: ps.name,
+		isPublic: ps.isPublic,
+		description: ps.description,
 	});
 
 	return await Clips.pack(clip);
diff --git a/src/server/api/endpoints/clips/notes.ts b/src/server/api/endpoints/clips/notes.ts
index 4cd7e8c621..5289533a1e 100644
--- a/src/server/api/endpoints/clips/notes.ts
+++ b/src/server/api/endpoints/clips/notes.ts
@@ -1,10 +1,11 @@
 import $ from 'cafy';
 import { ID } from '../../../../misc/cafy-id';
 import define from '../../define';
-import { Clips, Notes } from '../../../../models';
+import { ClipNotes, Clips, Notes } from '../../../../models';
 import { makePaginationQuery } from '../../common/make-pagination-query';
 import { generateVisibilityQuery } from '../../common/generate-visibility-query';
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
+import { ApiError } from '../../error';
 
 export const meta = {
 	tags: ['account', 'notes', 'clips'],
@@ -14,6 +15,10 @@ export const meta = {
 	kind: 'read:account',
 
 	params: {
+		clipId: {
+			validator: $.type(ID),
+		},
+
 		limit: {
 			validator: $.optional.num.range(1, 100),
 			default: 10
@@ -30,7 +35,7 @@ export const meta = {
 
 	errors: {
 		noSuchClip: {
-			message: 'No such list.',
+			message: 'No such clip.',
 			code: 'NO_SUCH_CLIP',
 			id: '1d7645e6-2b6d-4635-b0fe-fe22b0e72e00'
 		}