heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

probably more correct muting logic

Browse source 
we want to notify if neither the thread nor the user are muted;
otherwise, for example, notes in a muted thread from a non-muted user
would get notified
This commit is contained in:
dakkar 2024-01-26 18:09:25 +00:00
parent b0fcc11d9e
commit e93e73673a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/backend/src/core/NoteCreateService.ts
View file

@ -810,7 +810,7 @@ export class NoteCreateService implements OnApplicationShutdown {
const muted = isUserRelated(note, userIdsWhoMeMuting); const muted = isUserRelated(note, userIdsWhoMeMuting);
if (!isThreadMuted || !muted) { if (!isThreadMuted && !muted) {
nm.push(data.reply.userId, 'reply'); nm.push(data.reply.userId, 'reply');
this.globalEventService.publishMainStream(data.reply.userId, 'reply', noteObj); this.globalEventService.publishMainStream(data.reply.userId, 'reply', noteObj);
@ -845,7 +845,7 @@ export class NoteCreateService implements OnApplicationShutdown {
const muted = isUserRelated(note, userIdsWhoMeMuting); const muted = isUserRelated(note, userIdsWhoMeMuting);
if (!isThreadMuted || !muted) { if (!isThreadMuted && !muted) {
nm.push(data.renote.userId, type); nm.push(data.renote.userId, type);
} }
} }

4
packages/backend/src/core/NoteEditService.ts
View file

@ -627,7 +627,7 @@ export class NoteEditService implements OnApplicationShutdown {
const muted = isUserRelated(note, userIdsWhoMeMuting); const muted = isUserRelated(note, userIdsWhoMeMuting);
if (!isThreadMuted || !muted) { if (!isThreadMuted && !muted) {
nm.push(data.reply.userId, 'reply'); nm.push(data.reply.userId, 'reply');
this.globalEventService.publishMainStream(data.reply.userId, 'reply', noteObj); this.globalEventService.publishMainStream(data.reply.userId, 'reply', noteObj);
@ -662,7 +662,7 @@ export class NoteEditService implements OnApplicationShutdown {
const muted = isUserRelated(note, userIdsWhoMeMuting); const muted = isUserRelated(note, userIdsWhoMeMuting);
if (!isThreadMuted || !muted) { if (!isThreadMuted && !muted) {
nm.push(data.renote.userId, type); nm.push(data.renote.userId, type);
} }
} }