Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use Serialized in EntityService

Browse source
This commit is contained in:
tamaina 2023-06-04 18:26:05 +00:00
parent a1b243bbda
commit 4a104af304
34 changed files with 82 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

11
packages/backend/src/core/entities/NoteEntityService.ts
View file

@ -4,6 +4,7 @@ import * as mfm from 'mfm-js';
import { ModuleRef } from '@nestjs/core';
import { DI } from '@/di-symbols.js';
import type { Packed } from 'misskey-js';
import type { Serialized } from 'schema-type';
import { nyaize } from '@/misc/nyaize.js';
import { awaitAll } from '@/misc/prelude/await-all.js';
import type { User } from '@/models/entities/User.js';
@ -70,7 +71,7 @@ export class NoteEntityService implements OnModuleInit {
}
@bindThis
private async hideNote(packedNote: Packed<'Note'>, meId: User['id'] | null) {
private async hideNote(packedNote: Serialized<Packed<'Note'>>, meId: User['id'] | null) {
// TODO: isVisibleForMe を使うようにしても良さそう(型違うけど)
let hide = false;
@ -255,7 +256,7 @@ export class NoteEntityService implements OnModuleInit {
}
@bindThis
public async packAttachedFiles(fileIds: Note['fileIds'], packedFiles: Map<Note['fileIds'][number], Packed<'DriveFile'> | null>): Promise<Packed<'DriveFile'>[]> {
public async packAttachedFiles(fileIds: Note['fileIds'], packedFiles: Map<Note['fileIds'][number], Serialized<Packed<'DriveFile'>> | null>): Promise<Serialized<Packed<'DriveFile'>>[]> {
const missingIds = [];
for (const id of fileIds) {
if (!packedFiles.has(id)) missingIds.push(id);
@ -278,10 +279,10 @@ export class NoteEntityService implements OnModuleInit {
skipHide?: boolean;
_hint_?: {
myReactions: Map<Note['id'], NoteReaction | null>;
packedFiles: Map<Note['fileIds'][number], Packed<'DriveFile'> | null>;
packedFiles: Map<Note['fileIds'][number], Serialized<Packed<'DriveFile'>> | null>;
};
},
): Promise<Packed<'Note'>> {
): Promise<Serialized<Packed<'Note'>>> {
const opts = Object.assign({
detail: true,
skipHide: false,
@ -308,7 +309,7 @@ export class NoteEntityService implements OnModuleInit {
.map(x => this.reactionService.decodeReaction(x).reaction.replaceAll(':', ''));
const packedFiles = options?._hint_?.packedFiles;
const packed: Packed<'Note'> = await awaitAll({
const packed: Serialized<Packed<'Note'>> = await awaitAll({
id: note.id,
createdAt: note.createdAt.toISOString(),
userId: note.userId,