merge: upstream
This commit is contained in:
commit
7552cea69a
413 changed files with 5517 additions and 2309 deletions
|
|
@ -35,9 +35,10 @@ import MkSuperMenu from '@/components/MkSuperMenu.vue';
|
|||
import MkInfo from '@/components/MkInfo.vue';
|
||||
import { instance } from '@/instance.js';
|
||||
import * as os from '@/os.js';
|
||||
import { misskeyApi } from '@/scripts/misskey-api.js';
|
||||
import { lookupUser, lookupUserByEmail } from '@/scripts/lookup-user.js';
|
||||
import { useRouter } from '@/router.js';
|
||||
import { PageMetadata, definePageMetadata, provideMetadataReceiver } from '@/scripts/page-metadata.js';
|
||||
import { useRouter } from '@/global/router/supplier.js';
|
||||
|
||||
const isEmpty = (x: string | null) => x == null || x === '';
|
||||
|
||||
|
|
@ -64,14 +65,14 @@ const thereIsUnresolvedAbuseReport = ref(false);
|
|||
const pendingUserApprovals = ref(false);
|
||||
const currentPage = computed(() => router.currentRef.value.child);
|
||||
|
||||
os.api('admin/abuse-user-reports', {
|
||||
misskeyApi('admin/abuse-user-reports', {
|
||||
state: 'unresolved',
|
||||
limit: 1,
|
||||
}).then(reports => {
|
||||
if (reports.length > 0) thereIsUnresolvedAbuseReport.value = true;
|
||||
});
|
||||
|
||||
os.api('admin/show-users', {
|
||||
misskeyApi('admin/show-users', {
|
||||
state: 'approved',
|
||||
origin: 'local',
|
||||
limit: 1,
|
||||
|
|
@ -281,7 +282,7 @@ provideMetadataReceiver((info) => {
|
|||
});
|
||||
|
||||
function invite() {
|
||||
os.api('admin/invite/create').then(x => {
|
||||
misskeyApi('admin/invite/create').then(x => {
|
||||
os.alert({
|
||||
type: 'info',
|
||||
text: x[0].code,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue