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

Merge branch 'develop' into feature/misskey-2024.07

Browse source 
fixing conflicts in `package.json`
This commit is contained in:
dakkar 2024-08-06 10:35:14 +01:00
commit 34c1e9ea2b
12 changed files with 49 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
packages/backend/src/server/api/stream/Connection.ts
View file

@ -205,6 +205,18 @@ export default class Connection {
@bindThis
private async onNoteStreamMessage(data: GlobalEvents['note']['payload']) {
// we must not send to the frontend information about notes from
// users who blocked the logged-in user, even when they're replies
// to notes the logged-in user can see
if (data.type === 'replied') {
const noteUserId = data.body.body.userId;
if (noteUserId !== null) {
if (this.userIdsWhoBlockingMe.has(noteUserId)) {
return;
}
}
}
this.sendMessageToWs('noteUpdated', {
id: data.body.id,
type: data.type,