{{ $t('make-silence') }}
{{ $t('unmake-silence') }}
@@ -47,7 +43,6 @@
-
@@ -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 26c9c7b7d..a72863e1d 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 @@
bot
cat
-
via {{ note.app.name }}
@@ -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 de31ca36c..107603d69 100644
--- a/src/client/app/common/views/pages/explore.vue
+++ b/src/client/app/common/views/pages/explore.vue
@@ -26,9 +26,6 @@
-
- {{ $t('verified-users') }}
-
{{ $t('popular-users') }}
@@ -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',
diff --git a/src/models/entities/user.ts b/src/models/entities/user.ts
index e40c32a76..d3086f43f 100644
--- a/src/models/entities/user.ts
+++ b/src/models/entities/user.ts
@@ -157,11 +157,6 @@ export class User {
})
public isModerator: boolean;
- @Column('boolean', {
- default: false,
- })
- public isVerified: boolean;
-
@Column('varchar', {
length: 128, array: true, default: '{}'
})
diff --git a/src/models/repositories/user.ts b/src/models/repositories/user.ts
index 0fafd3046..33eb53612 100644
--- a/src/models/repositories/user.ts
+++ b/src/models/repositories/user.ts
@@ -87,7 +87,6 @@ export class UserRepository extends Repository {
isAdmin: user.isAdmin || falsy,
isBot: user.isBot || falsy,
isCat: user.isCat || falsy,
- isVerified: user.isVerified || falsy,
// カスタム絵文字添付
emojis: user.emojis.length > 0 ? Emojis.find({
@@ -369,10 +368,6 @@ export const packedUserSchema = {
nullable: bool.false, optional: bool.true,
description: 'Whether this account is a moderator.'
},
- isVerified: {
- type: types.boolean,
- nullable: bool.false, optional: bool.true,
- },
isLocked: {
type: types.boolean,
nullable: bool.false, optional: bool.true,
diff --git a/src/server/api/endpoints/admin/show-users.ts b/src/server/api/endpoints/admin/show-users.ts
index 97760ae79..8733d87a3 100644
--- a/src/server/api/endpoints/admin/show-users.ts
+++ b/src/server/api/endpoints/admin/show-users.ts
@@ -36,7 +36,6 @@ export const meta = {
'admin',
'moderator',
'adminOrModerator',
- 'verified',
'silenced',
'suspended',
]),
@@ -61,7 +60,6 @@ export default define(meta, async (ps, me) => {
case 'admin': query.where('user.isAdmin = TRUE'); break;
case 'moderator': query.where('user.isModerator = TRUE'); break;
case 'adminOrModerator': query.where('user.isAdmin = TRUE OR isModerator = TRUE'); break;
- case 'verified': query.where('user.isVerified = TRUE'); break;
case 'alive': query.where('user.updatedAt > :date', { date: new Date(Date.now() - 1000 * 60 * 60 * 24 * 5) }); break;
case 'silenced': query.where('user.isSilenced = TRUE'); break;
case 'suspended': query.where('user.isSuspended = TRUE'); break;
diff --git a/src/server/api/endpoints/admin/unverify-user.ts b/src/server/api/endpoints/admin/unverify-user.ts
deleted file mode 100644
index b215dbf10..000000000
--- a/src/server/api/endpoints/admin/unverify-user.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import $ from 'cafy';
-import { ID } from '../../../../misc/cafy-id';
-import define from '../../define';
-import { Users } from '../../../../models';
-
-export const meta = {
- desc: {
- 'ja-JP': '指定したユーザーの公式アカウントを解除します。',
- 'en-US': 'Mark a user as unverified.'
- },
-
- tags: ['admin'],
-
- requireCredential: true,
- requireModerator: true,
-
- params: {
- userId: {
- validator: $.type(ID),
- desc: {
- 'ja-JP': '対象のユーザーID',
- 'en-US': 'The user ID which you want to unverify'
- }
- },
- }
-};
-
-export default define(meta, async (ps) => {
- const user = await Users.findOne(ps.userId as string);
-
- if (user == null) {
- throw new Error('user not found');
- }
-
- await Users.update(user.id, {
- isVerified: false
- });
-});
diff --git a/src/server/api/endpoints/admin/verify-user.ts b/src/server/api/endpoints/admin/verify-user.ts
deleted file mode 100644
index c1b447a92..000000000
--- a/src/server/api/endpoints/admin/verify-user.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import $ from 'cafy';
-import { ID } from '../../../../misc/cafy-id';
-import define from '../../define';
-import { Users } from '../../../../models';
-
-export const meta = {
- desc: {
- 'ja-JP': '指定したユーザーを公式アカウントにします。',
- 'en-US': 'Mark a user as verified.'
- },
-
- tags: ['admin'],
-
- requireCredential: true,
- requireModerator: true,
-
- params: {
- userId: {
- validator: $.type(ID),
- desc: {
- 'ja-JP': '対象のユーザーID',
- 'en-US': 'The user ID which you want to verify'
- }
- },
- }
-};
-
-export default define(meta, async (ps) => {
- const user = await Users.findOne(ps.userId as string);
-
- if (user == null) {
- throw new Error('user not found');
- }
-
- await Users.update(user.id, {
- isVerified: true
- });
-});
diff --git a/src/server/api/endpoints/users.ts b/src/server/api/endpoints/users.ts
index be317223b..539f2ef89 100644
--- a/src/server/api/endpoints/users.ts
+++ b/src/server/api/endpoints/users.ts
@@ -37,7 +37,6 @@ export const meta = {
'admin',
'moderator',
'adminOrModerator',
- 'verified',
'alive'
]),
default: 'all'
@@ -71,7 +70,6 @@ export default define(meta, async (ps, me) => {
case 'admin': query.where('user.isAdmin = TRUE'); break;
case 'moderator': query.where('user.isModerator = TRUE'); break;
case 'adminOrModerator': query.where('user.isAdmin = TRUE OR isModerator = TRUE'); break;
- case 'verified': query.where('user.isVerified = TRUE'); break;
case 'alive': query.where('user.updatedAt > :date', { date: new Date(Date.now() - 1000 * 60 * 60 * 24 * 5) }); break;
}