Apply #5805 to v10 (#5808)

* Update hashtags.ts

* Update trend.ts

* Update create.ts

* Update create.ts

src/server/api/endpoints/aggregation/hashtags.ts

@@ -22,6 +22,9 @@ export default define(meta, async (ps) => {
 			createdAt: {
 				$gt: new Date(Date.now() - span)
 			},
+			visibility: {
+				$in: ['public', 'home']
+			},
 			tagsLower: {
 				$exists: true,
 				$ne: []

src/server/api/endpoints/hashtags/trend.ts

@@ -31,6 +31,9 @@ export default define(meta, async () => {
 			createdAt: {
 				$gt: new Date(Date.now() - rangeA)
 			},
+			visibility: {
+				$in: ['public', 'home']
+			},
 			tagsLower: {
 				$exists: true,
 				$ne: []
@@ -79,6 +82,9 @@ export default define(meta, async () => {
 	const hotsPromises = limitedTags.map(async tag => {
 		const passedCount = (await Note.distinct('userId', {
 			tagsLower: tag.name,
+			visibility: {
+				$in: ['public', 'home']
+			},
 			createdAt: {
 				$lt: new Date(Date.now() - rangeA),
 				$gt: new Date(Date.now() - rangeB)
@@ -120,6 +126,9 @@ export default define(meta, async () => {
 	for (let i = 0; i < range; i++) {
 		countPromises.push(Promise.all(hots.map(tag => Note.distinct('userId', {
 			tagsLower: tag,
+			visibility: {
+				$in: ['public', 'home']
+			},
 			createdAt: {
 				$lt: new Date(Date.now() - (interval * i)),
 				$gt: new Date(Date.now() - (interval * (i + 1)))
@@ -131,6 +140,9 @@ export default define(meta, async () => {
 
 	const totalCounts: any = await Promise.all(hots.map(tag => Note.distinct('userId', {
 		tagsLower: tag,
+		visibility: {
+			$in: ['public', 'home']
+		},
 		createdAt: {
 			$gt: new Date(Date.now() - (interval * range))
 		}

src/services/note/create.ts

@@ -238,7 +238,9 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
 	}
 
 	// ハッシュタグ更新
-	for (const tag of tags) updateHashtag(user, tag);
+	if (data.visibility === 'public' || data.visibility === 'home') {
+		for (const tag of tags) updateHashtag(user, tag);
+	}
 
 	// ファイルが添付されていた場合ドライブのファイルの「このファイルが添付された投稿一覧」プロパティにこの投稿を追加
 	if (data.files) {