merge: upstream

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

View file

@ -40,6 +40,7 @@ import { computed, ref, shallowRef } from 'vue';
import type * as Misskey from 'misskey-js';
import { i18n } from '@/i18n.js';
import * as os from '@/os.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
import MkButton from '@/components/MkButton.vue';
import MkPagination, { Paging } from '@/components/MkPagination.vue';
import MkInviteCode from '@/components/MkInviteCode.vue';
@ -68,7 +69,7 @@ const resetCycle = computed<null | string>(() => {
});
async function create() {
const ticket = await os.api('invite/create');
const ticket = await misskeyApi('invite/create');
os.alert({
type: 'success',
title: i18n.ts.inviteCodeCreated,
@ -87,7 +88,7 @@ function deleted(id: string) {
}
async function update() {
currentInviteLimit.value = (await os.api('invite/limit')).remaining;
currentInviteLimit.value = (await misskeyApi('invite/limit')).remaining;
}
update();