ローカルのみや非公開のピン留めはAP公開しないように

mei23 · Dec 2, 2023 · 7a4e739 · 7a4e739
1 parent ee8a039
commit 7a4e739
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/server/activitypub/featured.ts b/src/server/activitypub/featured.ts
@@ -5,7 +5,6 @@ import renderOrderedCollection from '../../remote/activitypub/renderer/ordered-c
 import { setResponseType } from '../activitypub';
 import renderNote from '../../remote/activitypub/renderer/note';
 import { Users, Notes, UserNotePinings } from '../../models';
-import { ensure } from '../../prelude/ensure';
 
 export default async (ctx: Router.RouterContext) => {
 	const userId = ctx.params.user;
@@ -26,8 +25,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, false)));
 

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);
 	}
 }