Remove silent flag

2 files changed, 8 insertions, 5 deletions

diff --git a/src/remote/activitypub/act/create.ts b/src/remote/activitypub/act/create.ts
index 10083995d1..1b9bad8ff5 100644
--- a/src/remote/activitypub/act/create.ts
+++ b/src/remote/activitypub/act/create.ts
@@ -58,7 +58,7 @@ async function createImage(resolver: Resolver, actor: IRemoteUser, image) {
 	return await uploadFromUrl(image.url, actor);
 }
 
-async function createNote(resolver: Resolver, actor: IRemoteUser, note, silent = false) {
+async function createNote(resolver: Resolver, actor: IRemoteUser, note) {
 	if (
 		('attributedTo' in note && actor.account.uri !== note.attributedTo) ||
 		typeof note.id !== 'string'
@@ -86,7 +86,7 @@ async function createNote(resolver: Resolver, actor: IRemoteUser, note, silent =
 			const inReplyTo = await resolver.resolve(note.inReplyTo) as any;
 			const actor = await resolvePerson(inReplyTo.attributedTo);
 			if (isRemoteUser(actor)) {
-				reply = await createNote(resolver, actor, inReplyTo, true);
+				reply = await createNote(resolver, actor, inReplyTo);
 			}
 		}
 	}
@@ -102,5 +102,5 @@ async function createNote(resolver: Resolver, actor: IRemoteUser, note, silent =
 		viaMobile: false,
 		geo: undefined,
 		uri: note.id
-	}, silent);
+	});
 }
diff --git a/src/services/post/create.ts b/src/services/post/create.ts
index 745683b518..0bede2772d 100644
--- a/src/services/post/create.ts
+++ b/src/services/post/create.ts
@@ -31,7 +31,7 @@ export default async (user: IUser, data: {
 	visibility?: string;
 	uri?: string;
 	app?: IApp;
-}, silent = false) => new Promise<IPost>(async (res, rej) => {
+}) => new Promise<IPost>(async (res, rej) => {
 	if (data.createdAt == null) data.createdAt = new Date();
 	if (data.visibility == null) data.visibility = 'public';
 
@@ -127,7 +127,10 @@ export default async (user: IUser, data: {
 			_id: false
 		});
 
-		if (!silent) {
+		// この投稿が3分以内に作成されたものであるならストリームに配信
+		const shouldDistribute = new Date().getTime() - post.createdAt.getTime() < 1000 * 60 * 3;
+
+		if (shouldDistribute) {
 			const note = await renderNote(user, post);
 			const content = renderCreate(note);
 			content['@context'] = context;