merge: upstream

2024-01-09 02:57:57 +01:00
parent 94fee180b9 34088ecd27
commit 7552cea69a
413 changed files with 5517 additions and 2309 deletions
@@ -41,6 +41,7 @@ import MkInfo from '@/components/MkInfo.vue';
 import MkPostForm from '@/components/MkPostForm.vue';
 import { scroll } from '@/scripts/scroll.js';
 import * as os from '@/os.js';
+import { misskeyApi } from '@/scripts/misskey-api.js';
 import { defaultStore } from '@/store.js';
 import { i18n } from '@/i18n.js';
 import { instance } from '@/instance.js';
@@ -125,7 +126,7 @@ async function chooseAntenna(ev: MouseEvent): Promise<void> {
 }

 async function chooseChannel(ev: MouseEvent): Promise<void> {
-	const channels = await os.api('channels/my-favorites', {
+	const channels = await misskeyApi('channels/my-favorites', {
 		limit: 100,
 	});
 	const items: MenuItem[] = [