From 4ad0d7b13f2eba241ad3bf93e04e10172a1930d4 Mon Sep 17 00:00:00 2001
From: yukineko <27853966+hideki0403@users.noreply.github.com>
Date: Mon, 8 Jan 2024 15:44:45 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20backend=E3=81=AEtypecheck=E3=81=8C?=
=?UTF-8?q?=E8=90=BD=E3=81=A1=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=82=92?=
=?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/backend/src/core/GlobalEventService.ts | 4 ++--
packages/misskey-js/src/streaming.types.ts | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/packages/backend/src/core/GlobalEventService.ts b/packages/backend/src/core/GlobalEventService.ts
index 8d7a4339cf..da57a80721 100644
--- a/packages/backend/src/core/GlobalEventService.ts
+++ b/packages/backend/src/core/GlobalEventService.ts
@@ -53,9 +53,9 @@ export interface MainEventTypes {
reply: Packed<'Note'>;
renote: Packed<'Note'>;
follow: Packed<'UserDetailedNotMe'>;
- followed: Packed<'UserDetailed'>;
+ followed: Packed<'UserDetailed' | 'UserLite'>;
unfollow: Packed<'UserDetailed'>;
- meUpdated: Packed<'MeDetailed'>;
+ meUpdated: Packed<'UserDetailed'>;
pageEvent: {
pageId: MiPage['id'];
event: string;
diff --git a/packages/misskey-js/src/streaming.types.ts b/packages/misskey-js/src/streaming.types.ts
index a8dff31879..b972fe3062 100644
--- a/packages/misskey-js/src/streaming.types.ts
+++ b/packages/misskey-js/src/streaming.types.ts
@@ -2,13 +2,13 @@ import {
Antenna,
DriveFile,
DriveFolder,
- MeDetailed,
Note,
Notification,
Signin,
User,
UserDetailed,
UserDetailedNotMe,
+ UserLite,
} from './autogen/models.js';
import {
AnnouncementCreated,
@@ -30,9 +30,9 @@ export type Channels = {
reply: (payload: Note) => void;
renote: (payload: Note) => void;
follow: (payload: UserDetailedNotMe) => void; // 自分が他人をフォローしたとき
- followed: (payload: UserDetailed) => void; // 他人が自分をフォローしたとき
+ followed: (payload: UserDetailed | UserLite) => void; // 他人が自分をフォローしたとき
unfollow: (payload: UserDetailed) => void; // 自分が他人をフォロー解除したとき
- meUpdated: (payload: MeDetailed) => void;
+ meUpdated: (payload: UserDetailed) => void;
pageEvent: (payload: PageEvent) => void;
urlUploadFinished: (payload: { marker: string; file: DriveFile; }) => void;
readAllNotifications: () => void;