indexable (#2484)

* indexable

* toot:indexable

locales/en-US.yml

@@ -809,6 +809,7 @@ common/views/components/profile-editor.vue:
   auto-accept-followed: "Automatically approve follows from the people you follow"
   avoid-search-index: "Avoid search engine index"
   is-explorable: "Make account visible in \"Explore\""
+  isIndexable: "Allow post search"
   advanced: "Other"
   privacy: "Privacy"
   save: "Save"

locales/ja-JP.yml

@@ -874,6 +874,7 @@ common/views/components/profile-editor.vue:
   auto-accept-followed: "フォローしているユーザーからのフォローを自動承認する"
   avoid-search-index: "検索エンジンによるインデックスを拒否する"
   is-explorable: "アカウントを見つけやすくする"
+  isIndexable: "投稿検索を許可する"
   advanced: "その他"
   privacy: "プライバシー"
   save: "保存"

migration/1695595746908-isIndexable.ts

@@ -0,0 +1,16 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class isIndexable1695595746908 implements MigrationInterface {
+    name = 'isIndexable1695595746908'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "user" ADD "isIndexable" boolean NOT NULL DEFAULT true`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."isIndexable" IS 'Search indexable.'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`COMMENT ON COLUMN "user"."isIndexable" IS 'Search indexable.'`);
+        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "isIndexable"`);
+    }
+
+}

src/client/app/common/views/components/settings/profile.vue

@@ -101,6 +101,7 @@
 			<ui-switch v-model="autoAcceptFollowed" :disabled="!isLocked && !carefulBot && !carefulRemote" @change="save(false)">{{ $t('auto-accept-followed') }}</ui-switch>
 			<ui-switch v-model="avoidSearchIndex" @change="save(false)">{{ $t('avoid-search-index') }}</ui-switch>
 			<ui-switch v-model="isExplorable" @change="save(false)">{{ $t('is-explorable') }}</ui-switch>
+			<ui-switch v-model="isIndexable" @change="save(false)">{{ $t('isIndexable') }}</ui-switch>
 		</div>
 	</section>
 
@@ -188,6 +189,7 @@ export default Vue.extend({
 			autoAcceptFollowed: false,
 			avoidSearchIndex: false,
 			isExplorable: false,
+			isIndexable: true,
 			saving: false,
 			avatarUploading: false,
 			bannerUploading: false,
@@ -232,6 +234,7 @@ export default Vue.extend({
 		this.autoAcceptFollowed = this.$store.state.i.autoAcceptFollowed;
 		this.avoidSearchIndex = this.$store.state.i.avoidSearchIndex;
 		this.isExplorable = this.$store.state.i.isExplorable;
+		this.isIndexable = this.$store.state.i.isIndexable;
 
 		this.fieldName0 = this.$store.state.i.fields[0] ? this.$store.state.i.fields[0].name : null;
 		this.fieldValue0 = this.$store.state.i.fields[0] ? this.$store.state.i.fields[0].value : null;
@@ -315,6 +318,7 @@ export default Vue.extend({
 				autoAcceptFollowed: !!this.autoAcceptFollowed,
 				avoidSearchIndex: !!this.avoidSearchIndex,
 				isExplorable: !!this.isExplorable,
+				isIndexable: !!this.isIndexable,
 			}).then(i => {
 				this.saving = false;
 				this.$store.state.i.avatarId = i.avatarId;

src/models/entities/user.ts

@@ -221,6 +221,11 @@ export class User {
 	})
 	public isExplorable: boolean;
 
+	@Column('boolean', {
+		default: true,
+	})
+	public isIndexable: boolean;
+
 	constructor(data: Partial<User>) {
 		if (data == null) return;
 

src/models/repositories/user.ts

@@ -226,6 +226,7 @@ export class UserRepository extends Repository<User> {
 				carefulBot: profile!.carefulBot,
 				carefulRemote: profile!.carefulRemote,
 				autoAcceptFollowed: profile!.autoAcceptFollowed,
+				isIndexable: user.isIndexable,
 				isDeleted: user.isDeleted,
 				isExplorable: user.isExplorable,
 				hasUnreadMessagingMessage: this.getHasUnreadMessagingMessage(user.id),

src/remote/activitypub/models/person.ts

@@ -162,6 +162,7 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<Us
 				name: person.name ? truncate(person.name, MAX_NAME_LENGTH) : person.name,
 				isLocked: !!person.manuallyApprovesFollowers,
 				isExplorable: !!person.discoverable,
+				isIndexable: !(person.indexable === false),
 				username: person.preferredUsername,
 				usernameLower: person.preferredUsername!.toLowerCase(),
 				host,
@@ -345,6 +346,7 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint
 		isCat: (person as any).isCat === true,
 		isLocked: !!person.manuallyApprovesFollowers,
 		isExplorable: !!person.discoverable,
+		isIndexable: !(person.indexable === false),
 		movedToUserId: movedTo?.id || null,
 	} as Partial<User>;
 

src/remote/activitypub/renderer/index.ts

@@ -28,6 +28,7 @@ export const renderActivity = (x: any): IActivity | null => {
 				Emoji: 'toot:Emoji',
 				featured: 'toot:featured',
 				discoverable: 'toot:discoverable',
+				indexable: 'toot:indexable',
 				// schema
 				schema: 'http://schema.org#',
 				PropertyValue: 'schema:PropertyValue',

src/remote/activitypub/renderer/person.ts

@@ -71,6 +71,7 @@ export async function renderPerson(user: ILocalUser) {
 		tag,
 		manuallyApprovesFollowers: user.isLocked,
 		discoverable: !!user.isExplorable,
+		indexable: user.isIndexable,
 		publicKey: renderKey(user, keypair, `#main-key`),
 		isCat: user.isCat,
 		attachment: attachment.length ? attachment : undefined,

src/remote/activitypub/type.ts

@@ -152,6 +152,7 @@ export interface IActor extends IObject {
 	preferredUsername?: string;
 	manuallyApprovesFollowers?: boolean;
 	discoverable?: boolean;
+	indexable?: boolean;
 	inbox: string;
 	sharedInbox?: string;	// 後方互換性のため
 	publicKey?: {

src/server/api/endpoints/i/update.ts

@@ -127,6 +127,13 @@ export const meta = {
 			}
 		},
 
+		isIndexable: {
+			validator: $.optional.bool,
+			desc: {
+				'ja-JP': '投稿検索を許可する'
+			}
+		},
+
 		isBot: {
 			validator: $.optional.bool,
 			desc: {
@@ -218,6 +225,7 @@ export default define(meta, async (ps, user, app) => {
 	if (typeof ps.autoAcceptFollowed == 'boolean') profileUpdates.autoAcceptFollowed = ps.autoAcceptFollowed;
 	if (typeof ps.avoidSearchIndex == 'boolean') updates.avoidSearchIndex = ps.avoidSearchIndex;
 	if (typeof ps.isExplorable == 'boolean') updates.isExplorable = ps.isExplorable;
+	if (typeof ps.isIndexable == 'boolean') updates.isIndexable = ps.isIndexable;
 	if (typeof ps.isCat == 'boolean') updates.isCat = ps.isCat;
 	if (typeof ps.autoWatch == 'boolean') profileUpdates.autoWatch = ps.autoWatch;
 	if (typeof ps.alwaysMarkNsfw == 'boolean') profileUpdates.alwaysMarkNsfw = ps.alwaysMarkNsfw;