1
0

merge: upstream

This commit is contained in:
Marie
2024-01-09 02:57:57 +01:00
413 changed files with 5517 additions and 2309 deletions
@@ -57,6 +57,7 @@ import MkTextarea from '@/components/MkTextarea.vue';
import MkSelect from '@/components/MkSelect.vue';
import MkSwitch from '@/components/MkSwitch.vue';
import * as os from '@/os.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
import { i18n } from '@/i18n.js';
const props = defineProps<{
@@ -84,7 +85,7 @@ const userLists = ref<Misskey.entities.UserList[] | null>(null);
watch(() => src.value, async () => {
if (src.value === 'list' && userLists.value === null) {
userLists.value = await os.api('users/lists/list');
userLists.value = await misskeyApi('users/lists/list');
}
});
@@ -119,7 +120,7 @@ async function deleteAntenna() {
});
if (canceled) return;
await os.api('antennas/delete', {
await misskeyApi('antennas/delete', {
antennaId: props.antenna.id,
});