natty
/
misskey-awawa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Filter featured collection (#12541)

This commit is contained in:
MeiMei 2023-12-02 19:32:30 +09:00 committed by GitHub
parent a631b976c9
commit 238e8ce939
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,7 @@ export class NotePiningService {
} as MiUserNotePining); } as MiUserNotePining);
// Deliver to remote followers // Deliver to remote followers
if (this.userEntityService.isLocalUser(user)) { if (this.userEntityService.isLocalUser(user) && !note.localOnly && ['public', 'home'].includes(note.visibility)) {
this.deliverPinnedChange(user.id, note.id, true); this.deliverPinnedChange(user.id, note.id, true);
} }
} }
@ -105,7 +105,7 @@ export class NotePiningService {
}); });
// Deliver to remote followers // Deliver to remote followers
if (this.userEntityService.isLocalUser(user)) { if (this.userEntityService.isLocalUser(user) && !note.localOnly && ['public', 'home'].includes(note.visibility)) {
this.deliverPinnedChange(user.id, noteId, false); this.deliverPinnedChange(user.id, noteId, false);
} }
} }

5
packages/backend/src/server/ActivityPubServerService.ts
View File

@ -370,8 +370,9 @@ export class ActivityPubServerService {
order: { id: 'DESC' }, order: { id: 'DESC' },
}); });
const pinnedNotes = await Promise.all(pinings.map(pining => const pinnedNotes = (await Promise.all(pinings.map(pining =>
this.notesRepository.findOneByOrFail({ id: pining.noteId }))); this.notesRepository.findOneByOrFail({ id: pining.noteId }))))
.filter(note => !note.localOnly && ['public', 'home'].includes(note.visibility));
const renderedNotes = await Promise.all(pinnedNotes.map(note => this.apRendererService.renderNote(note))); const renderedNotes = await Promise.all(pinnedNotes.map(note => this.apRendererService.renderNote(note)));