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

@ -76,12 +76,13 @@ import MkInput from '@/components/MkInput.vue';
import MkColorInput from '@/components/MkColorInput.vue';
import { selectFile } from '@/scripts/select-file.js';
import * as os from '@/os.js';
import { useRouter } from '@/router.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
import { definePageMetadata } from '@/scripts/page-metadata.js';
import { i18n } from '@/i18n.js';
import MkFolder from '@/components/MkFolder.vue';
import MkSwitch from '@/components/MkSwitch.vue';
import MkTextarea from '@/components/MkTextarea.vue';
import { useRouter } from '@/global/router/supplier.js';
const Sortable = defineAsyncComponent(() => import('vuedraggable').then(x => x.default));
@ -105,7 +106,7 @@ watch(() => bannerId.value, async () => {
if (bannerId.value == null) {
bannerUrl.value = null;
} else {
bannerUrl.value = (await os.api('drive/files/show', {
bannerUrl.value = (await misskeyApi('drive/files/show', {
fileId: bannerId.value,
})).url;
}
@ -114,7 +115,7 @@ watch(() => bannerId.value, async () => {
async function fetchChannel() {
if (props.channelId == null) return;
channel.value = await os.api('channels/show', {
channel.value = await misskeyApi('channels/show', {
channelId: props.channelId,
});
@ -179,7 +180,7 @@ async function archive() {
if (canceled) return;
os.api('channels/update', {
misskeyApi('channels/update', {
channelId: props.channelId,
isArchived: true,
}).then(() => {