Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/syuilo/misskey into develop

Browse source
This commit is contained in:
syuilo 2020-02-18 17:54:13 +09:00
parent b7f5458684 52710f3810
commit 8a7197726e
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/client/components/user-moderate-dialog.vue
View file

@ -3,7 +3,7 @@
<template #header><mk-user-name :user="user"/></template> <template #header><mk-user-name :user="user"/></template>
<div class="vrcsvlkm"> <div class="vrcsvlkm">
<mk-button @click="resetPassword()" primary>{{ $t('resetPassword') }}</mk-button> <mk-button @click="resetPassword()" primary>{{ $t('resetPassword') }}</mk-button>
<mk-switch v-if="$store.state.i.isAdmin" @change="toggleModerator()" v-model="moderator">{{ $t('moderator') }}</mk-switch> <mk-switch v-if="$store.state.i.isAdmin && !user.isAdmin" @change="toggleModerator()" v-model="moderator">{{ $t('moderator') }}</mk-switch>
<mk-switch @change="toggleSilence()" v-model="silenced">{{ $t('silence') }}</mk-switch> <mk-switch @change="toggleSilence()" v-model="silenced">{{ $t('silence') }}</mk-switch>
<mk-switch @change="toggleSuspend()" v-model="suspended">{{ $t('suspend') }}</mk-switch> <mk-switch @change="toggleSuspend()" v-model="suspended">{{ $t('suspend') }}</mk-switch>
</div> </div>
@ -47,7 +47,7 @@ export default Vue.extend({
type: 'waiting', type: 'waiting',
iconOnly: true iconOnly: true
}); });
this.$root.api('admin/reset-password', { this.$root.api('admin/reset-password', {
userId: this.user.id, userId: this.user.id,
}).then(({ password }) => { }).then(({ password }) => {

4
src/server/api/endpoints/admin/moderators/add.ts
View file

@ -32,6 +32,10 @@ export default define(meta, async (ps) => {
throw new Error('user not found'); throw new Error('user not found');
} }
if (user.isAdmin) {
throw new Error('cannot mark as moderator if admin user');
}
await Users.update(user.id, { await Users.update(user.id, {
isModerator: true isModerator: true
}); });