usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update NoteDraftService.ts

This commit is contained in:
syuilo 2025-09-24 19:18:13 +09:00
parent 4b378af63d
commit 5c9df99b07
1 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
packages/backend/src/core/NoteDraftService.ts
View File

@ -18,22 +18,7 @@ import { isRenote, isQuote } from '@/misc/is-renote.js';
import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
import { QueueService } from '@/core/QueueService.js'; import { QueueService } from '@/core/QueueService.js';
export type NoteDraftOptions = { export type NoteDraftOptions = MiNoteDraft;
replyId: MiNote['id'] | null;
renoteId: MiNote['id'] | null;
text: string | null;
cw: string | null;
localOnly: boolean;
reactionAcceptance: typeof noteReactionAcceptances[number];
visibility: typeof noteVisibilities[number];
fileIds: MiDriveFile['id'][];
visibleUserIds: MiUser['id'][];
hashtag: string | null;
channelId: MiChannel['id'] | null;
poll: (IPoll & { expiredAfter?: number | null }) | null;
scheduledAt: Date | null;
isActuallyScheduled: boolean;
};
@Injectable() @Injectable()
export class NoteDraftService { export class NoteDraftService {
@ -84,16 +69,6 @@ export class NoteDraftService {
} }
//#endregion //#endregion
if (data.poll) {
if (typeof data.poll.expiresAt === 'number') {
if (data.poll.expiresAt < Date.now()) {
throw new IdentifiableError('04da457d-b083-4055-9082-955525eda5a5', 'Cannot create expired poll');
}
} else if (typeof data.poll.expiredAfter === 'number') {
data.poll.expiresAt = new Date(Date.now() + data.poll.expiredAfter);
}
}
await this.validate(me, data); await this.validate(me, data);
const draft = await this.noteDraftsRepository.insertOne({ const draft = await this.noteDraftsRepository.insertOne({
@ -120,16 +95,6 @@ export class NoteDraftService {
throw new IdentifiableError('49cd6b9d-848e-41ee-b0b9-adaca711a6b1', 'No such note draft'); throw new IdentifiableError('49cd6b9d-848e-41ee-b0b9-adaca711a6b1', 'No such note draft');
} }
if (data.poll) {
if (typeof data.poll.expiresAt === 'number') {
if (data.poll.expiresAt < Date.now()) {
throw new IdentifiableError('04da457d-b083-4055-9082-955525eda5a5', 'Cannot create expired poll');
}
} else if (typeof data.poll.expiredAfter === 'number') {
data.poll.expiresAt = new Date(Date.now() + data.poll.expiredAfter);
}
}
await this.validate(me, data); await this.validate(me, data);
await this.noteDraftsRepository.update(draftId, data); await this.noteDraftsRepository.update(draftId, data);
@ -181,6 +146,12 @@ export class NoteDraftService {
me: MiLocalUser, me: MiLocalUser,
data: Partial<NoteDraftOptions>, data: Partial<NoteDraftOptions>,
): Promise<void> { ): Promise<void> {
if (data.pollExpiresAt != null) {
if (data.pollExpiresAt.getTime() < Date.now()) {
throw new IdentifiableError('04da457d-b083-4055-9082-955525eda5a5', 'Cannot create expired poll');
}
}
//#region visibleUsers //#region visibleUsers
let visibleUsers: MiUser[] = []; let visibleUsers: MiUser[] = [];
if (data.visibleUserIds != null && data.visibleUserIds.length > 0) { if (data.visibleUserIds != null && data.visibleUserIds.length > 0) {