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

merge: upstream

Browse source
This commit is contained in:
Marie 2024-01-09 02:57:57 +01:00
commit 7552cea69a
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
413 changed files with 5517 additions and 2309 deletions
Download patch file Download diff file Expand all files Collapse all files

5
packages/frontend/src/components/SkApprovalUser.vue
View file

@ -33,6 +33,7 @@ import MkFolder from '@/components/MkFolder.vue';
import MkButton from '@/components/MkButton.vue';
import { i18n } from '@/i18n.js';
import * as os from '@/os.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
const props = defineProps<{
user: Misskey.entities.User;
@ -42,7 +43,7 @@ let reason = ref('');
let email = ref('');
function getReason() {
return os.api('admin/show-user', {
return misskeyApi('admin/show-user', {
userId: props.user.id,
}).then(info => {
reason.value = info?.signupReason;
@ -87,7 +88,7 @@ async function approveAccount() {
text: i18n.ts.approveConfirm,
});
if (confirm.canceled) return;
await os.api('admin/approve-user', { userId: props.user.id });
await misskeyApi('admin/approve-user', { userId: props.user.id });
emits('deleted', props.user.id);
}
</script>