moris/misskey
1
0
Fork 0
forked from mirror/misskey
Code Pull Requests Activity

Update ClipService.ts

Browse Source
This commit is contained in:
syuilo 2023-09-20 11:36:39 +09:00
parent 053da10e94
commit 0183d24786
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/backend/src/core/ClipService.ts
View File

@ -4,7 +4,7 @@
*/ */
import { Inject, Injectable } from '@nestjs/common'; import { Inject, Injectable } from '@nestjs/common';
import * as Redis from 'ioredis'; import { QueryFailedError } from 'typeorm';
import { DI } from '@/di-symbols.js'; import { DI } from '@/di-symbols.js';
import type { ClipsRepository, MiNote, MiClip, ClipNotesRepository, NotesRepository } from '@/models/_.js'; import type { ClipsRepository, MiNote, MiClip, ClipNotesRepository, NotesRepository } from '@/models/_.js';
import { bindThis } from '@/decorators.js'; import { bindThis } from '@/decorators.js';
@ -22,12 +22,6 @@ export class ClipService {
public static TooManyClipsError = class extends Error {}; public static TooManyClipsError = class extends Error {};
constructor( constructor(
@Inject(DI.redis)
private redisClient: Redis.Redis,
@Inject(DI.redisForSub)
private redisForSub: Redis.Redis,
@Inject(DI.clipsRepository) @Inject(DI.clipsRepository)
private clipsRepository: ClipsRepository, private clipsRepository: ClipsRepository,
@ -119,11 +113,13 @@ export class ClipService {
noteId: noteId, noteId: noteId,
clipId: clip.id, clipId: clip.id,
}); });
} catch (e: any) { } catch (e: unknown) {
if (isDuplicateKeyValueError(e)) { if (e instanceof QueryFailedError) {
throw new ClipService.AlreadyAddedError(); if (isDuplicateKeyValueError(e)) {
} else if (e.detail.includes('is not present in table "note".')) { throw new ClipService.AlreadyAddedError();
throw new ClipService.NoSuchNoteError(); } else if (e.driverError.detail.includes('is not present in table "note".')) {
throw new ClipService.NoSuchNoteError();
}
} }
throw e; throw e;