Resolve #4870

4 files changed, 2 insertions, 75 deletions

diff --git a/src/client/app/admin/views/users.user.vue b/src/client/app/admin/views/users.user.vue
index 096e017e6a..929fc8f4b3 100644
--- a/src/client/app/admin/views/users.user.vue
+++ b/src/client/app/admin/views/users.user.vue
@@ -11,7 +11,6 @@
 			<span class="username">@{{ user | acct }}</span>
 			<span class="is-admin" v-if="user.isAdmin">admin</span>
 			<span class="is-moderator" v-if="user.isModerator">moderator</span>
-			<span class="is-verified" v-if="user.isVerified" :title="$t('@.verified-user')"><fa icon="star"/></span>
 			<span class="is-silenced" v-if="user.isSilenced" :title="$t('@.silenced-user')"><fa :icon="faMicrophoneSlash"/></span>
 			<span class="is-suspended" v-if="user.isSuspended" :title="$t('@.suspended-user')"><fa :icon="faSnowflake"/></span>
 		</header>
@@ -77,7 +76,6 @@ export default Vue.extend({
 				background var(--noteHeaderAdminBg)
 				color var(--noteHeaderAdminFg)
 
-			> .is-verified
 			> .is-silenced
 			> .is-suspended
 				margin 0 0 0 .5em
diff --git a/src/client/app/admin/views/users.vue b/src/client/app/admin/views/users.vue
index 2d6aef3371..cc38108532 100644
--- a/src/client/app/admin/views/users.vue
+++ b/src/client/app/admin/views/users.vue
@@ -13,10 +13,6 @@
 				<div class="actions">
 					<ui-button @click="resetPassword"><fa :icon="faKey"/> {{ $t('reset-password') }}</ui-button>
 					<ui-horizon-group>
-						<ui-button @click="verifyUser" :disabled="verifying"><fa :icon="faCertificate"/> {{ $t('verify') }}</ui-button>
-						<ui-button @click="unverifyUser" :disabled="unverifying">{{ $t('unverify') }}</ui-button>
-					</ui-horizon-group>
-					<ui-horizon-group>
 						<ui-button @click="silenceUser"><fa :icon="faMicrophoneSlash"/> {{ $t('make-silence') }}</ui-button>
 						<ui-button @click="unsilenceUser">{{ $t('unmake-silence') }}</ui-button>
 					</ui-horizon-group>
@@ -47,7 +43,6 @@
 					<option value="all">{{ $t('users.state.all') }}</option>
 					<option value="admin">{{ $t('users.state.admin') }}</option>
 					<option value="moderator">{{ $t('users.state.moderator') }}</option>
-					<option value="verified">{{ $t('users.state.verified') }}</option>
 					<option value="silenced">{{ $t('users.state.silenced') }}</option>
 					<option value="suspended">{{ $t('users.state.suspended') }}</option>
 				</ui-select>
@@ -71,7 +66,7 @@
 import Vue from 'vue';
 import i18n from '../../i18n';
 import parseAcct from "../../../../misc/acct/parse";
-import { faCertificate, faUsers, faTerminal, faSearch, faKey, faSync, faMicrophoneSlash } from '@fortawesome/free-solid-svg-icons';
+import { faUsers, faTerminal, faSearch, faKey, faSync, faMicrophoneSlash } from '@fortawesome/free-solid-svg-icons';
 import { faSnowflake } from '@fortawesome/free-regular-svg-icons';
 import XUser from './users.user.vue';
 
@@ -84,8 +79,6 @@ export default Vue.extend({
 		return {
 			user: null,
 			target: null,
-			verifying: false,
-			unverifying: false,
 			suspending: false,
 			unsuspending: false,
 			sort: '+createdAt',
@@ -95,7 +88,7 @@ export default Vue.extend({
 			offset: 0,
 			users: [],
 			existMore: false,
-			faTerminal, faCertificate, faUsers, faSnowflake, faSearch, faKey, faSync, faMicrophoneSlash
+			faTerminal, faUsers, faSnowflake, faSearch, faKey, faSync, faMicrophoneSlash
 		};
 	},
 
@@ -181,56 +174,6 @@ export default Vue.extend({
 			});
 		},
 
-		async verifyUser() {
-			if (!await this.getConfirmed(this.$t('verify-confirm'))) return;
-
-			this.verifying = true;
-
-			const process = async () => {
-				await this.$root.api('admin/verify-user', { userId: this.user.id });
-				this.$root.dialog({
-					type: 'success',
-					text: this.$t('verified')
-				});
-			};
-
-			await process().catch(e => {
-				this.$root.dialog({
-					type: 'error',
-					text: e.toString()
-				});
-			});
-
-			this.verifying = false;
-
-			this.refreshUser();
-		},
-
-		async unverifyUser() {
-			if (!await this.getConfirmed(this.$t('unverify-confirm'))) return;
-
-			this.unverifying = true;
-
-			const process = async () => {
-				await this.$root.api('admin/unverify-user', { userId: this.user.id });
-				this.$root.dialog({
-					type: 'success',
-					text: this.$t('unverified')
-				});
-			};
-
-			await process().catch(e => {
-				this.$root.dialog({
-					type: 'error',
-					text: e.toString()
-				});
-			});
-
-			this.unverifying = false;
-
-			this.refreshUser();
-		},
-
 		async silenceUser() {
 			if (!await this.getConfirmed(this.$t('silence-confirm'))) return;
 
diff --git a/src/client/app/common/views/components/note-header.vue b/src/client/app/common/views/components/note-header.vue
index 26c9c7b7d8..a72863e1dd 100644
--- a/src/client/app/common/views/components/note-header.vue
+++ b/src/client/app/common/views/components/note-header.vue
@@ -8,7 +8,6 @@
 	<span class="is-bot" v-if="note.user.isBot">bot</span>
 	<span class="is-cat" v-if="note.user.isCat">cat</span>
 	<span class="username"><mk-acct :user="note.user"/></span>
-	<span class="is-verified" v-if="note.user.isVerified" :title="$t('@.verified-user')"><fa icon="star"/></span>
 	<div class="info">
 		<span class="app" v-if="note.app && !mini && $store.state.settings.showVia">via <b>{{ note.app.name }}</b></span>
 		<span class="mobile" v-if="note.viaMobile"><fa icon="mobile-alt"/></span>
@@ -95,10 +94,6 @@ export default Vue.extend({
 		color var(--noteHeaderAcct)
 		flex-shrink 2147483647
 
-	> .is-verified
-		margin 0 .5em 0 0
-		color #4dabf7
-
 	> .info
 		margin-left auto
 		font-size 0.9em
diff --git a/src/client/app/common/views/pages/explore.vue b/src/client/app/common/views/pages/explore.vue
index de31ca36c4..107603d69e 100644
--- a/src/client/app/common/views/pages/explore.vue
+++ b/src/client/app/common/views/pages/explore.vue
@@ -26,9 +26,6 @@
 	</mk-user-list>
 
 	<template v-if="tag == null">
-		<mk-user-list :make-promise="verifiedUsers">
-			<fa :icon="faBookmark" fixed-width/>{{ $t('verified-users') }}
-		</mk-user-list>
 		<mk-user-list :make-promise="popularUsers">
 			<fa :icon="faChartLine" fixed-width/>{{ $t('popular-users') }}
 		</mk-user-list>
@@ -60,12 +57,6 @@ export default Vue.extend({
 
 	data() {
 		return {
-			verifiedUsers: () => this.$root.api('users', {
-				state: 'verified',
-				origin: 'local',
-				sort: '+follower',
-				limit: 10
-			}),
 			popularUsers: () => this.$root.api('users', {
 				state: 'alive',
 				origin: 'local',