fix: Filter featured collection

sakura-tel · Dec 27, 2023 · 6794ddf · 6794ddf
1 parent a0c4766
commit 6794ddf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/server/activitypub/featured.ts b/src/server/activitypub/featured.ts
@@ -28,8 +28,9 @@ export default async (ctx: Router.RouterContext) => {
 		order: { id: 'DESC' }
 	});
 
-	const pinnedNotes = await Promise.all(pinings.map(pining =>
-		Notes.findOne(pining.noteId).then(ensure)));
+	const pinnedNotes = (await Promise.all(pinings.map(pining =>
+		Notes.findOneOrFail(pining.noteId))))
+		.filter(note => !note.localOnly && ['public', 'home'].includes(note.visibility));
 
 	const renderedNotes = await Promise.all(pinnedNotes.map(note => renderNote(note)));
 

diff --git a/src/services/i/pin.ts b/src/services/i/pin.ts
@@ -45,7 +45,7 @@ export async function addPinned(user: User, noteId: Note['id']) {
 	} as UserNotePining);
 
 	// Deliver to remote followers
-	if (Users.isLocalUser(user)) {
+	if (Users.isLocalUser(user) && !note.localOnly && ['public', 'home'].includes(note.visibility)) {
 		deliverPinnedChange(user.id, note.id, true);
 	}
 }
@@ -72,7 +72,7 @@ export async function removePinned(user: User, noteId: Note['id']) {
 	});
 
 	// Deliver to remote followers
-	if (Users.isLocalUser(user)) {
+	if (Users.isLocalUser(user) && !note.localOnly && ['public', 'home'].includes(note.visibility)) {
 		deliverPinnedChange(user.id, noteId, false);
 	}
 }