mirrors/misskey
1
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2026-05-06 04:45:37 +02:00
Code Releases Activity

fix(backend): ノート通知で公開範囲を考慮するように (#17335)

Browse Source 
* fix(backend): ノート通知で公開範囲を考慮するように

* refactor: remove unused imports

* Update Changelog

* Update Changelog

* fix: フォロワー限定ノートは通知

---------

Co-authored-by: lqvp <183242690+lqvp@users.noreply.github.com>
This commit is contained in:
かっこかり
2026-04-27 10:26:13 +09:00
committed by GitHub
parent 6176cca0a4
commit b45f18cd14
2 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
packages/backend/src/core/NoteCreateService.ts
View File

@@ -71,6 +71,7 @@ class NotificationManager {
constructor(
private mutingsRepository: MutingsRepository,
private notificationService: NotificationService,
private followingsRepository: FollowingsRepository,
notifier: { id: MiUser['id']; },
note: MiNote,
) {
@@ -101,7 +102,47 @@ class NotificationManager {
@bindThis
public async notify() {
if (this.queue.length === 0) {
return;
}
const targetUserIds = this.queue.map(x => x.target);
let visibleUserIds: Set<string>;
switch (this.note.visibility) {
case 'public':
case 'home':
visibleUserIds = new Set(targetUserIds);
break;
case 'specified':
visibleUserIds = new Set(this.note.visibleUserIds.filter(id => targetUserIds.includes(id)));
break;
// TODO: フォロワー限定ノートにフォロワーではない人がメンションされた場合通知されるのが正しい挙動なのか確認（一部に挙動の不一致がありそう）。現状は通知されるためフィルタしない
// case 'followers': {
// const followers = await this.followingsRepository.find({
// where: {
// followeeId: this.note.userId,
// followerId: In(targetUserIds),
// isFollowerHibernated: false,
// },
// select: ['followerId'],
// });
// visibleUserIds = new Set(followers.map(f => f.followerId));
// break;
// }
default:
visibleUserIds = new Set();
break;
}
for (const x of this.queue) {
if (!visibleUserIds.has(x.target)) {
continue;
}
if (x.reason === 'renote') {
this.notificationService.createNotification(x.target, 'renote', {
noteId: this.note.id,
@@ -772,7 +813,7 @@ export class NoteCreateService implements OnApplicationShutdown {
this.webhookService.enqueueUserWebhook(user.id, 'note', { note: noteObj });
const nm = new NotificationManager(this.mutingsRepository, this.notificationService, user, note);
const nm = new NotificationManager(this.mutingsRepository, this.notificationService, this.followingsRepository, user, note);
await this.createMentionedEvents(mentionedUsers, note, nm);