From dd5100d124837adcd436e347d36f58a0a912e43e Mon Sep 17 00:00:00 2001 From: Chloe Kudryavtsev Date: Fri, 7 Oct 2022 15:38:18 -0400 Subject: [PATCH] add streaming events for renotemuting and blocking --- .../src/server/api/endpoints/blocking/create.ts | 2 ++ .../src/server/api/endpoints/blocking/delete.ts | 2 ++ .../server/api/endpoints/renote-mute/create.ts | 2 +- .../server/api/endpoints/renote-mute/delete.ts | 2 +- packages/backend/src/server/api/stream/index.ts | 17 +++++++++++++++-- packages/backend/src/server/api/stream/types.ts | 4 ++++ 6 files changed, 25 insertions(+), 4 deletions(-) diff --git a/packages/backend/src/server/api/endpoints/blocking/create.ts b/packages/backend/src/server/api/endpoints/blocking/create.ts index 95e3fca23..14d6e121d 100644 --- a/packages/backend/src/server/api/endpoints/blocking/create.ts +++ b/packages/backend/src/server/api/endpoints/blocking/create.ts @@ -87,4 +87,6 @@ export default define(meta, paramDef, async (ps, user) => { return await Users.pack(blockee.id, blocker, { detail: true, }); + + publishUserEvent(user.id, 'block', blockee); }); diff --git a/packages/backend/src/server/api/endpoints/blocking/delete.ts b/packages/backend/src/server/api/endpoints/blocking/delete.ts index 4c3234f97..53efc5cca 100644 --- a/packages/backend/src/server/api/endpoints/blocking/delete.ts +++ b/packages/backend/src/server/api/endpoints/blocking/delete.ts @@ -83,4 +83,6 @@ export default define(meta, paramDef, async (ps, user) => { return await Users.pack(blockee.id, blocker, { detail: true, }); + + publishUserEvent(user.id, 'unblock', blockee); }); diff --git a/packages/backend/src/server/api/endpoints/renote-mute/create.ts b/packages/backend/src/server/api/endpoints/renote-mute/create.ts index 2c550019e..dae96be15 100644 --- a/packages/backend/src/server/api/endpoints/renote-mute/create.ts +++ b/packages/backend/src/server/api/endpoints/renote-mute/create.ts @@ -74,5 +74,5 @@ export default define(meta, paramDef, async (ps, user) => { muteeId: mutee.id, } as RenoteMuting); - // publishUserEvent(user.id, 'mute', mutee); + publishUserEvent(user.id, 'muteRenote', mutee); }); diff --git a/packages/backend/src/server/api/endpoints/renote-mute/delete.ts b/packages/backend/src/server/api/endpoints/renote-mute/delete.ts index 3a77a4a29..94e995dfa 100644 --- a/packages/backend/src/server/api/endpoints/renote-mute/delete.ts +++ b/packages/backend/src/server/api/endpoints/renote-mute/delete.ts @@ -69,5 +69,5 @@ export default define(meta, paramDef, async (ps, user) => { id: exist.id, }); - // publishUserEvent(user.id, 'unmute', mutee); + publishUserEvent(user.id, 'unmuteRenote', mutee); }); diff --git a/packages/backend/src/server/api/stream/index.ts b/packages/backend/src/server/api/stream/index.ts index 6ebf8b514..be67aa226 100644 --- a/packages/backend/src/server/api/stream/index.ts +++ b/packages/backend/src/server/api/stream/index.ts @@ -84,8 +84,21 @@ export default class Connection { this.muting.delete(data.body.id); break; - // TODO: renote mute events - // TODO: block events + case 'block': + this.blocking.add(data.body.id); + break; + + case 'unblock': + this.blocking.delete(data.body.id); + break; + + case 'muteRenote': + this.renoteMuting.add(data.body.id); + break; + + case 'unmuteRenote': + this.renoteMuting.delete(data.body.id); + break; case 'followChannel': this.followingChannels.add(data.body.id); diff --git a/packages/backend/src/server/api/stream/types.ts b/packages/backend/src/server/api/stream/types.ts index de9550502..e27ce34af 100644 --- a/packages/backend/src/server/api/stream/types.ts +++ b/packages/backend/src/server/api/stream/types.ts @@ -44,6 +44,10 @@ export interface UserStreamTypes { updateUserProfile: UserProfile; mute: User; unmute: User; + muteRenote: User; + unmuteRenote: User; + block: User; + unblock: User; follow: Packed<'UserDetailedNotMe'>; unfollow: Packed<'User'>; userAdded: Packed<'User'>;