merge: upstream

This commit is contained in:
Marie 2023-12-23 02:09:23 +01:00
commit 5db583a3eb
701 changed files with 50809 additions and 13660 deletions

View file

@ -27,6 +27,7 @@
</template>
<script lang="ts" setup>
import { ref } from 'vue';
import * as Misskey from 'misskey-js';
import MkFolder from '@/components/MkFolder.vue';
import MkButton from '@/components/MkButton.vue';
@ -37,15 +38,15 @@ const props = defineProps<{
user: Misskey.entities.User;
}>();
let reason = $ref('');
let email = $ref('');
let reason = ref('');
let email = ref('');
function getReason() {
return os.api('admin/show-user', {
userId: props.user.id,
}).then(info => {
reason = info?.signupReason;
email = info?.email;
reason.value = info?.signupReason;
email.value = info?.email;
});
}