Merge branch 'develop' of misskey-dev into merge-upstream

This commit is contained in:
まっちゃとーにゅ
2024-01-10 03:10:45 +09:00
376 changed files with 5293 additions and 2636 deletions

View File

@@ -81,6 +81,7 @@ import * as Misskey from 'misskey-js';
import XPage from '@/components/page/page.vue';
import MkButton from '@/components/MkButton.vue';
import * as os from '@/os.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
import { url } from '@/config.js';
import MkMediaImage from '@/components/MkMediaImage.vue';
import MkFollowButton from '@/components/MkFollowButton.vue';
@@ -113,7 +114,7 @@ const path = computed(() => props.username + '/' + props.pageName);
function fetchPage() {
page.value = null;
os.api('pages/show', {
misskeyApi('pages/show', {
name: props.pageName,
username: props.username,
}).then(async _page => {