wip PackedHoge => Packed<'Hoge'>

This commit is contained in:
tamaina 2021-09-12 22:18:26 +09:00
parent e749b756a0
commit dee40b33d2
1 changed files with 31 additions and 40 deletions

View File

@ -3,26 +3,17 @@ import Emitter from 'strict-event-emitter-types';
import { Channel } from '@/models/entities/channel'; import { Channel } from '@/models/entities/channel';
import { User } from '@/models/entities/user'; import { User } from '@/models/entities/user';
import { UserProfile } from '@/models/entities/user-profile'; import { UserProfile } from '@/models/entities/user-profile';
import { PackedUser } from '@/models/repositories/user';
import { PackedNotification } from '@/models/repositories/notification';
import { Note } from '@/models/entities/note'; import { Note } from '@/models/entities/note';
// import { Packed<'Note'> } from '@/models/repositories/note';
import { Antenna } from '@/models/entities/antenna'; import { Antenna } from '@/models/entities/antenna';
import { DriveFile } from '@/models/entities/drive-file'; import { DriveFile } from '@/models/entities/drive-file';
import { PackedDriveFile } from '@/models/repositories/drive-file';
import { DriveFolder } from '@/models/entities/drive-folder'; import { DriveFolder } from '@/models/entities/drive-folder';
import { PackedDriveFolder } from '@/models/repositories/drive-folder';
import { Emoji } from '@/models/entities/emoji'; import { Emoji } from '@/models/entities/emoji';
import { PackedEmoji } from '@/models/repositories/emoji';
import { UserList } from '@/models/entities/user-list'; import { UserList } from '@/models/entities/user-list';
import { MessagingMessage } from '@/models/entities/messaging-message'; import { MessagingMessage } from '@/models/entities/messaging-message';
import { PackedMessagingMessage } from '@/models/repositories/messaging-message';
import { UserGroup } from '@/models/entities/user-group'; import { UserGroup } from '@/models/entities/user-group';
import { ReversiGame } from '@/models/entities/games/reversi/game'; import { ReversiGame } from '@/models/entities/games/reversi/game';
import { PackedReversiGame } from '@/models/repositories/games/reversi/game';
import { PackedReversiMatching } from '@/models/repositories/games/reversi/matching';
import { AbuseUserReport } from '@/models/entities/abuse-user-report'; import { AbuseUserReport } from '@/models/entities/abuse-user-report';
import { PackedSignin } from '@/models/repositories/signin'; import { Signin } from '@/models/entities/signin';
import { Page } from '@/models/entities/page'; import { Page } from '@/models/entities/page';
import { Packed } from '@/misc/schema'; import { Packed } from '@/misc/schema';
@ -42,7 +33,7 @@ export interface InternalStreamTypes {
export interface BroadcastTypes { export interface BroadcastTypes {
emojiAdded: { emojiAdded: {
emoji: PackedEmoji; emoji: Packed<'Emoji'>;
}; };
} }
@ -53,40 +44,40 @@ export interface UserStreamTypes {
updateUserProfile: UserProfile; updateUserProfile: UserProfile;
mute: User; mute: User;
unmute: User; unmute: User;
follow: PackedUser; follow: Packed<'User'>;
unfollow: PackedUser; unfollow: Packed<'User'>;
userAdded: PackedUser; userAdded: Packed<'User'>;
} }
export interface MainStreamTypes { export interface MainStreamTypes {
notification: PackedNotification; notification: Packed<'Notification'>;
mention: Packed<'Note'>; mention: Packed<'Note'>;
reply: Packed<'Note'>; reply: Packed<'Note'>;
renote: Packed<'Note'>; renote: Packed<'Note'>;
follow: PackedUser; follow: Packed<'User'>;
followed: PackedUser; followed: Packed<'User'>;
unfollow: PackedUser; unfollow: Packed<'User'>;
meUpdated: PackedUser; meUpdated: Packed<'User'>;
pageEvent: { pageEvent: {
pageId: Page['id']; pageId: Page['id'];
event: string; event: string;
var: any; var: any;
userId: User['id']; userId: User['id'];
user: PackedUser; user: Packed<'User'>;
}; };
urlUploadFinished: { urlUploadFinished: {
marker?: string | null; marker?: string | null;
file: PackedDriveFile; file: Packed<'DriveFile'>;
}; };
readAllNotifications: undefined; readAllNotifications: undefined;
unreadNotification: PackedNotification; unreadNotification: Packed<'Notification'>;
unreadMention: Note['id']; unreadMention: Note['id'];
readAllUnreadMentions: undefined; readAllUnreadMentions: undefined;
unreadSpecifiedNote: Note['id']; unreadSpecifiedNote: Note['id'];
readAllUnreadSpecifiedNotes: undefined; readAllUnreadSpecifiedNotes: undefined;
readAllMessagingMessages: undefined; readAllMessagingMessages: undefined;
messagingMessage: PackedMessagingMessage; messagingMessage: Packed<'MessagingMessage'>;
unreadMessagingMessage: PackedMessagingMessage; unreadMessagingMessage: Packed<'MessagingMessage'>;
readAllAntennas: undefined; readAllAntennas: undefined;
unreadAntenna: Antenna; unreadAntenna: Antenna;
readAllAnnouncements: undefined; readAllAnnouncements: undefined;
@ -94,24 +85,24 @@ export interface MainStreamTypes {
unreadChannel: Note['id']; unreadChannel: Note['id'];
myTokenRegenerated: undefined; myTokenRegenerated: undefined;
reversiNoInvites: undefined; reversiNoInvites: undefined;
reversiInvited: PackedReversiMatching; reversiInvited: Packed<'ReversiMatching'>;
signin: PackedSignin; signin: Signin;
registryUpdated: { registryUpdated: {
scope?: string[]; scope?: string[];
key: string; key: string;
value: any | null; value: any | null;
}; };
driveFileCreated: PackedDriveFile; driveFileCreated: Packed<'DriveFile'>;
readAntenna: Antenna; readAntenna: Antenna;
} }
export interface DriveStreamTypes { export interface DriveStreamTypes {
fileCreated: PackedDriveFile; fileCreated: Packed<'DriveFile'>;
fileDeleted: DriveFile['id']; fileDeleted: DriveFile['id'];
fileUpdated: PackedDriveFile; fileUpdated: Packed<'DriveFile'>;
folderCreated: PackedDriveFolder; folderCreated: Packed<'DriveFolder'>;
folderDeleted: DriveFolder['id']; folderDeleted: DriveFolder['id'];
folderUpdated: PackedDriveFolder; folderUpdated: Packed<'DriveFolder'>;
} }
export interface NoteStreamTypes { export interface NoteStreamTypes {
@ -144,8 +135,8 @@ export interface ChannelStreamTypes {
} }
export interface UserListStreamTypes { export interface UserListStreamTypes {
userAdded: PackedUser; userAdded: Packed<'User'>;
userRemoved: PackedUser; userRemoved: Packed<'User'>;
} }
export interface AntennaStreamTypes { export interface AntennaStreamTypes {
@ -155,7 +146,7 @@ export interface AntennaStreamTypes {
export interface MessagingStreamTypes { export interface MessagingStreamTypes {
read: MessagingMessage['id'][]; read: MessagingMessage['id'][];
typing: User['id']; typing: User['id'];
message: PackedMessagingMessage; message: Packed<'MessagingMessage'>;
deleted: MessagingMessage['id']; deleted: MessagingMessage['id'];
} }
@ -165,25 +156,25 @@ export interface GroupMessagingStreamTypes {
userId: User['id']; userId: User['id'];
}; };
typing: User['id']; typing: User['id'];
message: PackedMessagingMessage; message: Packed<'MessagingMessage'>;
deleted: MessagingMessage['id']; deleted: MessagingMessage['id'];
} }
export interface MessagingIndexStreamTypes { export interface MessagingIndexStreamTypes {
read: MessagingMessage['id'][]; read: MessagingMessage['id'][];
message: PackedMessagingMessage; message: Packed<'MessagingMessage'>;
} }
export interface ReversiStreamTypes { export interface ReversiStreamTypes {
matched: PackedReversiGame; matched: Packed<'ReversiGame'>;
invited: PackedReversiMatching; invited: Packed<'ReversiMatching'>;
} }
export interface ReversiGameStreamTypes { export interface ReversiGameStreamTypes {
started: PackedReversiGame; started: Packed<'ReversiGame'>;
ended: { ended: {
winnerId?: User['id'] | null, winnerId?: User['id'] | null,
game: PackedReversiGame; game: Packed<'ReversiGame'>;
}; };
updateSettings: { updateSettings: {
key: string; key: string;