curse/Curse
1
0
Fork 0
mirror of https://github.com/misskey-dev/misskey.git synced 2026-03-21 03:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit from fork

Browse Source 
Co-authored-by: Julia Johannesen <197614925+juliajohannesen@users.noreply.github.com>
This commit is contained in:
syuilo
2026-03-09 08:14:12 +09:00
committed by GitHub
parent b5d399674a
commit a07dc589e7
6 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/backend/src/core/GlobalEventService.ts
View File

@@ -129,6 +129,9 @@ export interface NoteEventTypes {
type NoteStreamEventTypes = { type NoteStreamEventTypes = {
[key in keyof NoteEventTypes]: { [key in keyof NoteEventTypes]: {
id: MiNote['id']; id: MiNote['id'];
userId: MiNote['userId'];
visibility: MiNote['visibility'];
visibleUserIds: MiNote['visibleUserIds'];
body: NoteEventTypes[key]; body: NoteEventTypes[key];
}; };
}; };
@@ -378,9 +381,12 @@ export class GlobalEventService {
} }
@bindThis @bindThis
public publishNoteStream<K extends keyof NoteEventTypes>(noteId: MiNote['id'], type: K, value?: NoteEventTypes[K]): void { public publishNoteStream<K extends keyof NoteEventTypes>(note: MiNote, type: K, value?: NoteEventTypes[K]): void {
this.publish(`noteStream:${noteId}`, type, { this.publish(`noteStream:${note.id}`, type, {
id: noteId, id: note.id,
userId: note.userId,
visibility: note.visibility,
visibleUserIds: note.visibleUserIds,
body: value, body: value,
}); });
} }

2
packages/backend/src/core/NoteDeleteService.ts
View File

@@ -68,7 +68,7 @@ export class NoteDeleteService {
} }
if (!quiet) { if (!quiet) {
this.globalEventService.publishNoteStream(note.id, 'deleted', { this.globalEventService.publishNoteStream(note, 'deleted', {
deletedAt: deletedAt, deletedAt: deletedAt,
}); });

2
packages/backend/src/core/PollService.ts
View File

@@ -83,7 +83,7 @@ export class PollService {
const index = choice + 1; // In SQL, array index is 1 based const index = choice + 1; // In SQL, array index is 1 based
await this.pollsRepository.query(`UPDATE poll SET votes[${index}] = votes[${index}] + 1 WHERE "noteId" = '${poll.noteId}'`); await this.pollsRepository.query(`UPDATE poll SET votes[${index}] = votes[${index}] + 1 WHERE "noteId" = '${poll.noteId}'`);
this.globalEventService.publishNoteStream(note.id, 'pollVoted', { this.globalEventService.publishNoteStream(note, 'pollVoted', {
choice: choice, choice: choice,
userId: user.id, userId: user.id,
}); });

4
packages/backend/src/core/ReactionService.ts
View File

@@ -244,7 +244,7 @@ export class ReactionService {
}, },
}); });
this.globalEventService.publishNoteStream(note.id, 'reacted', { this.globalEventService.publishNoteStream(note, 'reacted', {
reaction: decodedReaction.reaction, reaction: decodedReaction.reaction,
emoji: customEmoji != null ? { emoji: customEmoji != null ? {
name: customEmoji.host ? `${customEmoji.name}@${customEmoji.host}` : `${customEmoji.name}@.`, name: customEmoji.host ? `${customEmoji.name}@${customEmoji.host}` : `${customEmoji.name}@.`,
@@ -318,7 +318,7 @@ export class ReactionService {
.execute(); .execute();
} }
this.globalEventService.publishNoteStream(note.id, 'unreacted', { this.globalEventService.publishNoteStream(note, 'unreacted', {
reaction: this.decodeReaction(exist.reaction).reaction, reaction: this.decodeReaction(exist.reaction).reaction,
userId: user.id, userId: user.id,
}); });

2
packages/backend/src/server/api/endpoints/notes/polls/vote.ts
View File

@@ -155,7 +155,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
const index = ps.choice + 1; // In SQL, array index is 1 based const index = ps.choice + 1; // In SQL, array index is 1 based
await this.pollsRepository.query(`UPDATE poll SET votes[${index}] = votes[${index}] + 1 WHERE "noteId" = '${poll.noteId}'`); await this.pollsRepository.query(`UPDATE poll SET votes[${index}] = votes[${index}] + 1 WHERE "noteId" = '${poll.noteId}'`);
this.globalEventService.publishNoteStream(note.id, 'pollVoted', { this.globalEventService.publishNoteStream(note, 'pollVoted', {
choice: ps.choice, choice: ps.choice,
userId: me.id, userId: me.id,
}); });

8
packages/backend/src/server/api/stream/Connection.ts
View File

@@ -206,6 +206,14 @@ export default class Connection {
@bindThis @bindThis
private async onNoteStreamMessage(data: GlobalEvents['note']['payload']) { private async onNoteStreamMessage(data: GlobalEvents['note']['payload']) {
if (data.body.visibility === 'specified' && !data.body.visibleUserIds.includes(this.user!.id)) {
return;
}
if (data.body.visibility === 'followers' && !Object.hasOwn(this.following, data.body.userId)) {
return;
}
this.sendMessageToWs('noteUpdated', { this.sendMessageToWs('noteUpdated', {
id: data.body.id, id: data.body.id,
type: data.type, type: data.type,