From 0db3f1f8ed42ad2b3413c782e182ddf7f347579e Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Sat, 18 Feb 2023 11:31:01 +0100
Subject: [PATCH] client: re-add flag to require approval for bot follows

This flag was already implemented in the server but not accessible
in the native client for some reason.

Changelog: Added
---
 locales/en-US.yml                              | 1 +
 packages/client/src/pages/settings/privacy.vue | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 14df6ca9c..413d097f6 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -88,6 +88,7 @@ youShouldUpgradeClient: "To view this page, please refresh to update your client
 enterListName: "Enter a name for the list"
 privacy: "Privacy"
 makeFollowManuallyApprove: "Follow requests require approval"
+botFollowRequiresApproval: "Follow requests from accounts marked as bots require approval"
 defaultNoteVisibility: "Default visibility"
 follow: "Follow"
 followRequest: "Send follow request"
diff --git a/packages/client/src/pages/settings/privacy.vue b/packages/client/src/pages/settings/privacy.vue
index f9d7f9732..f8b02efb6 100644
--- a/packages/client/src/pages/settings/privacy.vue
+++ b/packages/client/src/pages/settings/privacy.vue
@@ -1,7 +1,10 @@
 <template>
 <div class="_formRoot">
-	<FormSwitch v-model="isLocked" class="_formBlock" @update:model-value="save()">{{ i18n.ts.makeFollowManuallyApprove }}<template #caption>{{ i18n.ts.lockedAccountInfo }}</template></FormSwitch>
-	<FormSwitch v-if="isLocked" v-model="autoAcceptFollowed" class="_formBlock" @update:model-value="save()">{{ i18n.ts.autoAcceptFollowed }}</FormSwitch>
+	<FormSection>
+		<FormSwitch v-model="isLocked" class="_formBlock" @update:model-value="save()">{{ i18n.ts.makeFollowManuallyApprove }}<template #caption>{{ i18n.ts.lockedAccountInfo }}</template></FormSwitch>
+		<FormSwitch v-if="isLocked" v-model="autoAcceptFollowed" class="_formBlock" @update:model-value="save()">{{ i18n.ts.autoAcceptFollowed }}</FormSwitch>
+		<FormSwitch v-if="!isLocked" v-model="carefulBot" class="_formBlock" @update:model-value="save()">{{ i18n.ts.botFollowRequiresApproval }}</FormSwitch>
+	</FormSection>
 
 	<FormSwitch v-model="publicReactions" class="_formBlock" @update:model-value="save()">
 		{{ i18n.ts.makeReactionsPublic }}
@@ -68,6 +71,7 @@ import { definePageMetadata } from '@/scripts/page-metadata';
 
 let isLocked = $ref($i.isLocked);
 let autoAcceptFollowed = $ref($i.autoAcceptFollowed);
+let carefulBot = $ref($i.carefulBot);
 let noCrawle = $ref($i.noCrawle);
 let isExplorable = $ref($i.isExplorable);
 let hideOnlineStatus = $ref($i.hideOnlineStatus);
@@ -83,6 +87,7 @@ function save(): void {
 	os.api('i/update', {
 		isLocked: !!isLocked,
 		autoAcceptFollowed: !!autoAcceptFollowed,
+		carefulBot: !!carefulBot,
 		noCrawle: !!noCrawle,
 		isExplorable: !!isExplorable,
 		hideOnlineStatus: !!hideOnlineStatus,