diff --git a/.cargo/config.toml b/.cargo/config.toml
index b23105b..70f9eae 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,2 +1,2 @@
 [registries.crates-io]
-protocol = "sparse"
\ No newline at end of file
+protocol = "sparse"
diff --git a/Cargo.lock b/Cargo.lock
index 136912d..1ff71a3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -535,7 +535,7 @@ dependencies = [
 
 [[package]]
 name = "ck"
-version = "0.2.1-alpha"
+version = "0.3.0-alpha"
 dependencies = [
  "sea-orm",
  "serde",
@@ -835,7 +835,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "ext_calckey_model_migration"
-version = "0.2.1-alpha"
+version = "0.3.0-alpha"
 dependencies = [
  "sea-orm-migration",
  "tokio",
@@ -1446,7 +1446,7 @@ dependencies = [
 
 [[package]]
 name = "magnetar"
-version = "0.2.1-alpha"
+version = "0.3.0-alpha"
 dependencies = [
  "axum",
  "cached",
@@ -1482,11 +1482,12 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "unicode-segmentation",
+ "url",
 ]
 
 [[package]]
 name = "magnetar_calckey_fe"
-version = "0.2.1-alpha"
+version = "0.3.0-alpha"
 dependencies = [
  "axum",
  "chrono",
@@ -1510,7 +1511,7 @@ dependencies = [
 
 [[package]]
 name = "magnetar_calckey_model"
-version = "0.2.1-alpha"
+version = "0.3.0-alpha"
 dependencies = [
  "chrono",
  "ck",
@@ -1535,19 +1536,21 @@ dependencies = [
 
 [[package]]
 name = "magnetar_common"
-version = "0.2.1-alpha"
+version = "0.3.0-alpha"
 dependencies = [
+ "idna",
  "magnetar_core",
  "magnetar_sdk",
  "percent-encoding",
  "serde",
  "thiserror",
  "toml 0.8.1",
+ "url",
 ]
 
 [[package]]
 name = "magnetar_core"
-version = "0.2.1-alpha"
+version = "0.3.0-alpha"
 dependencies = [
  "serde",
  "serde_json",
@@ -1555,7 +1558,7 @@ dependencies = [
 
 [[package]]
 name = "magnetar_mmm_parser"
-version = "0.2.1-alpha"
+version = "0.3.0-alpha"
 dependencies = [
  "compact_str",
  "either",
@@ -1571,7 +1574,7 @@ dependencies = [
 
 [[package]]
 name = "magnetar_nodeinfo"
-version = "0.2.1-alpha"
+version = "0.3.0-alpha"
 dependencies = [
  "serde",
  "serde_json",
@@ -1579,7 +1582,7 @@ dependencies = [
 
 [[package]]
 name = "magnetar_sdk"
-version = "0.2.1-alpha"
+version = "0.3.0-alpha"
 dependencies = [
  "chrono",
  "http",
@@ -1593,7 +1596,7 @@ dependencies = [
 
 [[package]]
 name = "magnetar_sdk_macros"
-version = "0.2.1-alpha"
+version = "0.3.0-alpha"
 dependencies = [
  "quote",
  "syn 2.0.28",
@@ -1601,7 +1604,7 @@ dependencies = [
 
 [[package]]
 name = "magnetar_webfinger"
-version = "0.2.1-alpha"
+version = "0.3.0-alpha"
 dependencies = [
  "magnetar_core",
  "serde",
@@ -3670,9 +3673,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "url"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
+checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
 dependencies = [
  "form_urlencoded",
  "idna",
diff --git a/Cargo.toml b/Cargo.toml
index e6a68d0..f13447f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,7 +19,7 @@ members = [
 ]
 
 [workspace.package]
-version = "0.2.1-alpha"
+version = "0.3.0-alpha"
 edition = "2021"
 
 [workspace.dependencies]
@@ -88,6 +88,7 @@ hyper = { workspace = true, features = ["full"] }
 tokio = { workspace = true, features = ["full"] }
 tower = { workspace = true }
 tower-http = { workspace = true, features = ["cors", "trace", "fs"] }
+url = { workspace = true }
 
 idna = { workspace = true }
 
diff --git a/config/default.toml b/config/default.toml
index 07cd085..a855fba 100644
--- a/config/default.toml
+++ b/config/default.toml
@@ -47,6 +47,19 @@
 # Environment variable: MAG_C_BIND_ADDR
 # networking.bind_addr = "::"
 
+# [Optional]
+# The URL of a media proxy
+# Default: null
+# Environment variable: MAG_C_MEDIA_PROXY
+# networking.media_proxy = ""
+
+# [Optional]
+# Whether to proxy remote files through this instance
+# Default: false
+# Environment variable: MAG_C_PROXY_REMOTE_FILES
+# networking.proxy_remote_files = false
+
+
 # -----------------------------[ CALCKEY FRONTEND ]----------------------------
 
 # [Optional]
diff --git a/ext_calckey_model/src/lib.rs b/ext_calckey_model/src/lib.rs
index 1afba36..573c749 100644
--- a/ext_calckey_model/src/lib.rs
+++ b/ext_calckey_model/src/lib.rs
@@ -61,6 +61,7 @@ impl CalckeyModel {
             .sqlx_logging_level(LevelFilter::Debug)
             .to_owned();
 
+        info!("Attempting database connection...");
         Ok(CalckeyModel(sea_orm::Database::connect(opt).await?))
     }
 
@@ -224,6 +225,18 @@ impl CalckeyModel {
             .await?)
     }
 
+    pub async fn get_instance(
+        &self,
+        host: &str,
+    ) -> Result<Option<instance::Model>, CalckeyDbError> {
+        let instance = instance::Entity::find()
+            .filter(instance::Column::Host.eq(host))
+            .one(&self.0)
+            .await?;
+
+        Ok(instance)
+    }
+
     pub async fn get_instance_meta(&self) -> Result<meta::Model, CalckeyDbError> {
         let txn = self.0.begin().await?;
 
diff --git a/ext_calckey_model/src/note_model.rs b/ext_calckey_model/src/note_model.rs
index 006b7e8..8dfa9e4 100644
--- a/ext_calckey_model/src/note_model.rs
+++ b/ext_calckey_model/src/note_model.rs
@@ -5,7 +5,6 @@ use sea_orm::{
     QueryFilter, QueryResult, QuerySelect, QueryTrait, RelationTrait, Select,
 };
 use serde::{Deserialize, Serialize};
-use tracing::info;
 
 use ck::{drive_file, note, note_reaction, user};
 use magnetar_sdk::types::RangeFilter;
diff --git a/fe_calckey/frontend/calckey-js/package.json b/fe_calckey/frontend/calckey-js/package.json
index b4993d7..b78963c 100644
--- a/fe_calckey/frontend/calckey-js/package.json
+++ b/fe_calckey/frontend/calckey-js/package.json
@@ -15,7 +15,7 @@
 	"devDependencies": {
 		"@swc/cli": "^0.1.62",
 		"@swc/core": "^1.3.62",
-		"@types/node": "20.3.1",
+		"@types/node": "20.8.10",
 		"ts-node": "10.4.0",
 		"tsd": "^0.28.1",
 		"typescript": "5.1.3"
diff --git a/fe_calckey/frontend/calckey-js/src/entities.ts b/fe_calckey/frontend/calckey-js/src/entities.ts
index 19e9fa3..cc157fb 100644
--- a/fe_calckey/frontend/calckey-js/src/entities.ts
+++ b/fe_calckey/frontend/calckey-js/src/entities.ts
@@ -15,6 +15,8 @@ export type UserLite = {
 	avatarUrl: string;
 	avatarBlurhash: string;
 	alsoKnownAs: string[];
+	isCat?: boolean;
+	isBot?: boolean;
 	movedToUri: any;
 	emojis: {
 		name: string;
diff --git a/fe_calckey/frontend/client/src/components/MagNote.vue b/fe_calckey/frontend/client/src/components/MagNote.vue
new file mode 100644
index 0000000..5c4791a
--- /dev/null
+++ b/fe_calckey/frontend/client/src/components/MagNote.vue
@@ -0,0 +1,937 @@
+<template>
+    <div
+        :aria-label="accessibleLabel"
+        v-if="!muted.muted"
+        v-show="!isDeleted"
+        ref="el"
+        v-hotkey="keymap"
+        v-size="{ max: [500, 350] }"
+        class="tkcbzcuz note-container"
+        :tabindex="!isDeleted ? '-1' : null"
+        :class="{ renote: isRenote }"
+        :id="appearNote.id"
+    >
+        <MkNoteSub
+            v-if="appearNote.parent_note && !detailedView && !collapsedReply"
+            :note="appearNote.parent_note"
+            class="reply-to"
+        />
+        <div
+            v-if="!detailedView"
+            class="note-context"
+            @click="noteClick"
+            :class="{
+                collapsedReply: collapsedReply && appearNote.parent_note,
+            }"
+        >
+            <div class="line"></div>
+            <div v-if="appearNote._prId_" class="info">
+                <i class="ph-megaphone-simple-bold ph-lg"></i>
+                {{ i18n.ts.promotion
+                }}<button class="_textButton hide" @click.stop="readPromo()">
+                    {{ i18n.ts.hideThisNote }}
+                    <i class="ph-x ph-bold ph-lg"></i>
+                </button>
+            </div>
+            <div v-if="appearNote._featuredId_" class="info">
+                <i class="ph-lightning ph-bold ph-lg"></i>
+                {{ i18n.ts.featured }}
+            </div>
+            <div v-if="pinned" class="info">
+                <i class="ph-push-pin ph-bold ph-lg"></i
+                >{{ i18n.ts.pinnedNote }}
+            </div>
+            <div v-if="isRenote" class="renote">
+                <i class="ph-repeat ph-bold ph-lg"></i>
+                <I18n :src="i18n.ts.renotedBy" tag="span">
+                    <template #user>
+                        <MkA
+                            v-user-preview="note.user.id"
+                            class="name"
+                            :to="userPage(note.user)"
+                            @click.stop
+                        >
+                            <MkUserName :user="note.user" />
+                        </MkA>
+                    </template>
+                </I18n>
+                <div class="info">
+                    <button
+                        ref="renoteTime"
+                        class="_button time"
+                        @click.stop="showRenoteMenu()"
+                    >
+                        <i
+                            v-if="isMyRenote"
+                            class="ph-dots-three-outline ph-bold ph-lg dropdownIcon"
+                        ></i>
+                        <MkTime :time="note.created_at" />
+                    </button>
+                    <MkVisibility :note="note" />
+                </div>
+            </div>
+            <div v-if="collapsedReply && appearNote.parent_note" class="info">
+                <MkAvatar class="avatar" :user="appearNote.parent_note.user" />
+                <MkUserName
+                    class="username"
+                    :user="appearNote.parent_note.user"
+                ></MkUserName>
+                <Mfm
+                    class="summary"
+                    :text="getNoteSummary(appearNote.parent_note)"
+                    :plain="true"
+                    :nowrap="true"
+                    :custom-emojis="note.emojis"
+                />
+            </div>
+        </div>
+        <article
+            class="article"
+            @contextmenu.stop="onContextmenu"
+            @click="noteClick"
+            :style="{
+                cursor: expandOnNoteClick && !detailedView ? 'pointer' : '',
+            }"
+        >
+            <div class="main">
+                <div class="header-container">
+                    <MkAvatar class="avatar" :user="appearNote.user" />
+                    <XNoteHeader class="header" :note="appearNote" />
+                </div>
+                <div class="body">
+                    <MkSubNoteContent
+                        class="text"
+                        :note="appearNote"
+                        :detailed="true"
+                        :detailedView="detailedView"
+                        :parentId="appearNote.id"
+                        @push="(e) => router.push(notePage(e))"
+                        @focusfooter="footerEl.focus()"
+                        @expanded="(e) => setPostExpanded(e)"
+                    ></MkSubNoteContent>
+                    <div v-if="translating || translation" class="translation">
+                        <MkLoading v-if="translating" mini />
+                        <div v-else class="translated">
+                            <b
+                                >{{
+                                    i18n.t("translatedFrom", {
+                                        x: translation.sourceLang,
+                                    })
+                                }}:
+                            </b>
+                            <Mfm
+                                :text="translation.text"
+                                :author="appearNote.user"
+                                :i="$i"
+                                :custom-emojis="appearNote.emojis"
+                            />
+                        </div>
+                    </div>
+                </div>
+                <div v-if="detailedView" class="info">
+                    <MkA class="created-at" :to="notePage(appearNote)">
+                        <MkTime :time="appearNote.created_at" mode="absolute" />
+                    </MkA>
+                </div>
+                <footer ref="footerEl" class="footer" @click.stop tabindex="-1">
+                    <XReactionsViewer
+                        v-if="enableEmojiReactions"
+                        ref="reactionsViewer"
+                        :note="appearNote"
+                    />
+                    <button
+                        v-tooltip.noDelay.bottom="i18n.ts.reply"
+                        class="button _button"
+                        @click="reply()"
+                    >
+                        <i class="ph-arrow-u-up-left ph-bold ph-lg"></i>
+                        <template
+                            v-if="appearNote.reply_count > 0 && !detailedView"
+                        >
+                            <p class="count">{{ appearNote.reply_count }}</p>
+                        </template>
+                    </button>
+                    <XRenoteButton
+                        ref="renoteButton"
+                        class="button"
+                        :note="appearNote"
+                        :count="appearNote.renote_count"
+                        :detailedView="detailedView"
+                    />
+                    <XStarButtonNoEmoji
+                        v-if="!enableEmojiReactions"
+                        class="button"
+                        :note="appearNote"
+                        :count="magReactionCount(appearNote)"
+                        :reacted="magHasReacted(appearNote)"
+                    />
+                    <XStarButton
+                        v-if="
+                            enableEmojiReactions && !magHasReacted(appearNote)
+                        "
+                        ref="starButton"
+                        class="button"
+                        :note="appearNote"
+                    />
+                    <button
+                        v-if="
+                            enableEmojiReactions && !magHasReacted(appearNote)
+                        "
+                        ref="reactButton"
+                        v-tooltip.noDelay.bottom="i18n.ts.reaction"
+                        class="button _button"
+                        @click="react()"
+                    >
+                        <i class="ph-smiley ph-bold ph-lg"></i>
+                    </button>
+                    <button
+                        v-if="enableEmojiReactions && magHasReacted(appearNote)"
+                        ref="reactButton"
+                        class="button _button reacted"
+                        @click="undoReact(appearNote)"
+                        v-tooltip.noDelay.bottom="i18n.ts.removeReaction"
+                    >
+                        <i class="ph-minus ph-bold ph-lg"></i>
+                    </button>
+                    <XQuoteButton class="button" :note="appearNote" />
+                    <button
+                        ref="menuButton"
+                        v-tooltip.noDelay.bottom="i18n.ts.more"
+                        class="button _button"
+                        @click="menu()"
+                    >
+                        <i class="ph-dots-three-outline ph-bold ph-lg"></i>
+                    </button>
+                </footer>
+            </div>
+        </article>
+    </div>
+    <button v-else class="muted _button" @click="muted.muted = false">
+        <I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small">
+            <template #name>
+                <MkA
+                    v-user-preview="note.user.id"
+                    class="name"
+                    :to="userPage(note.user)"
+                >
+                    <MkUserName :user="note.user" />
+                </MkA>
+            </template>
+            <template #reason>
+                <b class="_blur_text">{{ muted.matched.join(", ") }}</b>
+            </template>
+        </I18n>
+    </button>
+</template>
+
+<script lang="ts" setup>
+import type { Ref } from "vue";
+import { computed, inject, onMounted, ref, toRaw } from "vue";
+import * as mfm from "mfm-js";
+import type * as misskey from "calckey-js";
+import MkNoteSub from "@/components/MkNoteSub.vue";
+import MkSubNoteContent from "./MkSubNoteContent.vue";
+import XNoteHeader from "@/components/MkNoteHeader.vue";
+import XRenoteButton from "@/components/MkRenoteButton.vue";
+import XReactionsViewer from "@/components/MkReactionsViewer.vue";
+import XStarButton from "@/components/MkStarButton.vue";
+import XStarButtonNoEmoji from "@/components/MkStarButtonNoEmoji.vue";
+import XQuoteButton from "@/components/MkQuoteButton.vue";
+import MkVisibility from "@/components/MkVisibility.vue";
+import copyToClipboard from "@/scripts/copy-to-clipboard";
+import { url } from "@/config";
+import { pleaseLogin } from "@/scripts/please-login";
+import { focusNext, focusPrev } from "@/scripts/focus";
+import { getWordSoftMute } from "@/scripts/check-word-mute";
+import { useRouter } from "@/router";
+import { userPage } from "@/filters/user";
+import * as os from "@/os";
+import { defaultStore, noteViewInterruptors } from "@/store";
+import { reactionPicker } from "@/scripts/reaction-picker";
+import { $i } from "@/account";
+import { i18n } from "@/i18n";
+import { getNoteMenu } from "@/scripts/get-note-menu";
+import { useNoteCapture } from "@/scripts/use-note-capture";
+import { notePage } from "@/filters/note";
+import { getNoteSummary } from "@/scripts/get-note-summary";
+import { packed } from "magnetar-common";
+import {
+    magEffectiveNote,
+    magHasReacted,
+    magIsRenote,
+    magReactionCount,
+} from "@/scripts-mag/mag-util";
+
+const router = useRouter();
+
+const props = defineProps<{
+    note: packed.PackNoteMaybeFull;
+    pinned?: boolean;
+    detailedView?: boolean;
+    collapsedReply?: boolean;
+}>();
+
+let note = $ref<packed.PackNoteMaybeFull>(structuredClone(toRaw(props.note)));
+
+const softMuteReasonI18nSrc = (what?: string) => {
+    if (what === "note") return i18n.ts.userSaysSomethingReason;
+    if (what === "reply") return i18n.ts.userSaysSomethingReasonReply;
+    if (what === "renote") return i18n.ts.userSaysSomethingReasonRenote;
+    if (what === "quote") return i18n.ts.userSaysSomethingReasonQuote;
+
+    // I don't think here is reachable, but just in case
+    return i18n.ts.userSaysSomething;
+};
+
+// plugin
+if (noteViewInterruptors.length > 0) {
+    onMounted(async () => {
+        let result = structuredClone(toRaw(note));
+        for (const interruptor of noteViewInterruptors) {
+            result = await interruptor.handler(result);
+        }
+        note = result;
+    });
+}
+
+const isRenote = magIsRenote(note);
+
+const el = ref<HTMLElement>();
+const footerEl = ref<HTMLElement>();
+const menuButton = ref<HTMLElement>();
+const starButton = ref<InstanceType<typeof XStarButton>>();
+const renoteButton = ref<InstanceType<typeof XRenoteButton>>();
+const renoteTime = ref<HTMLElement>();
+const reactButton = ref<HTMLElement>();
+let appearNote = $computed(
+    () => magEffectiveNote(note) as packed.PackNoteMaybeFull
+);
+const isMyRenote = $i && $i.id === note.user.id;
+const showContent = ref(false);
+const isDeleted = ref(false);
+const muted = ref(getWordSoftMute(note, $i, defaultStore.state.mutedWords));
+const translation = ref(null);
+const translating = ref(false);
+const enableEmojiReactions = defaultStore.state.enableEmojiReactions;
+const expandOnNoteClick = defaultStore.state.expandOnNoteClick;
+
+const keymap = {
+    r: () => reply(true),
+    "e|a|plus": () => react(true),
+    q: () => renoteButton.value.renote(true),
+    "up|k": focusBefore,
+    "down|j": focusAfter,
+    esc: blur,
+    "m|o": () => menu(true),
+    s: () => showContent.value !== showContent.value,
+};
+
+useNoteCapture({
+    rootEl: el,
+    note: $$(appearNote),
+    isDeletedRef: isDeleted,
+});
+
+function reply(viaKeyboard = false): void {
+    pleaseLogin();
+    os.post(
+        {
+            reply: appearNote,
+            animation: !viaKeyboard,
+        },
+        () => {
+            focus();
+        }
+    );
+}
+
+function react(viaKeyboard = false): void {
+    pleaseLogin();
+    blur();
+    reactionPicker.show(
+        reactButton.value,
+        (reaction) => {
+            os.api("notes/reactions/create", {
+                noteId: appearNote.id,
+                reaction: reaction,
+            });
+        },
+        () => {
+            focus();
+        }
+    );
+}
+
+function undoReact(note): void {
+    const oldReaction = note.myReaction;
+    if (!oldReaction) return;
+    os.api("notes/reactions/delete", {
+        noteId: note.id,
+    });
+}
+
+const currentClipPage = inject<Ref<misskey.entities.Clip> | null>(
+    "currentClipPage",
+    null
+);
+
+function onContextmenu(ev: MouseEvent): void {
+    const isLink = (el: HTMLElement) => {
+        if (el.tagName === "A") return true;
+        // The Audio element's context menu is the browser default, such as for selecting playback speed.
+        if (el.tagName === "AUDIO") return true;
+        if (el.parentElement) {
+            return isLink(el.parentElement);
+        }
+    };
+    if (isLink(ev.target)) return;
+    if (window.getSelection()?.toString() !== "") return;
+
+    if (defaultStore.state.useReactionPickerForContextMenu) {
+        ev.preventDefault();
+        react();
+    } else {
+        os.contextMenu(
+            [
+                {
+                    type: "label",
+                    text: notePage(appearNote),
+                },
+                {
+                    icon: "ph-browser ph-bold ph-lg",
+                    text: i18n.ts.openInWindow,
+                    action: () => {
+                        os.pageWindow(notePage(appearNote));
+                    },
+                },
+                notePage(appearNote) != location.pathname
+                    ? {
+                          icon: "ph-arrows-out-simple ph-bold ph-lg",
+                          text: i18n.ts.showInPage,
+                          action: () => {
+                              router.push(notePage(appearNote), "forcePage");
+                          },
+                      }
+                    : undefined,
+                null,
+                {
+                    type: "a",
+                    icon: "ph-arrow-square-out ph-bold ph-lg",
+                    text: i18n.ts.openInNewTab,
+                    href: notePage(appearNote),
+                    target: "_blank",
+                },
+                {
+                    icon: "ph-link-simple ph-bold ph-lg",
+                    text: i18n.ts.copyLink,
+                    action: () => {
+                        copyToClipboard(`${url}${notePage(appearNote)}`);
+                    },
+                },
+                appearNote.user.host != null
+                    ? {
+                          type: "a",
+                          icon: "ph-arrow-square-up-right ph-bold ph-lg",
+                          text: i18n.ts.showOnRemote,
+                          href: appearNote.url ?? appearNote.uri ?? "",
+                          target: "_blank",
+                      }
+                    : undefined,
+            ],
+            ev
+        );
+    }
+}
+
+function menu(viaKeyboard = false): void {
+    os.popupMenu(
+        getNoteMenu({
+            note: note,
+            translating,
+            translation,
+            menuButton,
+            isDeleted,
+            currentClipPage,
+        }),
+        menuButton.value,
+        {
+            viaKeyboard,
+        }
+    ).then(focus);
+}
+
+function showRenoteMenu(viaKeyboard = false): void {
+    if (!isMyRenote) return;
+    os.popupMenu(
+        [
+            {
+                text: i18n.ts.unrenote,
+                icon: "ph-trash ph-bold ph-lg",
+                danger: true,
+                action: () => {
+                    os.api("notes/delete", {
+                        noteId: note.id,
+                    });
+                    isDeleted.value = true;
+                },
+            },
+        ],
+        renoteTime.value,
+        {
+            viaKeyboard: viaKeyboard,
+        }
+    );
+}
+
+function focus() {
+    el.value?.focus();
+}
+
+function blur() {
+    el.value?.blur();
+}
+
+function focusBefore() {
+    focusPrev(el.value);
+}
+
+function focusAfter() {
+    focusNext(el.value);
+}
+
+function scrollIntoView() {
+    el.value?.scrollIntoView();
+}
+
+function noteClick(e) {
+    if (
+        document.getSelection()?.type === "Range" ||
+        props.detailedView ||
+        !expandOnNoteClick
+    ) {
+        e.stopPropagation();
+    } else {
+        router.push(notePage(appearNote));
+    }
+}
+
+function readPromo() {
+    os.api("promo/read", {
+        noteId: appearNote.id,
+    });
+    isDeleted.value = true;
+}
+
+let postIsExpanded = ref(false);
+
+function setPostExpanded(val: boolean) {
+    postIsExpanded.value = val;
+}
+
+const accessibleLabel = computed(() => {
+    let label = `${appearNote.user.username}; `;
+    if (appearNote.renoted_note) {
+        label += `${i18n.t("renoted")} ${
+            appearNote.renoted_note.user.username
+        }; `;
+        if (appearNote.renoted_note.cw) {
+            label += `${i18n.t("cw")}: ${appearNote.renoted_note.cw}; `;
+            if (postIsExpanded.value) {
+                label += `${appearNote.renoted_note.text}; `;
+            }
+        } else {
+            label += `${appearNote.renoted_note.text}; `;
+        }
+    } else {
+        if (appearNote.cw) {
+            label += `${i18n.t("cw")}: ${appearNote.cw}; `;
+            if (postIsExpanded.value) {
+                label += `${appearNote.text}; `;
+            }
+        } else {
+            label += `${appearNote.text}; `;
+        }
+    }
+    const date = new Date(appearNote.created_at);
+    label += `${date.toLocaleTimeString()}`;
+    return label;
+});
+
+defineExpose({
+    focus,
+    blur,
+    scrollIntoView,
+});
+</script>
+
+<style lang="scss" scoped>
+.tkcbzcuz {
+    position: relative;
+    transition: box-shadow 0.1s ease;
+    font-size: 1.05em;
+    overflow: clip;
+    contain: content;
+    -webkit-tap-highlight-color: transparent;
+
+    // これらの指定はパフォーマンス向上には有効だが、ノートの高さは一定でないため、
+    // 下の方までスクロールすると上のノートの高さがここで決め打ちされたものに変化し、表示しているノートの位置が変わってしまう
+    // ノートがマウントされたときに自身の高さを取得し contain-intrinsic-size を設定しなおせばほぼ解決できそうだが、
+    // 今度はその処理自体がパフォーマンス低下の原因にならないか懸念される。また、被リアクションでも高さは変化するため、やはり多少のズレは生じる
+    // 一度レンダリングされた要素はブラウザがよしなにサイズを覚えておいてくれるような実装になるまで待った方が良さそう(なるのか？)
+    //content-visibility: auto;
+    //contain-intrinsic-size: 0 128px;
+
+    &:focus-visible {
+        outline: none;
+
+        &:after {
+            content: "";
+            pointer-events: none;
+            display: block;
+            position: absolute;
+            z-index: 10;
+            top: 0;
+            left: 0;
+            right: 0;
+            bottom: 0;
+            margin: auto;
+            width: calc(100% - 8px);
+            height: calc(100% - 8px);
+            border: solid 1px var(--focus);
+            border-radius: var(--radius);
+            box-sizing: border-box;
+        }
+    }
+
+    & > .article > .main {
+        &:hover,
+        &:focus-within {
+            :deep(.footer .button) {
+                opacity: 1;
+            }
+        }
+    }
+
+    > .reply-to {
+        & + .note-context {
+            .line::before {
+                content: "";
+                display: block;
+                margin-bottom: -4px;
+                margin-top: 16px;
+                border-left: 2px solid currentColor;
+                margin-left: calc((var(--avatarSize) / 2) - 1px);
+                opacity: 0.25;
+            }
+        }
+    }
+
+    .note-context {
+        position: relative;
+        padding: 0 32px 0 32px;
+        display: flex;
+        z-index: 1;
+        &:first-child {
+            margin-top: 20px;
+        }
+        > :not(.line) {
+            width: 0;
+            flex-grow: 1;
+            position: relative;
+            line-height: 28px;
+        }
+        > .line {
+            position: relative;
+            z-index: 2;
+            width: var(--avatarSize);
+            display: flex;
+            margin-right: 14px;
+            margin-top: 0;
+            flex-grow: 0;
+            pointer-events: none;
+        }
+
+        > div > i {
+            margin-left: -0.5px;
+        }
+        > .info {
+            display: flex;
+            align-items: center;
+            font-size: 90%;
+            white-space: pre;
+            color: #f6c177;
+
+            > i {
+                margin-right: 4px;
+            }
+
+            > .hide {
+                margin-left: auto;
+                color: inherit;
+            }
+        }
+
+        > .renote {
+            display: flex;
+            align-items: center;
+            white-space: pre;
+            color: var(--renote);
+            cursor: pointer;
+
+            > i {
+                margin-right: 4px;
+            }
+
+            > span {
+                overflow: hidden;
+                flex-shrink: 1;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+
+                > .name {
+                    font-weight: bold;
+                }
+            }
+
+            > .info {
+                margin-left: auto;
+                font-size: 0.9em;
+                display: flex;
+
+                > .time {
+                    flex-shrink: 0;
+                    color: inherit;
+                    display: inline-flex;
+                    align-items: center;
+                    > .dropdownIcon {
+                        margin-right: 4px;
+                    }
+                }
+            }
+        }
+
+        &.collapsedReply {
+            .line {
+                opacity: 0.25;
+                &::after {
+                    content: "";
+                    position: absolute;
+                    border-left: 2px solid currentColor;
+                    border-top: 2px solid currentColor;
+                    margin-left: calc(var(--avatarSize) / 2 - 1px);
+                    width: calc(var(--avatarSize) / 2 + 14px);
+                    border-top-left-radius: calc(var(--avatarSize) / 4);
+                    top: calc(50% - 1px);
+                    height: calc(50% + 5px);
+                }
+            }
+            .info {
+                color: var(--fgTransparentWeak);
+                transition: color 0.2s;
+            }
+            .avatar {
+                width: 1.2em;
+                height: 1.2em;
+                border-radius: 2em;
+                overflow: hidden;
+                margin-right: 0.4em;
+                background: var(--panelHighlight);
+            }
+            .username {
+                font-weight: 700;
+                flex-shrink: 0;
+                max-width: 30%;
+                &::after {
+                    content: ": ";
+                }
+            }
+            &:hover,
+            &:focus-within {
+                .info {
+                    color: var(--fg);
+                }
+            }
+        }
+    }
+
+    > .article {
+        position: relative;
+        overflow: clip;
+        padding: 20px 32px 10px;
+        margin-top: -16px;
+
+        &:first-child,
+        &:nth-child(2) {
+            margin-top: -100px;
+            padding-top: 104px;
+        }
+
+        @media (pointer: coarse) {
+            cursor: default;
+        }
+
+        .header-container {
+            display: flex;
+            position: relative;
+            z-index: 2;
+            > .avatar {
+                flex-shrink: 0;
+                display: block;
+                margin: 0 14px 0 0;
+                width: var(--avatarSize);
+                height: var(--avatarSize);
+                position: relative;
+                top: 0;
+                left: 0;
+            }
+            > .header {
+                width: 0;
+                flex-grow: 1;
+            }
+        }
+        > .main {
+            flex: 1;
+            min-width: 0;
+
+            > .body {
+                margin-top: 0.7em;
+                > .translation {
+                    border: solid 0.5px var(--divider);
+                    border-radius: var(--radius);
+                    padding: 12px;
+                    margin-top: 8px;
+                }
+                > .renote {
+                    padding-top: 8px;
+                    > * {
+                        padding: 16px;
+                        border: solid 1px var(--renote);
+                        border-radius: 8px;
+                        transition: background 0.2s;
+                        &:hover,
+                        &:focus-within {
+                            background-color: var(--panelHighlight);
+                        }
+                    }
+                }
+            }
+            > .info {
+                display: flex;
+                justify-content: space-between;
+                flex-wrap: wrap;
+                gap: 0.7em;
+                margin-top: 16px;
+                opacity: 0.7;
+                font-size: 0.9em;
+            }
+            > .footer {
+                position: relative;
+                z-index: 2;
+                display: flex;
+                flex-wrap: wrap;
+                pointer-events: none; // Allow clicking anything w/out pointer-events: all; to open post
+                margin-top: 0.4em;
+                > :deep(.button) {
+                    position: relative;
+                    margin: 0;
+                    padding: 8px;
+                    opacity: 0.7;
+                    flex-grow: 1;
+                    max-width: 3.5em;
+                    width: max-content;
+                    min-width: max-content;
+                    pointer-events: all;
+                    height: auto;
+                    transition: opacity 0.2s;
+                    &::before {
+                        content: "";
+                        position: absolute;
+                        inset: 0;
+                        bottom: 2px;
+                        background: var(--panel);
+                        z-index: -1;
+                        transition: background 0.2s;
+                    }
+                    &:first-of-type {
+                        margin-left: -0.5em;
+                        &::before {
+                            border-radius: 100px 0 0 100px;
+                        }
+                    }
+                    &:last-of-type {
+                        &::before {
+                            border-radius: 0 100px 100px 0;
+                        }
+                    }
+                    &:hover {
+                        color: var(--fgHighlighted);
+                    }
+
+                    > i {
+                        display: inline !important;
+                    }
+
+                    > .count {
+                        display: inline;
+                        margin: 0 0 0 8px;
+                        opacity: 0.7;
+                    }
+
+                    &.reacted {
+                        color: var(--accent);
+                    }
+                }
+            }
+        }
+    }
+
+    > .reply {
+        border-top: solid 0.5px var(--divider);
+    }
+
+    &.max-width_500px {
+        font-size: 0.975em;
+        --avatarSize: 46px;
+        padding-top: 6px;
+        > .note-context {
+            padding-inline: 16px;
+            margin-top: 8px;
+            > :not(.line) {
+                margin-top: 0px;
+            }
+            > .line {
+                margin-right: 10px;
+                &::before {
+                    margin-top: 8px;
+                }
+            }
+        }
+        > .article {
+            padding: 18px 16px 8px;
+            &:first-child,
+            &:nth-child(2) {
+                padding-top: 104px;
+            }
+            > .main > .header-container > .avatar {
+                margin-right: 10px;
+                // top: calc(14px + var(--stickyTop, 0px));
+            }
+        }
+    }
+
+    &.max-width_300px {
+        --avatarSize: 40px;
+    }
+}
+
+.muted {
+    padding: 8px;
+    text-align: center;
+    opacity: 0.7;
+    width: 100%;
+
+    ._blur_text {
+        pointer-events: auto;
+    }
+}
+</style>
diff --git a/fe_calckey/frontend/client/src/components/MkNoteDetailed.vue b/fe_calckey/frontend/client/src/components/MagNoteDetailed.vue
similarity index 91%
rename from fe_calckey/frontend/client/src/components/MkNoteDetailed.vue
rename to fe_calckey/frontend/client/src/components/MagNoteDetailed.vue
index 443ac7b..d16f097 100644
--- a/fe_calckey/frontend/client/src/components/MkNoteDetailed.vue
+++ b/fe_calckey/frontend/client/src/components/MagNoteDetailed.vue
@@ -7,7 +7,7 @@
         v-size="{ max: [500, 350, 300] }"
         class="lxwezrsl _block"
         :tabindex="!isDeleted ? '-1' : null"
-        :class="{ renote: isRenote }"
+        :class="{ renote: magIsRenote(note) }"
     >
         <MkNoteSub
             v-if="conversation"
@@ -17,38 +17,38 @@
             :note="note"
             :detailedView="true"
         />
-        <MkLoading v-else-if="note.reply" mini />
+        <MkLoading v-else-if="note.parent_note" mini />
         <MkNoteSub
-            v-if="note.reply"
-            :note="note.reply"
+            v-if="note.parent_note"
+            :note="note.parent_note"
             class="reply-to"
             :detailedView="true"
         />
 
-        <MkNote
+        <MagNote
             ref="noteEl"
             @contextmenu.stop="onContextmenu"
             tabindex="-1"
             :note="note"
             detailedView
-        ></MkNote>
+        ></MagNote>
 
         <MkTab v-model="tab" :style="'underline'" @update:modelValue="loadTab">
             <option value="replies">
                 <!-- <i class="ph-arrow-u-up-left ph-bold ph-lg"></i> -->
-                <span v-if="note.repliesCount > 0" class="count">{{
-                    note.repliesCount
+                <span v-if="note.reply_count > 0" class="count">{{
+                    note.reply_count
                 }}</span>
                 {{ i18n.ts._notification._types.reply }}
             </option>
-            <option value="renotes" v-if="note.renoteCount > 0">
+            <option value="renotes" v-if="note.renote_count > 0">
                 <!-- <i class="ph-repeat ph-bold ph-lg"></i> -->
-                <span class="count">{{ note.renoteCount }}</span>
+                <span class="count">{{ note.renote_count }}</span>
                 {{ i18n.ts._notification._types.renote }}
             </option>
-            <option value="reactions" v-if="reactionsCount > 0">
+            <option value="reactions" v-if="magReactionCount(note) > 0">
                 <!-- <i class="ph-smiley ph-bold ph-lg"></i> -->
-                <span class="count">{{ reactionsCount }}</span>
+                <span class="count">{{ magReactionCount(note) }}</span>
                 {{ i18n.ts.reaction }}
             </option>
             <option value="quotes" v-if="directQuotes?.length > 0">
@@ -73,7 +73,7 @@
             :detailedView="true"
             :parentId="note.id"
         />
-        <MkLoading v-else-if="tab === 'replies' && note.repliesCount > 0" />
+        <MkLoading v-else-if="tab === 'replies' && note.reply_count > 0" />
 
         <MkNoteSub
             v-if="directQuotes && tab === 'quotes'"
@@ -101,7 +101,7 @@
             :with-chart="false"
         />
         <!-- </MkPagination> -->
-        <MkLoading v-else-if="tab === 'renotes' && note.renoteCount > 0" />
+        <MkLoading v-else-if="tab === 'renotes' && note.renote_count > 0" />
 
         <div v-if="tab === 'clips' && clips.length > 0" class="_content clips">
             <MkA
@@ -127,7 +127,7 @@
         <MkLoading v-else-if="tab === 'clips' && clips.length > 0" />
 
         <MkReactedUsers
-            v-if="tab === 'reactions' && reactionsCount > 0"
+            v-if="tab === 'reactions' && magReactionCount(note) > 0"
             :note-id="note.id"
         ></MkReactedUsers>
     </div>
@@ -135,7 +135,7 @@
         <I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small">
             <template #name>
                 <MkA
-                    v-user-preview="note.userId"
+                    v-user-preview="note.user.id"
                     class="name"
                     :to="userPage(note.user)"
                 >
@@ -150,22 +150,11 @@
 </template>
 
 <script lang="ts" setup>
-import {
-    computed,
-    inject,
-    onMounted,
-    onUnmounted,
-    onUpdated,
-    reactive,
-    ref,
-} from "vue";
+import { onMounted, onUnmounted, onUpdated, ref, toRaw } from "vue";
 import * as misskey from "calckey-js";
 import MkTab from "@/components/MkTab.vue";
-import MkNote from "@/components/MkNote.vue";
 import MkNoteSub from "@/components/MkNoteSub.vue";
-import XStarButton from "@/components/MkStarButton.vue";
 import XRenoteButton from "@/components/MkRenoteButton.vue";
-import MkPagination from "@/components/MkPagination.vue";
 import MkUserCardMini from "@/components/MkUserCardMini.vue";
 import MkReactedUsers from "@/components/MkReactedUsers.vue";
 import { pleaseLogin } from "@/scripts/please-login";
@@ -178,19 +167,20 @@ import { $i } from "@/account";
 import { i18n } from "@/i18n";
 import { getNoteMenu } from "@/scripts/get-note-menu";
 import { useNoteCapture } from "@/scripts/use-note-capture";
-import { deepClone } from "@/scripts/clone";
 import { stream } from "@/stream";
 import { NoteUpdatedEvent } from "calckey-js/built/streaming.types";
-import appear from "@/directives/appear";
+import { packed } from "magnetar-common";
+import { magIsRenote, magReactionCount } from "@/scripts-mag/mag-util";
+import MagNote from "@/components/MagNote.vue";
 
 const props = defineProps<{
-    note: misskey.entities.Note;
+    note: packed.PackNoteMaybeFull;
     pinned?: boolean;
 }>();
 
 let tab = $ref("replies");
 
-let note = $ref(deepClone(props.note));
+let note = $ref<packed.PackNoteMaybeFull>(structuredClone(toRaw(props.note)));
 
 const softMuteReasonI18nSrc = (what?: string) => {
     if (what === "note") return i18n.ts.userSaysSomethingReason;
@@ -205,7 +195,7 @@ const softMuteReasonI18nSrc = (what?: string) => {
 // plugin
 if (noteViewInterruptors.length > 0) {
     onMounted(async () => {
-        let result = deepClone(note);
+        let result = structuredClone(toRaw(note));
         for (const interruptor of noteViewInterruptors) {
             result = await interruptor.handler(result);
         }
@@ -231,11 +221,6 @@ let clips = $ref();
 let renotes = $ref();
 let isScrolling;
 
-const reactionsCount = Object.values(props.note.reactions).reduce(
-    (x, y) => x + y,
-    0
-);
-
 const keymap = {
     r: () => reply(true),
     "e|a|plus": () => react(true),
@@ -294,7 +279,7 @@ function onContextmenu(ev: MouseEvent): void {
         }
     };
     if (isLink(ev.target)) return;
-    if (window.getSelection().toString() !== "") return;
+    if (window.getSelection()?.toString() !== "") return;
 
     if (defaultStore.state.useReactionPickerForContextMenu) {
         ev.preventDefault();
@@ -344,7 +329,7 @@ os.api("notes/children", {
     depth: 12,
 }).then((res) => {
     res = res.reduce((acc, resNote) => {
-        if (resNote.userId == note.userId) {
+        if (resNote.userId == note.user.id) {
             return [...acc, resNote];
         }
         return [resNote, ...acc];
@@ -357,9 +342,9 @@ os.api("notes/children", {
 });
 
 conversation = null;
-if (note.replyId) {
+if (note.parent_note_id) {
     os.api("notes/conversation", {
-        noteId: note.replyId,
+        noteId: note.parent_note_id,
         limit: 30,
     }).then((res) => {
         conversation = res.reverse();
diff --git a/fe_calckey/frontend/client/src/components/MkAvatars.vue b/fe_calckey/frontend/client/src/components/MkAvatars.vue
index 0a3d997..9928de9 100644
--- a/fe_calckey/frontend/client/src/components/MkAvatars.vue
+++ b/fe_calckey/frontend/client/src/components/MkAvatars.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="defgtij">
         <div v-for="user in users" :key="user.id" class="avatar-holder">
-            <MkAvatar :user="user" :show-indicator="true" class="avatar" />
+            <MkAvatar :user="user" class="avatar" />
         </div>
     </div>
 </template>
diff --git a/fe_calckey/frontend/client/src/components/MkCwButton.vue b/fe_calckey/frontend/client/src/components/MkCwButton.vue
index a74edc7..bd259fb 100644
--- a/fe_calckey/frontend/client/src/components/MkCwButton.vue
+++ b/fe_calckey/frontend/client/src/components/MkCwButton.vue
@@ -18,10 +18,12 @@ import { length } from "stringz";
 import * as misskey from "calckey-js";
 import { concat } from "@/scripts/array";
 import { i18n } from "@/i18n";
+import { packed } from "magnetar-common";
+import { magTransProperty } from "@/scripts-mag/mag-util";
 
 const props = defineProps<{
     modelValue: boolean;
-    note: misskey.entities.Note;
+    note: packed.PackNoteMaybeFull | misskey.entities.Note;
 }>();
 
 const emit = defineEmits<{
@@ -31,15 +33,18 @@ const emit = defineEmits<{
 const el = ref<HTMLElement>();
 
 const label = computed(() => {
+    const attachments = magTransProperty(props.note, "attachments", "files");
+    const renote = magTransProperty(props.note, "renoted_note", "renote");
+
     return concat([
         props.note.text
             ? [i18n.t("_cw.chars", { count: length(props.note.text) })]
             : [],
-        props.note.files && props.note.files.length !== 0
-            ? [i18n.t("_cw.files", { count: props.note.files.length })]
+        attachments && attachments.length !== 0
+            ? [i18n.t("_cw.files", { count: attachments.length })]
             : [],
         props.note.poll != null ? [i18n.ts.poll] : [],
-        props.note.renote != null ? [i18n.ts.quoteAttached] : [],
+        renote != null ? [i18n.ts.quoteAttached] : [],
     ] as string[][]).join(", ");
 });
 
diff --git a/fe_calckey/frontend/client/src/components/MkFollowButton.vue b/fe_calckey/frontend/client/src/components/MkFollowButton.vue
index fd123cf..bfad922 100644
--- a/fe_calckey/frontend/client/src/components/MkFollowButton.vue
+++ b/fe_calckey/frontend/client/src/components/MkFollowButton.vue
@@ -19,8 +19,8 @@
         }"
         :disabled="wait"
         @click.stop="onClick"
-        :aria-label="`${state} ${user.name || user.username}`"
-        v-tooltip="full ? null : `${state} ${user.name || user.username}`"
+        :aria-label="`${state} ${magTransUsername(user)}`"
+        v-tooltip="full ? null : `${state} ${magTransUsername(user)}`"
     >
         <template v-if="!wait">
             <template v-if="isBlocking">
@@ -28,13 +28,19 @@
                 ><i class="ph-prohibit ph-bold ph-lg"></i>
             </template>
             <template
-                v-else-if="hasPendingFollowRequestFromYou && user.isLocked"
+                v-else-if="
+                    hasPendingFollowRequestFromYou &&
+                    magTransProperty(user, 'is_locked', 'isLocked')
+                "
             >
                 <span>{{ (state = i18n.ts.followRequestPending) }}</span
                 ><i class="ph-hourglass-medium ph-bold ph-lg"></i>
             </template>
             <template
-                v-else-if="hasPendingFollowRequestFromYou && !user.isLocked"
+                v-else-if="
+                    hasPendingFollowRequestFromYou &&
+                    !magTransProperty(user, 'is_locked', 'isLocked')
+                "
             >
                 <!-- つまりリモートフォローの場合。 -->
                 <span>{{ (state = i18n.ts.processing) }}</span
@@ -44,11 +50,21 @@
                 <span>{{ (state = i18n.ts.unfollow) }}</span
                 ><i class="ph-minus ph-bold ph-lg"></i>
             </template>
-            <template v-else-if="!isFollowing && user.isLocked">
+            <template
+                v-else-if="
+                    !isFollowing &&
+                    magTransProperty(user, 'is_locked', 'isLocked')
+                "
+            >
                 <span>{{ (state = i18n.ts.followRequest) }}</span
                 ><i class="ph-plus ph-bold ph-lg"></i>
             </template>
-            <template v-else-if="!isFollowing && !user.isLocked">
+            <template
+                v-else-if="
+                    !isFollowing &&
+                    !magTransProperty(user, 'is_locked', 'isLocked')
+                "
+            >
                 <span>{{ (state = i18n.ts.follow) }}</span
                 ><i class="ph-plus ph-bold ph-lg"></i>
             </template>
@@ -69,13 +85,15 @@ import { i18n } from "@/i18n";
 import { $i } from "@/account";
 import { getUserMenu } from "@/scripts/get-user-menu";
 import { useRouter } from "@/router";
+import { packed } from "magnetar-common";
+import { magTransProperty, magTransUsername } from "@/scripts-mag/mag-util";
 
 const router = useRouter();
 
 const emit = defineEmits(["refresh"]);
 const props = withDefaults(
     defineProps<{
-        user: Misskey.entities.UserDetailed;
+        user: packed.PackUserMaybeAll | Misskey.entities.User;
         full?: boolean;
         large?: boolean;
         hideMenu?: boolean;
@@ -86,24 +104,38 @@ const props = withDefaults(
     }
 );
 
-const isBlocking = computed(() => props.user.isBlocking);
+const isBlocking = computed(() =>
+    magTransProperty(props.user, "you_block", "isBlocking")
+);
 
 let state = $ref(i18n.ts.processing);
 
-let isFollowing = $ref(props.user.isFollowing);
+let isFollowing = $ref(
+    magTransProperty(props.user, "you_follow", "isFollowing")
+);
 let hasPendingFollowRequestFromYou = $ref(
-    props.user.hasPendingFollowRequestFromYou
+    magTransProperty(
+        props.user,
+        "you_request_follow",
+        "hasPendingFollowRequestFromYou"
+    )
 );
 let wait = $ref(false);
 const connection = stream.useChannel("main");
 
-if (props.user.isFollowing == null) {
+if (
+    typeof magTransProperty(props.user, "you_follow", "isFollowing") !==
+    "boolean"
+) {
     os.api("users/show", {
         userId: props.user.id,
     }).then(onFollowChange);
 }
 
-function onFollowChange(user: Misskey.entities.UserDetailed) {
+function onFollowChange(user: Misskey.entities.User) {
+    if (!("isFollowing" in user && "hasPendingFollowRequestFromYou" in user))
+        return;
+
     if (user.id === props.user.id) {
         isFollowing = user.isFollowing;
         hasPendingFollowRequestFromYou = user.hasPendingFollowRequestFromYou;
@@ -124,7 +156,7 @@ async function onClick() {
             await os.api("blocking/delete", {
                 userId: props.user.id,
             });
-            if (props.user.isMuted) {
+            if (magTransProperty(props.user, "mute", "isMuted")) {
                 await os.api("mute/delete", {
                     userId: props.user.id,
                 });
@@ -134,7 +166,7 @@ async function onClick() {
             const { canceled } = await os.confirm({
                 type: "warning",
                 text: i18n.t("unfollowConfirm", {
-                    name: props.user.name || props.user.username,
+                    name: magTransUsername(props.user),
                 }),
             });
 
diff --git a/fe_calckey/frontend/client/src/components/MkInstanceTicker.vue b/fe_calckey/frontend/client/src/components/MkInstanceTicker.vue
index 0d7b633..efb9a54 100644
--- a/fe_calckey/frontend/client/src/components/MkInstanceTicker.vue
+++ b/fe_calckey/frontend/client/src/components/MkInstanceTicker.vue
@@ -1,7 +1,12 @@
 <template>
     <div
         class="hpaizdrt"
-        v-tooltip="capitalize(instance.softwareName)"
+        v-tooltip="
+            capitalize(
+                magTransProperty(instance, 'software_name', 'softwareName') ??
+                    '?'
+            )
+        "
         ref="ticker"
         :style="bg"
     >
@@ -14,44 +19,59 @@
 import { instanceName } from "@/config";
 import { instance as Instance } from "@/instance";
 import { getProxiedImageUrlNullable } from "@/scripts/media-proxy";
+import * as Misskey from "calckey-js";
+import { types } from "magnetar-common";
+import { magTransProperty } from "@/scripts-mag/mag-util";
 
 const props = defineProps<{
-    instance?: {
-        faviconUrl?: string;
-        name: string;
-        themeColor?: string;
-        softwareName?: string;
-    };
+    instance?: Misskey.entities.User["instance"] | types.InstanceTicker | null;
 }>();
 
 let ticker = $ref<HTMLElement | null>(null);
 
 // if no instance data is given, this is for the local instance
 const instance = props.instance ?? {
-    faviconUrl: Instance.iconUrl || Instance.faviconUrl || "/favicon.ico",
+    iconUrl: null,
+    faviconUrl: (Instance.iconUrl || Instance.faviconUrl || "/favicon.ico") as
+        | string
+        | null,
     name: instanceName,
     themeColor: (
         document.querySelector(
             'meta[name="theme-color-orig"]'
         ) as HTMLMetaElement
     )?.content,
-    softwareName: Instance.softwareName || "Calckey",
+    softwareName: (Instance.softwareName || "Magnetar") as string | null,
+    softwareVersion: (Instance.softwareVersion || Instance.version || "") as
+        | string
+        | null,
 };
 
 const capitalize = (s: string) => s && s[0].toUpperCase() + s.slice(1);
 
 const computedStyle = getComputedStyle(document.documentElement);
 const themeColor =
-    instance.themeColor ?? computedStyle.getPropertyValue("--bg");
+    magTransProperty(instance, "theme_color", "themeColor") ??
+    computedStyle.getPropertyValue("--bg");
 
 const bg = {
     background: `linear-gradient(90deg, ${themeColor}, ${themeColor}55)`,
 };
 
-function getInstanceIcon(instance): string {
+function getInstanceIcon(
+    instance?: Misskey.entities.User["instance"] | types.InstanceTicker | null
+): string {
+    if (!instance) return "/client-assets/dummy.png";
+
     return (
-        getProxiedImageUrlNullable(instance.iconUrl, "preview") ??
-        getProxiedImageUrlNullable(instance.faviconUrl, "preview") ??
+        getProxiedImageUrlNullable(
+            magTransProperty(instance, "icon_url", "iconUrl"),
+            "preview"
+        ) ??
+        getProxiedImageUrlNullable(
+            magTransProperty(instance, "favicon_url", "faviconUrl"),
+            "preview"
+        ) ??
         "/client-assets/dummy.png"
     );
 }
diff --git a/fe_calckey/frontend/client/src/components/MkMediaBanner.vue b/fe_calckey/frontend/client/src/components/MkMediaBanner.vue
index a8420be..1a4bd26 100644
--- a/fe_calckey/frontend/client/src/components/MkMediaBanner.vue
+++ b/fe_calckey/frontend/client/src/components/MkMediaBanner.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="mk-media-banner" @click.stop>
         <div
-            v-if="media.isSensitive && hide"
+            v-if="magTransProperty(media, 'sensitive', 'isSensitive') && hide"
             class="sensitive"
             @click="hide = false"
         >
@@ -11,7 +11,9 @@
         </div>
         <div
             v-else-if="
-                media.type.startsWith('audio') && media.type !== 'audio/midi'
+                ((type) => type.startsWith('audio') && type !== 'audio/midi')(
+                    magTransProperty(media, 'mime_type', 'type')
+                )
             "
             class="audio"
         >
@@ -62,10 +64,12 @@ import type * as misskey from "calckey-js";
 import { ColdDeviceStorage } from "@/store";
 import "vue-plyr/dist/vue-plyr.css";
 import { i18n } from "@/i18n";
+import { packed } from "magnetar-common";
+import { magTransProperty } from "@/scripts-mag/mag-util";
 
 const props = withDefaults(
     defineProps<{
-        media: misskey.entities.DriveFile;
+        media: packed.PackDriveFileBase | misskey.entities.DriveFile;
     }>(),
     {}
 );
diff --git a/fe_calckey/frontend/client/src/components/MkMediaCaption.vue b/fe_calckey/frontend/client/src/components/MkMediaCaption.vue
index 0e57cbe..b05c035 100644
--- a/fe_calckey/frontend/client/src/components/MkMediaCaption.vue
+++ b/fe_calckey/frontend/client/src/components/MkMediaCaption.vue
@@ -53,12 +53,19 @@
                     @click="$refs.modal.close()"
                 />
                 <footer>
-                    <span>{{ image.type }}</span>
+                    <span>{{ image.mime_type || image.type }}</span>
                     <span>{{ bytes(image.size) }}</span>
                     <span v-if="image.properties && image.properties.width"
                         >{{ number(image.properties.width) }}px ×
                         {{ number(image.properties.height) }}px</span
                     >
+                    <span
+                        v-if="
+                            image.media_metadata && image.media_metadata.width
+                        "
+                        >{{ number(image.media_metadata.width) }}px ×
+                        {{ number(image.media_metadata.height) }}px</span
+                    >
                 </footer>
             </div>
         </div>
diff --git a/fe_calckey/frontend/client/src/components/MkMediaImage.vue b/fe_calckey/frontend/client/src/components/MkMediaImage.vue
index 7b5280a..34d90ef 100644
--- a/fe_calckey/frontend/client/src/components/MkMediaImage.vue
+++ b/fe_calckey/frontend/client/src/components/MkMediaImage.vue
@@ -1,9 +1,9 @@
 <template>
     <button v-if="hide" class="qjewsnkg" @click="hide = false">
         <ImgWithBlurhash
-            :hash="image.blurhash"
+            :hash="image.blurhash ?? undefined"
             :title="image.comment"
-            :alt="image.comment"
+            :alt="image.comment ?? ''"
         />
         <div class="text">
             <div class="wrapper">
@@ -18,14 +18,21 @@
     <div v-else class="gqnyydlz">
         <a :href="image.url" :title="image.name">
             <ImgWithBlurhash
-                :hash="image.blurhash"
+                :hash="image.blurhash ?? undefined"
                 :src="url"
-                :alt="image.comment"
-                :type="image.type"
+                :alt="image.comment ?? ''"
+                :type="magTransProperty(image, 'mime_type', 'type')"
                 :title="image.comment"
                 :cover="false"
             />
-            <div v-if="image.type === 'image/gif'" class="gif">GIF</div>
+            <div
+                v-if="
+                    magTransProperty(image, 'mime_type', 'type') === 'image/gif'
+                "
+                class="gif"
+            >
+                GIF
+            </div>
         </a>
         <div class="_image_controls">
             <button
@@ -63,9 +70,11 @@ import { getStaticImageUrl } from "@/scripts/get-static-image-url";
 import ImgWithBlurhash from "@/components/MkImgWithBlurhash.vue";
 import { defaultStore } from "@/store";
 import { i18n } from "@/i18n";
+import { packed } from "magnetar-common";
+import { magTransProperty } from "@/scripts-mag/mag-util";
 
 const props = defineProps<{
-    image: misskey.entities.DriveFile;
+    image: packed.PackDriveFileBase | misskey.entities.DriveFile;
     raw?: boolean;
 }>();
 
@@ -95,8 +104,10 @@ const url =
     props.raw || defaultStore.state.loadRawImages
         ? props.image.url
         : defaultStore.state.disableShowingAnimatedImages
-        ? getStaticImageUrl(props.image.thumbnailUrl)
-        : props.image.thumbnailUrl;
+        ? getStaticImageUrl(
+              magTransProperty(props.image, "thumbnail_url", "thumbnailUrl")!
+          )
+        : magTransProperty(props.image, "thumbnail_url", "thumbnailUrl")!;
 
 // Plugin:register_note_view_interruptor を使って書き換えられる可能性があるためwatchする
 watch(
@@ -105,7 +116,7 @@ watch(
         hide =
             defaultStore.state.nsfw === "force"
                 ? true
-                : props.image.isSensitive &&
+                : magTransProperty(props.image, "sensitive", "isSensitive") &&
                   defaultStore.state.nsfw !== "ignore";
     },
     {
diff --git a/fe_calckey/frontend/client/src/components/MkMediaList.vue b/fe_calckey/frontend/client/src/components/MkMediaList.vue
index 4f3a7d5..9190360 100644
--- a/fe_calckey/frontend/client/src/components/MkMediaList.vue
+++ b/fe_calckey/frontend/client/src/components/MkMediaList.vue
@@ -18,12 +18,24 @@
                     )"
                 >
                     <XVideo
-                        v-if="media.type.startsWith('video')"
+                        v-if="
+                            magTransProperty(
+                                media,
+                                'mime_type',
+                                'type'
+                            ).startsWith('video')
+                        "
                         :key="media.id"
                         :video="media"
                     />
                     <XImage
-                        v-else-if="media.type.startsWith('image')"
+                        v-else-if="
+                            magTransProperty(
+                                media,
+                                'mime_type',
+                                'type'
+                            ).startsWith('image')
+                        "
                         :key="media.id"
                         class="image"
                         :data-id="media.id"
@@ -47,10 +59,11 @@ import XImage from "@/components/MkMediaImage.vue";
 import XVideo from "@/components/MkMediaVideo.vue";
 import * as os from "@/os";
 import { FILE_TYPE_BROWSERSAFE } from "@/const";
-import { defaultStore } from "@/store";
+import { packed } from "magnetar-common";
+import { magTransProperty } from "@/scripts-mag/mag-util";
 
 const props = defineProps<{
-    mediaList: misskey.entities.DriveFile[];
+    mediaList: (packed.PackDriveFileBase | misskey.entities.DriveFile)[];
     raw?: boolean;
     inDm?: boolean;
 }>();
@@ -62,22 +75,30 @@ onMounted(() => {
     const lightbox = new PhotoSwipeLightbox({
         dataSource: props.mediaList
             .filter((media) => {
-                if (media.type === "image/svg+xml") return true; // svgのwebpublicはpngなのでtrue
+                const type = magTransProperty(media, "mime_type", "type");
+
+                if (type === "image/svg+xml") return true; // svgのwebpublicはpngなのでtrue
                 return (
-                    media.type.startsWith("image") &&
-                    FILE_TYPE_BROWSERSAFE.includes(media.type)
+                    type.startsWith("image") &&
+                    FILE_TYPE_BROWSERSAFE.includes(type)
                 );
             })
             .map((media) => {
+                const properties = magTransProperty(
+                    media,
+                    "media_metadata",
+                    "properties"
+                );
+
                 const item = {
                     src: media.url,
-                    w: media.properties.width,
-                    h: media.properties.height,
+                    w: properties.width,
+                    h: properties.height,
                     alt: media.comment,
                 };
                 if (
-                    media.properties.orientation != null &&
-                    media.properties.orientation >= 5
+                    properties.orientation != null &&
+                    properties.orientation >= 5
                 ) {
                     [item.w, item.h] = [item.h, item.w];
                 }
@@ -116,16 +137,21 @@ onMounted(() => {
         const id = element.dataset.id;
         const file = props.mediaList.find((media) => media.id === id);
 
+        if (!file) return;
+
+        const properties = magTransProperty(
+            file,
+            "media_metadata",
+            "properties"
+        );
+
         itemData.src = file.url;
-        itemData.w = Number(file.properties.width);
-        itemData.h = Number(file.properties.height);
-        if (
-            file.properties.orientation != null &&
-            file.properties.orientation >= 5
-        ) {
+        itemData.w = Number(properties.width);
+        itemData.h = Number(properties.height);
+        if (properties.orientation != null && properties.orientation >= 5) {
             [itemData.w, itemData.h] = [itemData.h, itemData.w];
         }
-        itemData.msrc = file.thumbnailUrl;
+        itemData.msrc = magTransProperty(file, "thumbnail_url", "thumbnailUrl");
         itemData.alt = file.comment;
         itemData.thumbCropped = true;
     });
@@ -178,12 +204,16 @@ onMounted(() => {
     }
 });
 
-const previewable = (file: misskey.entities.DriveFile): boolean => {
-    if (file.type === "image/svg+xml") return true; // svgのwebpublic/thumbnailはpngなのでtrue
+const previewable = (
+    file: packed.PackDriveFileBase | misskey.entities.DriveFile
+): boolean => {
+    const type = magTransProperty(file, "mime_type", "type");
+
+    if (type === "image/svg+xml") return true; // svgのwebpublic/thumbnailはpngなのでtrue
     // FILE_TYPE_BROWSERSAFEに適合しないものはブラウザで表示するのに不適切
     return (
-        (file.type.startsWith("video") || file.type.startsWith("image")) &&
-        FILE_TYPE_BROWSERSAFE.includes(file.type)
+        (type.startsWith("video") || type.startsWith("image")) &&
+        FILE_TYPE_BROWSERSAFE.includes(type)
     );
 };
 const previewableCount = props.mediaList.filter((media) =>
diff --git a/fe_calckey/frontend/client/src/components/MkMediaVideo.vue b/fe_calckey/frontend/client/src/components/MkMediaVideo.vue
index dbabd90..9473e6e 100644
--- a/fe_calckey/frontend/client/src/components/MkMediaVideo.vue
+++ b/fe_calckey/frontend/client/src/components/MkMediaVideo.vue
@@ -31,14 +31,19 @@
             }"
         >
             <video
-                :poster="video.thumbnailUrl"
+                :poster="
+                    magTransProperty(video, 'thumbnail_url', 'thumbnailUrl')
+                "
                 :title="video.comment"
                 :aria-label="video.comment"
                 preload="none"
                 controls
                 @contextmenu.stop
             >
-                <source :src="video.url" :type="video.type" />
+                <source
+                    :src="video.url"
+                    :type="magTransProperty(video, 'mime_type', 'type')"
+                />
             </video>
         </VuePlyr>
         <button
@@ -58,9 +63,11 @@ import type * as misskey from "calckey-js";
 import { defaultStore } from "@/store";
 import "vue-plyr/dist/vue-plyr.css";
 import { i18n } from "@/i18n";
+import { packed } from "magnetar-common";
+import { magTransProperty } from "@/scripts-mag/mag-util";
 
 const props = defineProps<{
-    video: misskey.entities.DriveFile;
+    video: packed.PackDriveFileBase | misskey.entities.DriveFile;
 }>();
 
 const plyr = ref();
@@ -69,7 +76,8 @@ const mini = ref(false);
 const hide = ref(
     defaultStore.state.nsfw === "force"
         ? true
-        : props.video.isSensitive && defaultStore.state.nsfw !== "ignore"
+        : magTransProperty(props.video, "sensitive", "isSensitive") &&
+              defaultStore.state.nsfw !== "ignore"
 );
 
 onMounted(() => {
diff --git a/fe_calckey/frontend/client/src/components/MkNote.vue b/fe_calckey/frontend/client/src/components/MkNote.vue
index 9cf100a..0af538c 100644
--- a/fe_calckey/frontend/client/src/components/MkNote.vue
+++ b/fe_calckey/frontend/client/src/components/MkNote.vue
@@ -235,28 +235,23 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, inject, onMounted, onUnmounted, reactive, ref } from "vue";
-import * as mfm from "mfm-js";
 import type { Ref } from "vue";
+import { computed, inject, onMounted, ref, toRaw } from "vue";
+import * as mfm from "mfm-js";
 import type * as misskey from "calckey-js";
 import MkNoteSub from "@/components/MkNoteSub.vue";
 import MkSubNoteContent from "./MkSubNoteContent.vue";
 import XNoteHeader from "@/components/MkNoteHeader.vue";
-import XNoteSimple from "@/components/MkNoteSimple.vue";
-import XMediaList from "@/components/MkMediaList.vue";
-import XCwButton from "@/components/MkCwButton.vue";
-import XPoll from "@/components/MkPoll.vue";
 import XRenoteButton from "@/components/MkRenoteButton.vue";
 import XReactionsViewer from "@/components/MkReactionsViewer.vue";
 import XStarButton from "@/components/MkStarButton.vue";
 import XStarButtonNoEmoji from "@/components/MkStarButtonNoEmoji.vue";
 import XQuoteButton from "@/components/MkQuoteButton.vue";
-import MkUrlPreview from "@/components/MkUrlPreview.vue";
 import MkVisibility from "@/components/MkVisibility.vue";
 import copyToClipboard from "@/scripts/copy-to-clipboard";
 import { url } from "@/config";
 import { pleaseLogin } from "@/scripts/please-login";
-import { focusPrev, focusNext } from "@/scripts/focus";
+import { focusNext, focusPrev } from "@/scripts/focus";
 import { getWordSoftMute } from "@/scripts/check-word-mute";
 import { useRouter } from "@/router";
 import { userPage } from "@/filters/user";
@@ -268,7 +263,6 @@ import { i18n } from "@/i18n";
 import { getNoteMenu } from "@/scripts/get-note-menu";
 import { useNoteCapture } from "@/scripts/use-note-capture";
 import { notePage } from "@/filters/note";
-import { deepClone } from "@/scripts/clone";
 import { getNoteSummary } from "@/scripts/get-note-summary";
 
 const router = useRouter();
@@ -280,7 +274,7 @@ const props = defineProps<{
     collapsedReply?: boolean;
 }>();
 
-let note = $ref(deepClone(props.note));
+let note = $ref<misskey.entities.Note>(structuredClone(toRaw(props.note)));
 
 const softMuteReasonI18nSrc = (what?: string) => {
     if (what === "note") return i18n.ts.userSaysSomethingReason;
@@ -295,7 +289,7 @@ const softMuteReasonI18nSrc = (what?: string) => {
 // plugin
 if (noteViewInterruptors.length > 0) {
     onMounted(async () => {
-        let result = deepClone(note);
+        let result = structuredClone(toRaw(note));
         for (const interruptor of noteViewInterruptors) {
             result = await interruptor.handler(result);
         }
diff --git a/fe_calckey/frontend/client/src/components/MkNoteHeader.vue b/fe_calckey/frontend/client/src/components/MkNoteHeader.vue
index 12bbef6..7bcea6d 100644
--- a/fe_calckey/frontend/client/src/components/MkNoteHeader.vue
+++ b/fe_calckey/frontend/client/src/components/MkNoteHeader.vue
@@ -9,7 +9,13 @@
                     @click.stop
                 >
                     <MkUserName :user="note.user" class="mkusername">
-                        <span v-if="note.user.isBot" class="is-bot">bot</span>
+                        <span
+                            v-if="
+                                magTransProperty(note.user, 'is_bot', 'isBot')
+                            "
+                            class="is-bot"
+                            >bot</span
+                        >
                     </MkUserName>
                 </MkA>
                 <div class="username"><MkAcct :user="note.user" /></div>
@@ -17,16 +23,38 @@
             <div>
                 <div class="info">
                     <MkA class="created-at" :to="notePage(note)">
-                        <MkTime :time="note.createdAt" />
+                        <MkTime
+                            :time="
+                                magTransProperty(
+                                    note,
+                                    'created_at',
+                                    'createdAt'
+                                )
+                            "
+                        />
                         <i
-                            v-if="note.updatedAt"
+                            v-if="
+                                magTransProperty(
+                                    note,
+                                    'updated_at',
+                                    'updatedAt'
+                                )
+                            "
                             v-tooltip.noDelay="
                                 i18n.t('edited', {
                                     date: new Date(
-                                        note.updatedAt
+                                        magTransProperty(
+                                            note,
+                                            'updated_at',
+                                            'updatedAt'
+                                        )!
                                     ).toLocaleDateString(),
                                     time: new Date(
-                                        note.updatedAt
+                                        magTransProperty(
+                                            note,
+                                            'updated_at',
+                                            'updatedAt'
+                                        )!
                                     ).toLocaleTimeString(),
                                 })
                             "
@@ -37,7 +65,7 @@
                     <MkVisibility :note="note" />
                 </div>
                 <MkInstanceTicker
-                    v-if="showTicker"
+                    v-if="showTicker && note.user.instance"
                     class="ticker"
                     :instance="note.user.instance"
                 />
@@ -47,17 +75,18 @@
 </template>
 
 <script lang="ts" setup>
-import {} from "vue";
 import type * as misskey from "calckey-js";
-import { defaultStore, noteViewInterruptors } from "@/store";
+import { defaultStore } from "@/store";
 import MkVisibility from "@/components/MkVisibility.vue";
 import MkInstanceTicker from "@/components/MkInstanceTicker.vue";
 import { notePage } from "@/filters/note";
 import { userPage } from "@/filters/user";
 import { i18n } from "@/i18n";
+import { packed } from "magnetar-common";
+import { magTransProperty } from "@/scripts-mag/mag-util";
 
 const props = defineProps<{
-    note: misskey.entities.Note;
+    note: packed.PackNoteBase | misskey.entities.Note;
     pinned?: boolean;
 }>();
 
@@ -65,7 +94,7 @@ let note = $ref(props.note);
 
 const showTicker =
     defaultStore.state.instanceTicker === "always" ||
-    (defaultStore.state.instanceTicker === "remote" && note.user.instance);
+    (defaultStore.state.instanceTicker === "remote" && note.user.host);
 </script>
 
 <style lang="scss" scoped>
diff --git a/fe_calckey/frontend/client/src/components/MkNoteSimple.vue b/fe_calckey/frontend/client/src/components/MkNoteSimple.vue
index 74fafe5..7ae8ea5 100644
--- a/fe_calckey/frontend/client/src/components/MkNoteSimple.vue
+++ b/fe_calckey/frontend/client/src/components/MkNoteSimple.vue
@@ -11,13 +11,13 @@
 </template>
 
 <script lang="ts" setup>
-import {} from "vue";
 import * as misskey from "calckey-js";
 import XNoteHeader from "@/components/MkNoteHeader.vue";
 import MkSubNoteContent from "@/components/MkSubNoteContent.vue";
+import { packed } from "magnetar-common";
 
 const props = defineProps<{
-    note: misskey.entities.Note;
+    note: packed.PackNoteMaybeFull | misskey.entities.Note;
     pinned?: boolean;
 }>();
 </script>
diff --git a/fe_calckey/frontend/client/src/components/MkNoteSub.vue b/fe_calckey/frontend/client/src/components/MkNoteSub.vue
index d540dc4..1d95768 100644
--- a/fe_calckey/frontend/client/src/components/MkNoteSub.vue
+++ b/fe_calckey/frontend/client/src/components/MkNoteSub.vue
@@ -68,32 +68,52 @@
                         @click="reply()"
                     >
                         <i class="ph-arrow-u-up-left ph-bold ph-lg"></i>
-                        <template v-if="appearNote.repliesCount > 0">
-                            <p class="count">{{ appearNote.repliesCount }}</p>
+                        <template
+                            v-if="
+                                Number(
+                                    magTransProperty(
+                                        appearNote,
+                                        'reply_count',
+                                        'repliesCount'
+                                    )
+                                ) > 0
+                            "
+                        >
+                            <p class="count">
+                                {{
+                                    magTransProperty(
+                                        appearNote,
+                                        "reply_count",
+                                        "repliesCount"
+                                    )
+                                }}
+                            </p>
                         </template>
                     </button>
                     <XRenoteButton
                         ref="renoteButton"
                         class="button"
                         :note="appearNote"
-                        :count="appearNote.renoteCount"
+                        :count="
+                            Number(
+                                magTransProperty(
+                                    appearNote,
+                                    'renote_count',
+                                    'renoteCount'
+                                )
+                            )
+                        "
                     />
                     <XStarButtonNoEmoji
                         v-if="!enableEmojiReactions"
                         class="button"
                         :note="appearNote"
-                        :count="
-                            Object.values(appearNote.reactions).reduce(
-                                (partialSum, val) => partialSum + val,
-                                0
-                            )
-                        "
-                        :reacted="appearNote.myReaction != null"
+                        :count="magReactionCount(appearNote)"
+                        :reacted="magHasReacted(appearNote)"
                     />
                     <XStarButton
                         v-if="
-                            enableEmojiReactions &&
-                            appearNote.myReaction == null
+                            enableEmojiReactions && !magHasReacted(appearNote)
                         "
                         ref="starButton"
                         class="button"
@@ -101,8 +121,7 @@
                     />
                     <button
                         v-if="
-                            enableEmojiReactions &&
-                            appearNote.myReaction == null
+                            enableEmojiReactions && !magHasReacted(appearNote)
                         "
                         ref="reactButton"
                         v-tooltip.noDelay.bottom="i18n.ts.reaction"
@@ -112,10 +131,7 @@
                         <i class="ph-smiley ph-bold ph-lg"></i>
                     </button>
                     <button
-                        v-if="
-                            enableEmojiReactions &&
-                            appearNote.myReaction != null
-                        "
+                        v-if="enableEmojiReactions && magHasReacted(appearNote)"
                         ref="reactButton"
                         class="button _button reacted"
                         @click="undoReact(appearNote)"
@@ -162,7 +178,9 @@
         <I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small">
             <template #name>
                 <MkA
-                    v-user-preview="note.userId"
+                    v-user-preview="
+                        magTransMap(note, 'user', 'userId', (u) => u.id)
+                    "
                     class="name"
                     :to="userPage(note.user)"
                 >
@@ -177,8 +195,8 @@
 </template>
 
 <script lang="ts" setup>
-import { inject, ref } from "vue";
 import type { Ref } from "vue";
+import { inject, ref, toRaw } from "vue";
 import * as misskey from "calckey-js";
 import XNoteHeader from "@/components/MkNoteHeader.vue";
 import MkSubNoteContent from "@/components/MkSubNoteContent.vue";
@@ -201,13 +219,20 @@ import { $i } from "@/account";
 import { i18n } from "@/i18n";
 import { useNoteCapture } from "@/scripts/use-note-capture";
 import { defaultStore } from "@/store";
-import { deepClone } from "@/scripts/clone";
+import { packed } from "magnetar-common";
+import {
+    magHasReacted,
+    magIsRenote,
+    magReactionCount,
+    magTransMap,
+    magTransProperty,
+} from "@/scripts-mag/mag-util";
 
 const router = useRouter();
 
 const props = withDefaults(
     defineProps<{
-        note: misskey.entities.Note;
+        note: packed.PackNoteMaybeFull | misskey.entities.Note;
         conversation?: misskey.entities.Note[];
         parentId?;
         detailedView?;
@@ -223,7 +248,9 @@ const props = withDefaults(
     }
 );
 
-let note = $ref(deepClone(props.note));
+let note = $ref<packed.PackNoteMaybeFull | misskey.entities.Note>(
+    structuredClone(toRaw(props.note))
+);
 
 const softMuteReasonI18nSrc = (what?: string) => {
     if (what === "note") return i18n.ts.userSaysSomethingReason;
@@ -235,12 +262,6 @@ const softMuteReasonI18nSrc = (what?: string) => {
     return i18n.ts.userSaysSomething;
 };
 
-const isRenote =
-    note.renote != null &&
-    note.text == null &&
-    note.fileIds.length === 0 &&
-    note.poll == null;
-
 const el = ref<HTMLElement>();
 const footerEl = ref<HTMLElement>();
 const menuButton = ref<HTMLElement>();
@@ -248,7 +269,11 @@ const starButton = ref<InstanceType<typeof XStarButton>>();
 const renoteButton = ref<InstanceType<typeof XRenoteButton>>();
 const reactButton = ref<HTMLElement>();
 let appearNote = $computed(() =>
-    isRenote ? (note.renote as misskey.entities.Note) : note
+    magIsRenote(note)
+        ? (magTransProperty(note, "renoted_note", "renote") as
+              | packed.PackNoteMaybeFull
+              | misskey.entities.Note)
+        : note
 );
 const isDeleted = ref(false);
 const muted = ref(getWordSoftMute(note, $i, defaultStore.state.mutedWords));
@@ -329,6 +354,8 @@ function menu(viaKeyboard = false): void {
 }
 
 function onContextmenu(ev: MouseEvent): void {
+    if (!ev.target || !(ev.target instanceof HTMLElement)) return;
+
     const isLink = (el: HTMLElement) => {
         if (el.tagName === "A") return true;
         if (el.parentElement) {
@@ -336,7 +363,7 @@ function onContextmenu(ev: MouseEvent): void {
         }
     };
     if (isLink(ev.target)) return;
-    if (window.getSelection().toString() !== "") return;
+    if (window.getSelection()?.toString() !== "") return;
 
     if (defaultStore.state.useReactionPickerForContextMenu) {
         ev.preventDefault();
@@ -395,15 +422,15 @@ function onContextmenu(ev: MouseEvent): void {
 }
 
 function focus() {
-    el.value.focus();
+    el.value?.focus();
 }
 
 function blur() {
-    el.value.blur();
+    el.value?.blur();
 }
 
 function noteClick(e) {
-    if (document.getSelection().type === "Range" || !expandOnNoteClick) {
+    if (document.getSelection()?.type === "Range" || !expandOnNoteClick) {
         e.stopPropagation();
     } else {
         router.push(notePage(props.note));
diff --git a/fe_calckey/frontend/client/src/components/MkPoll.vue b/fe_calckey/frontend/client/src/components/MkPoll.vue
index 6c1551a..f67e074 100644
--- a/fe_calckey/frontend/client/src/components/MkPoll.vue
+++ b/fe_calckey/frontend/client/src/components/MkPoll.vue
@@ -2,31 +2,50 @@
     <div class="tivcixzd" :class="{ done: closed || isVoted }">
         <ul>
             <li
-                v-for="(choice, i) in note.poll.choices"
+                v-for="(choice, i) in magTransProperty(
+                    note.poll,
+                    'options',
+                    'choices'
+                )"
                 :key="i"
-                :class="{ voted: choice.voted }"
+                :class="{ voted: magTransProperty(choice, 'voted', 'isVoted') }"
                 @click.stop="vote(i)"
             >
                 <div
                     class="backdrop"
                     :style="{
                         width: `${
-                            showResult ? (choice.votes / total) * 100 : 0
+                            showResult
+                                ? (magTransProperty(
+                                      choice,
+                                      'votes_count',
+                                      'votes'
+                                  ) /
+                                      total) *
+                                  100
+                                : 0
                         }%`,
                     }"
                 ></div>
                 <span>
-                    <template v-if="choice.isVoted"
+                    <template
+                        v-if="magTransProperty(choice, 'voted', 'isVoted')"
                         ><i class="ph-check ph-bold ph-lg"></i
                     ></template>
                     <Mfm
-                        :text="choice.text"
+                        :text="magTransProperty(choice, 'title', 'text')"
                         :plain="true"
                         :custom-emojis="note.emojis"
                     />
                     <span v-if="showResult" class="votes"
                         >({{
-                            i18n.t("_poll.votesCount", { n: choice.votes })
+                            i18n.t("_poll.votesCount", {
+                                n: magTransProperty(
+                                    choice,
+                                    "votes_count",
+                                    "votes"
+                                ),
+                            })
                         }})</span
                     >
                 </span>
@@ -65,22 +84,35 @@ import { pleaseLogin } from "@/scripts/please-login";
 import * as os from "@/os";
 import { i18n } from "@/i18n";
 import { useInterval } from "@/scripts/use-interval";
+import { packed } from "magnetar-common";
+import { magTransProperty } from "@/scripts-mag/mag-util";
 
 const props = defineProps<{
-    note: misskey.entities.Note & Required<Pick<misskey.entities.Note, "poll">>;
+    note:
+        | (packed.PackNoteMaybeFull & { poll: {} })
+        | (misskey.entities.Note &
+              Required<Pick<misskey.entities.Note, "poll">>);
     readOnly?: boolean;
 }>();
 
 const pollRefreshing = ref(false);
 const remaining = ref(-1);
 
-const total = computed(() => sum(props.note.poll.choices.map((x) => x.votes)));
+const total = computed(() =>
+    sum(
+        magTransProperty(props.note.poll, "options", "choices").map(
+            (x) => magTransProperty(x, "votes_count", "votes") as number
+        )
+    )
+);
 const closed = computed(() => remaining.value === 0);
 const isLocal = computed(() => !props.note.uri);
 const isVoted = computed(
     () =>
-        !props.note.poll.multiple &&
-        props.note.poll.choices.some((c) => c.isVoted)
+        !magTransProperty(props.note.poll, "multiple_choice", "multiple") &&
+        magTransProperty(props.note.poll, "options", "choices").some(
+            (c) => magTransProperty(c, "voted", "isVoted") ?? false
+        )
 );
 const timer = computed(() =>
     i18n.t(
@@ -103,11 +135,17 @@ const timer = computed(() =>
 const showResult = ref(props.readOnly || isVoted.value);
 
 // 期限付きアンケート
-if (props.note.poll.expiresAt) {
+if (magTransProperty(props.note.poll, "expires_at", "expiresAt")) {
     const tick = () => {
         remaining.value = Math.floor(
             Math.max(
-                new Date(props.note.poll.expiresAt!).getTime() - Date.now(),
+                new Date(
+                    magTransProperty(
+                        props.note.poll,
+                        "expires_at",
+                        "expiresAt"
+                    )!
+                ).getTime() - Date.now(),
                 0
             ) / 1000
         );
@@ -152,7 +190,11 @@ const vote = async (id: number) => {
     const { canceled } = await os.confirm({
         type: "question",
         text: i18n.t("voteConfirm", {
-            choice: props.note.poll.choices[id].text,
+            choice: magTransProperty(
+                magTransProperty(props.note.poll, "options", "choices")[id],
+                "title",
+                "text"
+            ),
         }),
     });
     if (canceled) return;
@@ -161,7 +203,12 @@ const vote = async (id: number) => {
         noteId: props.note.id,
         choice: id,
     });
-    if (!showResult.value) showResult.value = !props.note.poll.multiple;
+    if (!showResult.value)
+        showResult.value = !magTransProperty(
+            props.note.poll,
+            "multiple_choice",
+            "multiple"
+        );
 };
 </script>
 
diff --git a/fe_calckey/frontend/client/src/components/MkPostForm.vue b/fe_calckey/frontend/client/src/components/MkPostForm.vue
index 0835ab7..0ea17fb 100644
--- a/fe_calckey/frontend/client/src/components/MkPostForm.vue
+++ b/fe_calckey/frontend/client/src/components/MkPostForm.vue
@@ -252,24 +252,32 @@ import {
     openAccountMenu as openAccountMenu_,
 } from "@/account";
 import { uploadFile } from "@/scripts/upload";
-import { deepClone } from "@/scripts/clone";
 import XCheatSheet from "@/components/MkCheatSheetDialog.vue";
 import { preprocess } from "@/scripts/preprocess";
+import { packed } from "magnetar-common";
+import {
+    magLegacyVisibility,
+    magTransMap,
+    magTransProperty,
+} from "@/scripts-mag/mag-util";
 
 const modal = inject("modal");
 
 const props = withDefaults(
     defineProps<{
-        reply?: misskey.entities.Note;
-        renote?: misskey.entities.Note;
+        reply?: packed.PackNoteMaybeFull | misskey.entities.Note;
+        renote?: packed.PackNoteMaybeFull | misskey.entities.Note;
         mention?: misskey.entities.User;
         specified?: misskey.entities.User;
         initialText?: string;
         initialVisibility?: typeof misskey.noteVisibilities;
-        initialFiles?: misskey.entities.DriveFile[];
+        initialFiles?: (
+            | packed.PackDriveFileBase
+            | misskey.entities.DriveFile
+        )[];
         initialLocalOnly?: boolean;
         initialVisibleUsers?: misskey.entities.User[];
-        initialNote?: misskey.entities.Note;
+        initialNote?: packed.PackNoteMaybeFull | misskey.entities.Note;
         instant?: boolean;
         fixed?: boolean;
         autofocus?: boolean;
@@ -465,21 +473,26 @@ if (
     ) {
         visibility = "specified";
     } else {
-        visibility = props.reply.visibility;
+        visibility = magLegacyVisibility(props.reply.visibility);
     }
     if (visibility === "specified") {
-        if (props.reply.visibleUserIds) {
+        const ids = magTransProperty(
+            props.reply,
+            "visible_user_ids",
+            "visibleUserIds"
+        );
+        if (ids) {
             os.api("users/show", {
-                userIds: props.reply.visibleUserIds.filter(
-                    (uid) => uid !== $i.id && uid !== props.reply.userId
+                userIds: ids.filter(
+                    (uid) => uid !== $i.id && uid !== props.reply!.user.id
                 ),
             }).then((users) => {
                 users.forEach(pushVisibleUser);
             });
         }
 
-        if (props.reply.userId !== $i.id) {
-            os.api("users/show", { userId: props.reply.userId }).then(
+        if (props.reply.user.id !== $i.id) {
+            os.api("users/show", { userId: props.reply.user.id }).then(
                 (user) => {
                     pushVisibleUser(user);
                 }
@@ -591,7 +604,10 @@ function updateFiles(_files) {
 }
 
 function updateFileSensitive(file, sensitive) {
-    files[files.findIndex((x) => x.id === file.id)].isSensitive = sensitive;
+    const idx = files.findIndex((x) => x.id === file.id);
+    const f = files[idx];
+    if ("isSensitive" in f) f.isSensitive = sensitive;
+    else f.sensitive = sensitive;
 }
 
 function updateFileName(file, name) {
@@ -830,7 +846,7 @@ async function post() {
     // plugin
     if (notePostInterruptors.length > 0) {
         for (const interruptor of notePostInterruptors) {
-            postData = await interruptor.handler(deepClone(postData));
+            postData = await interruptor.handler(structuredClone(postData));
         }
     }
 
@@ -972,20 +988,39 @@ onMounted(() => {
         if (props.initialNote) {
             const init = props.initialNote;
             text = init.text ? init.text : "";
-            files = init.files;
+
+            files = magTransProperty(init, "attachments", "files") ?? [];
             cw = init.cw;
             useCw = init.cw != null;
             if (init.poll) {
                 poll = {
-                    choices: init.poll.choices.map((x) => x.text),
-                    multiple: init.poll.multiple,
-                    expiresAt: init.poll.expiresAt,
-                    expiredAfter: init.poll.expiredAfter,
+                    choices: magTransMap(
+                        init.poll,
+                        "options",
+                        "choices",
+                        (a) => a.map((x) => x.title),
+                        (b) => b.map((x) => x.text)
+                    ),
+                    multiple: magTransProperty(
+                        init.poll,
+                        "multiple_choice",
+                        "multiple"
+                    ),
+                    expiresAt: magTransProperty(
+                        init.poll,
+                        "expires_at",
+                        "expiresAt"
+                    ),
+                    // TODO(Natty)
+                    expiredAfter: null,
                 };
             }
-            visibility = init.visibility;
-            localOnly = init.localOnly;
-            quoteId = init.renote ? init.renote.id : null;
+            visibility = magLegacyVisibility(init.visibility);
+            localOnly =
+                magTransProperty(init, "local_only", "localOnly") ?? false;
+            quoteId = magTransProperty(init, "renote", "renoted_note")
+                ? magTransProperty(init, "renote", "renoted_note")!.id
+                : null;
         }
 
         nextTick(() => watchForDraft());
diff --git a/fe_calckey/frontend/client/src/components/MkPostFormAttaches.vue b/fe_calckey/frontend/client/src/components/MkPostFormAttaches.vue
index ea9d5bc..aaede65 100644
--- a/fe_calckey/frontend/client/src/components/MkPostFormAttaches.vue
+++ b/fe_calckey/frontend/client/src/components/MkPostFormAttaches.vue
@@ -20,7 +20,10 @@
                         :file="element"
                         fit="cover"
                     />
-                    <div v-if="element.isSensitive" class="sensitive">
+                    <div
+                        v-if="element.sensitive ?? element.isSensitive"
+                        class="sensitive"
+                    >
                         <i class="ph-warning ph-bold ph-lg icon"></i>
                     </div>
                 </div>
@@ -31,7 +34,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, defineAsyncComponent } from "vue";
+import { defineAsyncComponent, defineComponent } from "vue";
 import MkDriveFileThumbnail from "@/components/MkDriveFileThumbnail.vue";
 import * as os from "@/os";
 import { i18n } from "@/i18n";
@@ -86,9 +89,13 @@ export default defineComponent({
         toggleSensitive(file) {
             os.api("drive/files/update", {
                 fileId: file.id,
-                isSensitive: !file.isSensitive,
+                isSensitive: !(file.sensitive ?? file.isSensitive),
             }).then(() => {
-                this.$emit("changeSensitive", file, !file.isSensitive);
+                this.$emit(
+                    "changeSensitive",
+                    file,
+                    !(file.sensitive ?? file.isSensitive)
+                );
             });
         },
         async rename(file) {
@@ -150,9 +157,10 @@ export default defineComponent({
                             },
                         },
                         {
-                            text: file.isSensitive
-                                ? i18n.ts.unmarkAsSensitive
-                                : i18n.ts.markAsSensitive,
+                            text:
+                                file.sensitive ?? file.isSensitive
+                                    ? i18n.ts.unmarkAsSensitive
+                                    : i18n.ts.markAsSensitive,
                             icon: file.isSensitive
                                 ? "ph-eye ph-bold ph-lg"
                                 : "ph-eye-slash ph-bold ph-lg",
diff --git a/fe_calckey/frontend/client/src/components/MkPostFormDialog.vue b/fe_calckey/frontend/client/src/components/MkPostFormDialog.vue
index 7ffa0bd..4ac6cd8 100644
--- a/fe_calckey/frontend/client/src/components/MkPostFormDialog.vue
+++ b/fe_calckey/frontend/client/src/components/MkPostFormDialog.vue
@@ -19,14 +19,14 @@
 </template>
 
 <script lang="ts" setup>
-import {} from "vue";
 import * as misskey from "calckey-js";
 import MkModal from "@/components/MkModal.vue";
 import MkPostForm from "@/components/MkPostForm.vue";
+import { packed } from "magnetar-common";
 
 const props = defineProps<{
-    reply?: misskey.entities.Note;
-    renote?: misskey.entities.Note;
+    reply?: packed.PackNoteMaybeFull | misskey.entities.Note;
+    renote?: packed.PackNoteMaybeFull | misskey.entities.Note;
     mention?: misskey.entities.User;
     specified?: misskey.entities.User;
     initialText?: string;
@@ -34,7 +34,7 @@ const props = defineProps<{
     initialFiles?: misskey.entities.DriveFile[];
     initialLocalOnly?: boolean;
     initialVisibleUsers?: misskey.entities.User[];
-    initialNote?: misskey.entities.Note;
+    initialNote?: packed.PackNoteMaybeFull | misskey.entities.Note;
     instant?: boolean;
     fixed?: boolean;
     autofocus?: boolean;
diff --git a/fe_calckey/frontend/client/src/components/MkReactionsViewer.reaction.vue b/fe_calckey/frontend/client/src/components/MkReactionsViewer.reaction.vue
index 3b80069..3209e8c 100644
--- a/fe_calckey/frontend/client/src/components/MkReactionsViewer.reaction.vue
+++ b/fe_calckey/frontend/client/src/components/MkReactionsViewer.reaction.vue
@@ -5,7 +5,7 @@
         v-ripple="canToggle"
         class="hkzvhatu _button"
         :class="{
-            reacted: note.myReaction == reaction,
+            reacted: magReactionSelf(note) === reaction,
             canToggle,
             newlyAdded: !isInitial,
         }"
@@ -28,12 +28,14 @@ import XReactionIcon from "@/components/MkReactionIcon.vue";
 import * as os from "@/os";
 import { useTooltip } from "@/scripts/use-tooltip";
 import { $i } from "@/account";
+import { packed } from "magnetar-common";
+import { magReactionSelf } from "@/scripts-mag/mag-util";
 
 const props = defineProps<{
     reaction: string;
     count: number;
     isInitial: boolean;
-    note: misskey.entities.Note;
+    note: packed.PackNoteMaybeFull | misskey.entities.Note;
 }>();
 
 const buttonRef = ref<HTMLElement>();
@@ -43,7 +45,7 @@ const canToggle = computed(() => !props.reaction.match(/@\w/) && $i);
 const toggleReaction = () => {
     if (!canToggle.value) return;
 
-    const oldReaction = props.note.myReaction;
+    const oldReaction = magReactionSelf(props.note);
     if (oldReaction) {
         os.api("notes/reactions/delete", {
             noteId: props.note.id,
diff --git a/fe_calckey/frontend/client/src/components/MkReactionsViewer.vue b/fe_calckey/frontend/client/src/components/MkReactionsViewer.vue
index be8a768..dfab837 100644
--- a/fe_calckey/frontend/client/src/components/MkReactionsViewer.vue
+++ b/fe_calckey/frontend/client/src/components/MkReactionsViewer.vue
@@ -1,11 +1,13 @@
 <template>
     <div class="tdflqwzn" :class="{ isMe }">
         <XReaction
-            v-for="(count, reaction) in note.reactions"
-            :key="reaction"
-            :reaction="reaction"
-            :count="count"
-            :is-initial="initialReactions.has(reaction)"
+            v-for="r in Array.isArray(note.reactions)
+                ? note.reactions
+                : Object.entries(note.reactions)"
+            :key="magReactionPairToLegacy(r)[0]"
+            :reaction="magReactionPairToLegacy(r)[0]"
+            :count="magReactionPairToLegacy(r)[1]"
+            :is-initial="initialReactions.has(magReactionPairToLegacy(r)[0])"
             :note="note"
         />
     </div>
@@ -16,14 +18,16 @@ import { computed } from "vue";
 import * as misskey from "calckey-js";
 import { $i } from "@/account";
 import XReaction from "@/components/MkReactionsViewer.reaction.vue";
+import { packed } from "magnetar-common";
+import { magReactionPairToLegacy } from "@/scripts-mag/mag-util";
 
 const props = defineProps<{
-    note: misskey.entities.Note;
+    note: packed.PackNoteMaybeFull | misskey.entities.Note;
 }>();
 
 const initialReactions = new Set(Object.keys(props.note.reactions));
 
-const isMe = computed(() => $i && $i.id === props.note.userId);
+const isMe = computed(() => $i && $i.id === props.note.user.id);
 </script>
 
 <style lang="scss" scoped>
diff --git a/fe_calckey/frontend/client/src/components/MkRenoteButton.vue b/fe_calckey/frontend/client/src/components/MkRenoteButton.vue
index 27e5b4f..cb3e382 100644
--- a/fe_calckey/frontend/client/src/components/MkRenoteButton.vue
+++ b/fe_calckey/frontend/client/src/components/MkRenoteButton.vue
@@ -23,7 +23,6 @@
 
 <script lang="ts" setup>
 import { computed, ref } from "vue";
-import type * as misskey from "calckey-js";
 import Ripple from "@/components/MkRipple.vue";
 import XDetails from "@/components/MkUsersTooltip.vue";
 import { pleaseLogin } from "@/scripts/please-login";
@@ -33,21 +32,37 @@ import { useTooltip } from "@/scripts/use-tooltip";
 import { i18n } from "@/i18n";
 import { defaultStore } from "@/store";
 import { MenuItem } from "@/types/menu";
+import { packed } from "magnetar-common";
+import {
+    magLegacyVisibility,
+    magTransMap,
+    magTransProperty,
+} from "@/scripts-mag/mag-util";
+import * as Misskey from "calckey-js";
 
 const props = defineProps<{
-    note: misskey.entities.Note;
+    note: packed.PackNoteMaybeFull | Misskey.entities.Note;
     count: number;
     detailedView?;
 }>();
 
 const buttonRef = ref<HTMLElement>();
 
-const hasRenotedBefore = ref(props.note.hasRenotedBefore ?? false);
+const hasRenotedBefore = ref<boolean>(
+    magTransMap(
+        props.note,
+        "self_renote_count",
+        "hasRenotedBefore",
+        (n) => (n ?? 0) > 0
+    ) ?? false
+);
 
 const canRenote = computed(
     () =>
         ["public", "home"].includes(props.note.visibility) ||
-        props.note.userId === $i.id
+        ($i &&
+            magTransMap(props.note, "user", "userId", (user) => user.id) ===
+                $i.id)
 );
 
 useTooltip(buttonRef, async (showing) => {
@@ -141,7 +156,12 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
                 os.api("notes/create", {
                     renoteId: props.note.id,
                     visibility: "specified",
-                    visibleUserIds: props.note.visibleUserIds,
+                    visibleUserIds:
+                        magTransProperty(
+                            props.note,
+                            "visible_user_ids",
+                            "visibleUserIds"
+                        ) ?? [],
                 });
                 hasRenotedBefore.value = true;
                 const el =
@@ -193,16 +213,25 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
             action: () => {
                 os.api(
                     "notes/create",
-                    props.note.visibility === "specified"
+                    magLegacyVisibility(props.note.visibility) === "specified"
                         ? {
                               renoteId: props.note.id,
-                              visibility: props.note.visibility,
-                              visibleUserIds: props.note.visibleUserIds,
+                              visibility: magLegacyVisibility(
+                                  props.note.visibility
+                              ),
+                              visibleUserIds:
+                                  magTransProperty(
+                                      props.note,
+                                      "visible_user_ids",
+                                      "visibleUserIds"
+                                  ) ?? [],
                               localOnly: true,
                           }
                         : {
                               renoteId: props.note.id,
-                              visibility: props.note.visibility,
+                              visibility: magLegacyVisibility(
+                                  props.note.visibility
+                              ),
                               localOnly: true,
                           }
                 );
diff --git a/fe_calckey/frontend/client/src/components/MkStarButton.vue b/fe_calckey/frontend/client/src/components/MkStarButton.vue
index b2e0de9..159dd72 100644
--- a/fe_calckey/frontend/client/src/components/MkStarButton.vue
+++ b/fe_calckey/frontend/client/src/components/MkStarButton.vue
@@ -45,9 +45,10 @@ import * as os from "@/os";
 import { defaultStore } from "@/store";
 import { i18n } from "@/i18n";
 import { instance } from "@/instance";
+import { packed } from "magnetar-common";
 
 const props = defineProps<{
-    note: Note;
+    note: packed.PackNoteBase | Note;
 }>();
 
 function star(ev?: MouseEvent): void {
diff --git a/fe_calckey/frontend/client/src/components/MkStarButtonNoEmoji.vue b/fe_calckey/frontend/client/src/components/MkStarButtonNoEmoji.vue
index f90b48c..f72fa89 100644
--- a/fe_calckey/frontend/client/src/components/MkStarButtonNoEmoji.vue
+++ b/fe_calckey/frontend/client/src/components/MkStarButtonNoEmoji.vue
@@ -47,13 +47,13 @@ import Ripple from "@/components/MkRipple.vue";
 import XDetails from "@/components/MkUsersTooltip.vue";
 import { pleaseLogin } from "@/scripts/please-login";
 import * as os from "@/os";
-import { defaultStore } from "@/store";
 import { i18n } from "@/i18n";
 import { instance } from "@/instance";
 import { useTooltip } from "@/scripts/use-tooltip";
+import { packed } from "magnetar-common";
 
 const props = defineProps<{
-    note: Note;
+    note: packed.PackNoteBase | Note;
     count: number;
     reacted: boolean;
 }>();
diff --git a/fe_calckey/frontend/client/src/components/MkSubNoteContent.vue b/fe_calckey/frontend/client/src/components/MkSubNoteContent.vue
index 646ec8f..805b574 100644
--- a/fe_calckey/frontend/client/src/components/MkSubNoteContent.vue
+++ b/fe_calckey/frontend/client/src/components/MkSubNoteContent.vue
@@ -1,7 +1,11 @@
 <template>
     <p v-if="note.cw != null" class="cw">
         <MkA
-            v-if="conversation && note.renoteId == parentId"
+            v-if="
+                conversation &&
+                magTransProperty(note, 'renoted_note_id', 'renoteId') ==
+                    parentId
+            "
             :to="
                 detailedView ? `#${parentId}` : `${notePage(note)}#${parentId}`
             "
@@ -12,11 +16,17 @@
             <i class="ph-quotes ph-bold ph-lg"></i>
         </MkA>
         <MkA
-            v-else-if="!detailed && note.replyId"
+            v-else-if="
+                !detailed && magTransProperty(note, 'parent_note_id', 'replyId')
+            "
             :to="
                 detailedView
-                    ? `#${note.replyId}`
-                    : `${notePage(note)}#${note.replyId}`
+                    ? `#${magTransProperty(note, 'parent_note_id', 'replyId')}`
+                    : `${notePage(note)}#${magTransProperty(
+                          note,
+                          'parent_note_id',
+                          'replyId'
+                      )}`
             "
             behavior="browser"
             v-tooltip="i18n.ts.jumpToPrevious"
@@ -40,7 +50,8 @@
             :class="{
                 collapsed,
                 isLong,
-                manyImages: note.files.length > 4,
+                manyImages:
+                    magTransProperty(note, 'attachments', 'files')?.length > 4,
                 showContent: note.cw && !showContent,
                 animatedMfm: !disableMfm,
             }"
@@ -66,12 +77,16 @@
                     tabindex: !showContent ? '-1' : null,
                 }"
             >
-                <span v-if="note.deletedAt" style="opacity: 0.5"
-                    >({{ i18n.ts.deleted }})</span
-                >
                 <template v-if="!note.cw">
                     <MkA
-                        v-if="conversation && note.renoteId == parentId"
+                        v-if="
+                            conversation &&
+                            magTransProperty(
+                                note,
+                                'renoted_note_id',
+                                'renoteId'
+                            ) == parentId
+                        "
                         :to="
                             detailedView
                                 ? `#${parentId}`
@@ -84,11 +99,22 @@
                         <i class="ph-quotes ph-bold ph-lg"></i>
                     </MkA>
                     <MkA
-                        v-else-if="!detailed && note.replyId"
+                        v-else-if="
+                            !detailed &&
+                            magTransProperty(note, 'parent_note_id', 'replyId')
+                        "
                         :to="
                             detailedView
-                                ? `#${note.replyId}`
-                                : `${notePage(note)}#${note.replyId}`
+                                ? `#${magTransProperty(
+                                      note,
+                                      'parent_note_id',
+                                      'replyId'
+                                  )}`
+                                : `${notePage(note)}#${magTransProperty(
+                                      note,
+                                      'parent_note_id',
+                                      'replyId'
+                                  )}`
                         "
                         behavior="browser"
                         v-tooltip="i18n.ts.jumpToPrevious"
@@ -106,14 +132,24 @@
                     :custom-emojis="note.emojis"
                 />
                 <MkA
-                    v-if="!detailed && note.renoteId"
+                    v-if="
+                        !detailed &&
+                        magTransProperty(note, 'renoted_note_id', 'renoteId')
+                    "
                     class="rp"
-                    :to="`/notes/${note.renoteId}`"
+                    :to="`/notes/${magTransProperty(
+                        note,
+                        'renoted_note_id',
+                        'renoteId'
+                    )}`"
                     >{{ i18n.ts.quoteAttached }}: ...</MkA
                 >
                 <XMediaList
-                    v-if="note.files.length > 0"
-                    :media-list="note.files"
+                    v-if="
+                        magTransProperty(note, 'attachments', 'files')?.length >
+                        0
+                    "
+                    :media-list="magTransProperty(note, 'attachments', 'files')!"
                 />
                 <XPoll v-if="note.poll" :note="note" class="poll" />
                 <template v-if="detailed">
@@ -126,11 +162,18 @@
                         class="url-preview"
                     />
                     <div
-                        v-if="note.renote"
+                        v-if="magTransProperty(note, 'renoted_note', 'renote')"
                         class="renote"
-                        @click.stop="emit('push', note.renote)"
+                        @click.stop="
+                            emit(
+                                'push',
+                                magTransProperty(note, 'renoted_note', 'renote')
+                            )
+                        "
                     >
-                        <XNoteSimple :note="note.renote" />
+                        <XNoteSimple
+                            :note="magTransProperty(note, 'renoted_note', 'renote')!"
+                        />
                     </div>
                 </template>
                 <div
@@ -192,9 +235,12 @@ import { extractUrlFromMfm } from "@/scripts/extract-url-from-mfm";
 import { extractMfmWithAnimation } from "@/scripts/extract-mfm";
 import { i18n } from "@/i18n";
 import { defaultStore } from "@/store";
+import { $i } from "@/account";
+import { magTransProperty } from "@/scripts-mag/mag-util";
+import { packed } from "magnetar-common";
 
 const props = defineProps<{
-    note: misskey.entities.Note;
+    note: packed.PackNoteMaybeFull | misskey.entities.Note;
     parentId?;
     conversation?;
     detailed?: boolean;
@@ -216,7 +262,8 @@ const isLong =
     ((props.note.text != null &&
         (props.note.text.split("\n").length > 10 ||
             props.note.text.length > 800)) ||
-        props.note.files.length > 4);
+        (magTransProperty(props.note, "attachments", "files") ?? []).length >
+            4);
 const collapsed = $ref(props.note.cw == null && isLong);
 const urls = props.note.text
     ? extractUrlFromMfm(mfm.parse(props.note.text)).slice(0, 5)
diff --git a/fe_calckey/frontend/client/src/components/MkUserOnlineIndicator.vue b/fe_calckey/frontend/client/src/components/MkUserOnlineIndicator.vue
deleted file mode 100644
index a1d604d..0000000
--- a/fe_calckey/frontend/client/src/components/MkUserOnlineIndicator.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<template>
-    <div v-tooltip="text" class="fzgwjkgc" :class="user.onlineStatus"></div>
-</template>
-
-<script lang="ts" setup>
-import {} from "vue";
-import * as misskey from "calckey-js";
-import { i18n } from "@/i18n";
-
-const props = defineProps<{
-    user: misskey.entities.User;
-}>();
-
-const text = $computed(() => {
-    switch (props.user.onlineStatus) {
-        case "online":
-            return i18n.ts.online;
-        case "active":
-            return i18n.ts.active;
-        case "offline":
-            return i18n.ts.offline;
-        case "unknown":
-            return i18n.ts.unknown;
-    }
-});
-</script>
-
-<style lang="scss" scoped>
-.fzgwjkgc {
-    box-shadow: 0 0 0 3px var(--panel);
-    border-radius: 120%; // Blinkのバグか知らんけど、100%ぴったりにすると何故か若干楕円でレンダリングされる
-
-    &.online {
-        background: #9ccfd8;
-    }
-
-    &.active {
-        background: #f6c177;
-    }
-
-    &.offline {
-        background: #eb6f92;
-    }
-
-    &.unknown {
-        background: #6e6a86;
-    }
-}
-</style>
diff --git a/fe_calckey/frontend/client/src/components/global/MkAcct.vue b/fe_calckey/frontend/client/src/components/global/MkAcct.vue
index 14d91cc..8f9a590 100644
--- a/fe_calckey/frontend/client/src/components/global/MkAcct.vue
+++ b/fe_calckey/frontend/client/src/components/global/MkAcct.vue
@@ -13,9 +13,10 @@
 import * as misskey from "calckey-js";
 import { toUnicode } from "punycode/";
 import { host as hostRaw } from "@/config";
+import { packed } from "magnetar-common";
 
 defineProps<{
-    user: misskey.entities.UserDetailed;
+    user: packed.PackUserBase | misskey.entities.User;
     detail?: boolean;
 }>();
 
diff --git a/fe_calckey/frontend/client/src/components/global/MkAvatar.vue b/fe_calckey/frontend/client/src/components/global/MkAvatar.vue
index 5e75b28..63d1ebc 100644
--- a/fe_calckey/frontend/client/src/components/global/MkAvatar.vue
+++ b/fe_calckey/frontend/client/src/components/global/MkAvatar.vue
@@ -3,23 +3,36 @@
         v-if="disableLink"
         v-user-preview="disablePreview ? undefined : user.id"
         class="eiwwqkts _noSelect"
-        :class="{ cat: user.isCat, square: $store.state.squareAvatars }"
+        :class="{
+            cat:
+                magTransMap(
+                    props.user,
+                    'avatar_decoration',
+                    'isCat',
+                    (a) => a === 'CatEars'
+                ) || false,
+            square: $store.state.squareAvatars,
+        }"
         :style="{ color }"
         :title="acct(user)"
         @click="onClick"
     >
         <img class="inner" :src="url" decoding="async" />
-        <MkUserOnlineIndicator
-            v-if="showIndicator && user.instance == null"
-            class="indicator"
-            :user="user"
-        />
     </span>
     <MkA
         v-else
         v-user-preview="disablePreview ? undefined : user.id"
         class="eiwwqkts _noSelect"
-        :class="{ cat: user.isCat, square: $store.state.squareAvatars }"
+        :class="{
+            cat:
+                magTransMap(
+                    props.user,
+                    'avatar_decoration',
+                    'isCat',
+                    (d) => d === 'CatEars'
+                ) || false,
+            square: $store.state.squareAvatars,
+        }"
         :style="{ color }"
         :to="userPage(user)"
         :title="acct(user)"
@@ -27,36 +40,30 @@
         @click.stop
     >
         <img class="inner" :src="url" decoding="async" />
-        <MkUserOnlineIndicator
-            v-if="showIndicator && user.instance == null"
-            class="indicator"
-            :user="user"
-        />
     </MkA>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, watch } from "vue";
+import { watch } from "vue";
 import * as misskey from "calckey-js";
 import { getStaticImageUrl } from "@/scripts/get-static-image-url";
 import { extractAvgColorFromBlurhash } from "@/scripts/extract-avg-color-from-blurhash";
 import { acct, userPage } from "@/filters/user";
-import MkUserOnlineIndicator from "@/components/MkUserOnlineIndicator.vue";
 import { defaultStore } from "@/store";
+import { packed } from "magnetar-common";
+import { magTransMap, magTransProperty } from "@/scripts-mag/mag-util";
 
 const props = withDefaults(
     defineProps<{
-        user: misskey.entities.User;
+        user: packed.PackUserBase | misskey.entities.User;
         target?: string | null;
         disableLink?: boolean;
         disablePreview?: boolean;
-        showIndicator?: boolean;
     }>(),
     {
         target: null,
         disableLink: false,
         disablePreview: false,
-        showIndicator: false,
     }
 );
 
@@ -66,8 +73,10 @@ const emit = defineEmits<{
 
 const url = $computed(() =>
     defaultStore.state.disableShowingAnimatedImages
-        ? getStaticImageUrl(props.user.avatarUrl)
-        : props.user.avatarUrl
+        ? getStaticImageUrl(
+              magTransProperty(props.user, "avatar_url", "avatarUrl")
+          )
+        : magTransProperty(props.user, "avatar_url", "avatarUrl")
 );
 
 function onClick(ev: MouseEvent) {
@@ -77,9 +86,11 @@ function onClick(ev: MouseEvent) {
 let color = $ref();
 
 watch(
-    () => props.user.avatarBlurhash,
+    () => magTransProperty(props.user, "avatar_blurhash", "avatarBlurhash"),
     () => {
-        color = extractAvgColorFromBlurhash(props.user.avatarBlurhash);
+        color = extractAvgColorFromBlurhash(
+            magTransProperty(props.user, "avatar_blurhash", "avatarBlurhash")
+        );
     },
     {
         immediate: true,
diff --git a/fe_calckey/frontend/client/src/components/global/MkUserName.vue b/fe_calckey/frontend/client/src/components/global/MkUserName.vue
index 66a3484..055e13f 100644
--- a/fe_calckey/frontend/client/src/components/global/MkUserName.vue
+++ b/fe_calckey/frontend/client/src/components/global/MkUserName.vue
@@ -1,7 +1,7 @@
 <template>
     <Mfm
         :class="$style.root"
-        :text="user.name || user.username"
+        :text="magTransUsername(user)"
         :plain="true"
         :nowrap="nowrap"
         :custom-emojis="user.emojis"
@@ -9,12 +9,13 @@
 </template>
 
 <script lang="ts" setup>
-import {} from "vue";
 import * as misskey from "calckey-js";
+import { packed } from "magnetar-common";
+import { magTransUsername } from "@/scripts-mag/mag-util";
 
 const props = withDefaults(
     defineProps<{
-        user: misskey.entities.User;
+        user: packed.PackUserBase | misskey.entities.User;
         nowrap?: boolean;
     }>(),
     {
diff --git a/fe_calckey/frontend/client/src/components/page/page.note.vue b/fe_calckey/frontend/client/src/components/page/page.note.vue
index d796962..018e976 100644
--- a/fe_calckey/frontend/client/src/components/page/page.note.vue
+++ b/fe_calckey/frontend/client/src/components/page/page.note.vue
@@ -15,10 +15,11 @@
 
 <script lang="ts">
 import { defineComponent, onMounted, PropType, Ref, ref } from "vue";
-import XNote from "@/components/MkNote.vue";
-import XNoteDetailed from "@/components/MkNoteDetailed.vue";
+import XNote from "@/components/MagNote.vue";
+import XNoteDetailed from "@/components/MagNoteDetailed.vue";
 import * as os from "@/os";
 import { NoteBlock } from "@/scripts/hpml/block";
+import { endpoints, packed } from "magnetar-common";
 
 export default defineComponent({
     components: {
@@ -32,14 +33,18 @@ export default defineComponent({
         },
     },
     setup(props, ctx) {
-        const note: Ref<Record<string, any> | null> = ref(null);
+        const note: Ref<packed.PackNoteMaybeFull | null> = ref(null);
 
         onMounted(() => {
-            os.api("notes/show", { noteId: props.block.note }).then(
-                (result) => {
-                    note.value = result;
-                }
-            );
+            if (!props.block.note) return;
+
+            os.magApi(
+                endpoints.GetNoteById,
+                { context: props.block.detailed, attachments: true },
+                { id: props.block.note }
+            ).then((result) => {
+                note.value = result;
+            });
         });
 
         return {
diff --git a/fe_calckey/frontend/client/src/config.ts b/fe_calckey/frontend/client/src/config.ts
index 1e7b581..158f10c 100644
--- a/fe_calckey/frontend/client/src/config.ts
+++ b/fe_calckey/frontend/client/src/config.ts
@@ -15,6 +15,6 @@ export const lang = localStorage.getItem("lang");
 export const langs = _LANGS_;
 export const locale = JSON.parse(localStorage.getItem("locale"));
 export const version = _VERSION_;
-export const instanceName = siteName === "Magnetar" ? host : siteName;
+export const instanceName = siteName === "Magnetar" ? "" + host : siteName;
 export const ui = localStorage.getItem("ui");
 export const debug = localStorage.getItem("debug") === "true";
diff --git a/fe_calckey/frontend/client/src/filters/note.ts b/fe_calckey/frontend/client/src/filters/note.ts
index 2c5402e..815e22f 100644
--- a/fe_calckey/frontend/client/src/filters/note.ts
+++ b/fe_calckey/frontend/client/src/filters/note.ts
@@ -1,3 +1,8 @@
-export const notePage = (note) => {
+import * as Misskey from "calckey-js";
+import { packed } from "magnetar-common";
+
+export const notePage = (note: {
+    id: packed.PackNoteBase["id"] | Misskey.entities.Note["id"];
+}) => {
     return `/notes/${note.id}`;
 };
diff --git a/fe_calckey/frontend/client/src/init.ts b/fe_calckey/frontend/client/src/init.ts
index ca0c1a9..43a42ac 100644
--- a/fe_calckey/frontend/client/src/init.ts
+++ b/fe_calckey/frontend/client/src/init.ts
@@ -11,36 +11,28 @@ import "@phosphor-icons/web/fill";
 
 //#region account indexedDB migration
 import { set } from "@/scripts/idb-proxy";
-
-const accounts = localStorage.getItem("accounts");
-if (accounts) {
-    set("accounts", JSON.parse(accounts));
-    localStorage.removeItem("accounts");
-}
-//#endregion
-
 import {
     computed,
     createApp,
-    watch,
+    defineAsyncComponent,
     markRaw,
     version as vueVersion,
-    defineAsyncComponent,
+    watch,
 } from "vue";
 import { compareVersions } from "compare-versions";
 
 import widgets from "@/widgets";
 import directives from "@/directives";
 import components from "@/components";
-import { version, ui, lang, host } from "@/config";
+import { lang, ui, version } from "@/config";
 import { applyTheme } from "@/scripts/theme";
 import { isDeviceDarkmode } from "@/scripts/is-device-darkmode";
 import { i18n } from "@/i18n";
-import { confirm, alert, post, popup, toast } from "@/os";
+import { alert, confirm, popup, post, toast } from "@/os";
 import { stream } from "@/stream";
 import * as sound from "@/scripts/sound";
-import { $i, refreshAccount, login, updateAccount, signout } from "@/account";
-import { defaultStore, ColdDeviceStorage } from "@/store";
+import { $i, login, refreshAccount, signout, updateAccount } from "@/account";
+import { ColdDeviceStorage, defaultStore } from "@/store";
 import { fetchInstance, instance } from "@/instance";
 import { makeHotkey } from "@/scripts/hotkey";
 import { search } from "@/scripts/search";
@@ -51,6 +43,13 @@ import { reactionPicker } from "@/scripts/reaction-picker";
 import { getUrlWithoutLoginId } from "@/scripts/login-id";
 import { getAccountFromId } from "@/scripts/get-account-from-id";
 
+const accounts = localStorage.getItem("accounts");
+if (accounts) {
+    set("accounts", JSON.parse(accounts));
+    localStorage.removeItem("accounts");
+}
+//#endregion
+
 function checkForSplash() {
     const splash = document.getElementById("splash");
     // 念のためnullチェック(HTMLが古い場合があるため(そのうち消す))
@@ -64,7 +63,7 @@ function checkForSplash() {
 }
 
 (async () => {
-    console.info(`Calckey v${version}`);
+    console.info(`Magnetar v${version}`);
 
     if (_DEV_) {
         console.warn("Development mode!!!");
diff --git a/fe_calckey/frontend/client/src/os.ts b/fe_calckey/frontend/client/src/os.ts
index 58145e5..37c0ca8 100644
--- a/fe_calckey/frontend/client/src/os.ts
+++ b/fe_calckey/frontend/client/src/os.ts
@@ -13,9 +13,12 @@ import { MenuItem } from "@/types/menu";
 import { $i } from "@/account";
 import { i18n } from "./i18n";
 import {
+    BackendApiEndpoint,
     FrontendApiEndpoint,
     FrontendApiEndpoints,
-} from "magnetar-common/built/fe-api";
+    MagApiClient,
+    Method,
+} from "magnetar-common";
 
 export const pendingApiRequestsCount = ref(0);
 
@@ -23,6 +26,39 @@ const apiClient = new Misskey.api.APIClient({
     origin: url,
 });
 
+const magnetarApiClient = new MagApiClient(`${url}/mag/v1`);
+
+export async function magApi<
+    T extends BackendApiEndpoint<
+        T["method"] & Method,
+        T["pathParams"] & string[],
+        T["request"],
+        T["response"]
+    >
+>(
+    endpoint: T,
+    data: T["request"],
+    pathParams: {
+        [K in keyof T["pathParams"] as T["pathParams"][K] & string]:
+            | string
+            | number;
+    },
+    token?: string | null | undefined
+): Promise<T["response"]> {
+    pendingApiRequestsCount.value++;
+
+    try {
+        return await magnetarApiClient.call(
+            endpoint,
+            data,
+            pathParams,
+            token || $i?.token
+        );
+    } finally {
+        pendingApiRequestsCount.value--;
+    }
+}
+
 export async function feApi<T extends keyof FrontendApiEndpoints & string>(
     endpointDef: FrontendApiEndpoint<
         FrontendApiEndpoints[T]["method"],
diff --git a/fe_calckey/frontend/client/src/pages/note.vue b/fe_calckey/frontend/client/src/pages/note.vue
index 22eac3f..4d72281 100644
--- a/fe_calckey/frontend/client/src/pages/note.vue
+++ b/fe_calckey/frontend/client/src/pages/note.vue
@@ -34,7 +34,7 @@
                             <div class="note _gap">
                                 <MkRemoteCaution
                                     v-if="appearNote.user.host != null"
-                                    :href="appearNote.url ?? appearNote.uri"
+                                    :href="(appearNote.url ?? appearNote.uri) !"
                                 />
                                 <XNoteDetailed
                                     :key="appearNote.id"
@@ -70,27 +70,28 @@
 
 <script lang="ts" setup>
 import { computed, watch } from "vue";
-import * as misskey from "calckey-js";
-import XNoteDetailed from "@/components/MkNoteDetailed.vue";
+import XNoteDetailed from "@/components/MagNoteDetailed.vue";
 import XNotes from "@/components/MkNotes.vue";
 import MkRemoteCaution from "@/components/MkRemoteCaution.vue";
 import MkButton from "@/components/MkButton.vue";
 import * as os from "@/os";
 import { definePageMetadata } from "@/scripts/page-metadata";
 import { i18n } from "@/i18n";
+import { endpoints, packed } from "magnetar-common";
+import { magTransUsername } from "@/scripts-mag/mag-util";
 
 const props = defineProps<{
     noteId: string;
 }>();
 
-let note = $ref<null | misskey.entities.Note>();
+let note = $ref<null | packed.PackNoteMaybeFull>();
 let hasPrev = $ref(false);
 let hasNext = $ref(false);
 let showPrev = $ref(false);
 let showNext = $ref(false);
 let error = $ref();
 let isRenote = $ref(false);
-let appearNote = $ref<null | misskey.entities.Note>();
+let appearNote = $ref<null | packed.PackNoteMaybeFull>();
 
 const prevPagination = {
     endpoint: "users/notes" as const,
@@ -98,7 +99,7 @@ const prevPagination = {
     params: computed(() =>
         appearNote
             ? {
-                  userId: appearNote.userId,
+                  userId: appearNote.user.id,
                   untilId: appearNote.id,
               }
             : null
@@ -112,7 +113,7 @@ const nextPagination = {
     params: computed(() =>
         appearNote
             ? {
-                  userId: appearNote.userId,
+                  userId: appearNote.user.id,
                   sinceId: appearNote.id,
               }
             : null
@@ -125,28 +126,30 @@ function fetchNote() {
     showPrev = false;
     showNext = false;
     note = null;
-    os.api("notes/show", {
-        noteId: props.noteId,
-    })
+    os.magApi(
+        endpoints.GetNoteById,
+        { context: true, attachments: true },
+        { id: props.noteId }
+    )
         .then((res) => {
             note = res;
             isRenote =
-                note.renote != null &&
+                note.renoted_note_id != null &&
                 note.text == null &&
-                note.fileIds.length === 0 &&
+                note.file_ids.length === 0 &&
                 note.poll == null;
             appearNote = isRenote
-                ? (note.renote as misskey.entities.Note)
+                ? (note.renoted_note as packed.PackNoteMaybeFull)
                 : note;
 
             Promise.all([
                 os.api("users/notes", {
-                    userId: note.userId,
+                    userId: note.user.id,
                     untilId: note.id,
                     limit: 1,
                 }),
                 os.api("users/notes", {
-                    userId: note.userId,
+                    userId: note.user.id,
                     sinceId: note.id,
                     limit: 1,
                 }),
@@ -173,15 +176,14 @@ definePageMetadata(
         appearNote
             ? {
                   title: i18n.t("noteOf", {
-                      user: appearNote.user.name || appearNote.user.username,
+                      user: magTransUsername(appearNote.user),
                   }),
-                  subtitle: new Date(appearNote.createdAt).toLocaleString(),
+                  subtitle: new Date(appearNote.created_at).toLocaleString(),
                   avatar: appearNote.user,
                   path: `/notes/${appearNote.id}`,
                   share: {
                       title: i18n.t("noteOf", {
-                          user:
-                              appearNote.user.name || appearNote.user.username,
+                          user: magTransUsername(appearNote.user),
                       }),
                       text: appearNote.text,
                   },
diff --git a/fe_calckey/frontend/client/src/pages/page-editor/els/page-editor.el.note.vue b/fe_calckey/frontend/client/src/pages/page-editor/els/page-editor.el.note.vue
index 800166f..4075e93 100644
--- a/fe_calckey/frontend/client/src/pages/page-editor/els/page-editor.el.note.vue
+++ b/fe_calckey/frontend/client/src/pages/page-editor/els/page-editor.el.note.vue
@@ -35,14 +35,15 @@
 </template>
 
 <script lang="ts" setup>
-import { watch } from "vue";
+import { ref, watch } from "vue";
 import XContainer from "../page-editor.container.vue";
 import MkInput from "@/components/form/input.vue";
 import MkSwitch from "@/components/form/switch.vue";
 import XNote from "@/components/MkNote.vue";
-import XNoteDetailed from "@/components/MkNoteDetailed.vue";
+import XNoteDetailed from "@/components/MagNoteDetailed.vue";
 import * as os from "@/os";
 import { i18n } from "@/i18n";
+import { endpoints, packed } from "magnetar-common";
 
 const props = withDefaults(
     defineProps<{
@@ -56,21 +57,32 @@ const props = withDefaults(
     }
 );
 
-let id: any = $ref(props.value.note);
-let note: any = $ref(null);
+let id = ref<string | null>(props.value.note);
+let note = ref<packed.PackNoteMaybeFull | null>(null);
 
 watch(
     id,
     async () => {
-        if (id && (id.startsWith("http://") || id.startsWith("https://"))) {
-            props.value.note = (id.endsWith("/") ? id.slice(0, -1) : id)
+        if (
+            id.value &&
+            (id.value.startsWith("http://") || id.value.startsWith("https://"))
+        ) {
+            props.value.note = (
+                id.value.endsWith("/") ? id.value.slice(0, -1) : id.value
+            )
                 .split("/")
                 .pop();
         } else {
-            props.value.note = id;
+            props.value.note = id.value;
         }
 
-        note = await os.api("notes/show", { noteId: props.value.note });
+        if (props.value.note) return;
+
+        note.value = await os.magApi(
+            endpoints.GetNoteById,
+            { context: true, attachments: true },
+            { id: props.value.note }
+        );
     },
     {
         immediate: true,
diff --git a/fe_calckey/frontend/client/src/pages/settings/reaction.vue b/fe_calckey/frontend/client/src/pages/settings/reaction.vue
index 6011ae7..294cab4 100644
--- a/fe_calckey/frontend/client/src/pages/settings/reaction.vue
+++ b/fe_calckey/frontend/client/src/pages/settings/reaction.vue
@@ -125,7 +125,6 @@
 <script lang="ts" setup>
 import { defineAsyncComponent, watch } from "vue";
 import XDraggable from "vuedraggable";
-import FormInput from "@/components/form/input.vue";
 import FormRadios from "@/components/form/radios.vue";
 import FromSlot from "@/components/form/slot.vue";
 import FormButton from "@/components/MkButton.vue";
@@ -135,7 +134,6 @@ import * as os from "@/os";
 import { defaultStore } from "@/store";
 import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
-import { deepClone } from "@/scripts/clone";
 import { unisonReload } from "@/scripts/unison-reload";
 
 async function reloadAsk() {
@@ -148,7 +146,7 @@ async function reloadAsk() {
     unisonReload();
 }
 
-let reactions = $ref(deepClone(defaultStore.state.reactions));
+let reactions = $ref(structuredClone(defaultStore.state.reactions));
 
 const reactionPickerSkinTone = $computed(
     defaultStore.makeGetterSetter("reactionPickerSkinTone")
@@ -211,7 +209,7 @@ async function setDefault() {
     });
     if (canceled) return;
 
-    reactions = deepClone(defaultStore.def.reactions.default);
+    reactions = structuredClone(defaultStore.def.reactions.default);
 }
 
 function chooseEmoji(ev: MouseEvent) {
diff --git a/fe_calckey/frontend/client/src/pages/settings/statusbar.statusbar.vue b/fe_calckey/frontend/client/src/pages/settings/statusbar.statusbar.vue
index 57d5a01..2a2819d 100644
--- a/fe_calckey/frontend/client/src/pages/settings/statusbar.statusbar.vue
+++ b/fe_calckey/frontend/client/src/pages/settings/statusbar.statusbar.vue
@@ -142,17 +142,15 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, reactive, ref, watch } from "vue";
+import { reactive, watch } from "vue";
 import FormSelect from "@/components/form/select.vue";
 import MkInput from "@/components/form/input.vue";
 import MkSwitch from "@/components/form/switch.vue";
 import FormRadios from "@/components/form/radios.vue";
 import FormButton from "@/components/MkButton.vue";
 import FormRange from "@/components/form/range.vue";
-import * as os from "@/os";
 import { defaultStore } from "@/store";
 import { i18n } from "@/i18n";
-import { deepClone } from "@/scripts/clone";
 
 const props = defineProps<{
     _id: string;
@@ -160,7 +158,9 @@ const props = defineProps<{
 }>();
 
 const statusbar = reactive(
-    deepClone(defaultStore.state.statusbars.find((x) => x.id === props._id))
+    structuredClone(
+        defaultStore.state.statusbars.find((x) => x.id === props._id)
+    )
 );
 
 watch(
@@ -197,8 +197,8 @@ async function save() {
     const i = defaultStore.state.statusbars.findIndex(
         (x) => x.id === props._id
     );
-    const statusbars = deepClone(defaultStore.state.statusbars);
-    statusbars[i] = deepClone(statusbar);
+    const statusbars = structuredClone(defaultStore.state.statusbars);
+    statusbars[i] = structuredClone(statusbar);
     defaultStore.set("statusbars", statusbars);
 }
 
diff --git a/fe_calckey/frontend/client/src/plugin.ts b/fe_calckey/frontend/client/src/plugin.ts
index c518f0a..440198f 100644
--- a/fe_calckey/frontend/client/src/plugin.ts
+++ b/fe_calckey/frontend/client/src/plugin.ts
@@ -135,7 +135,7 @@ function registerPostFormAction({ pluginId, title, handler }) {
     postFormActions.push({
         title,
         handler: (form, update) => {
-            pluginContexts.get(pluginId).execFn(handler, [
+            pluginContexts.get(pluginId)?.execFn(handler, [
                 utils.jsToVal(form),
                 values.FN_NATIVE(([key, value]) => {
                     update(key.value, value.value);
@@ -149,7 +149,9 @@ function registerUserAction({ pluginId, title, handler }) {
     userActions.push({
         title,
         handler: (user) => {
-            pluginContexts.get(pluginId).execFn(handler, [utils.jsToVal(user)]);
+            pluginContexts
+                .get(pluginId)
+                ?.execFn(handler, [utils.jsToVal(user)]);
         },
     });
 }
@@ -158,7 +160,9 @@ function registerNoteAction({ pluginId, title, handler }) {
     noteActions.push({
         title,
         handler: (note) => {
-            pluginContexts.get(pluginId).execFn(handler, [utils.jsToVal(note)]);
+            pluginContexts
+                .get(pluginId)
+                ?.execFn(handler, [utils.jsToVal(note)]);
         },
     });
 }
diff --git a/fe_calckey/frontend/client/src/scripts-mag/mag-util.ts b/fe_calckey/frontend/client/src/scripts-mag/mag-util.ts
new file mode 100644
index 0000000..ff0fe26
--- /dev/null
+++ b/fe_calckey/frontend/client/src/scripts-mag/mag-util.ts
@@ -0,0 +1,240 @@
+import * as Misskey from "calckey-js";
+import { packed, types } from "magnetar-common";
+
+// https://stackoverflow.com/a/50375286 Evil magic
+type Dist<U> = U extends any ? (k: U) => void : never;
+
+type UnionToIntersection<U> = Dist<U> extends (k: infer I) => void ? I : never;
+// End of evil magic
+
+type UnionMerged<A> = { [AK in keyof A]: AK extends keyof A ? A[AK] : never };
+type UnionIntersectionMerge<A> = Omit<
+    UnionToIntersection<A>,
+    keyof UnionMerged<A>
+> &
+    UnionMerged<A>;
+
+export function magTransProperty<
+    A extends Record<string, any>,
+    AA extends keyof UnionToIntersection<A> & string,
+    BB extends keyof UnionToIntersection<A> & string
+>(
+    x: A,
+    keyA: AA,
+    keyB: BB
+): UnionIntersectionMerge<A>[AA] | UnionIntersectionMerge<A>[BB] {
+    const a = x[keyA];
+
+    if (typeof a !== "undefined") {
+        return a;
+    }
+
+    return x[keyB];
+}
+
+export function magTransMap<
+    A extends Record<string, any>,
+    AA extends keyof UnionIntersectionMerge<A> & string,
+    BB extends keyof UnionIntersectionMerge<A> & string,
+    X extends any
+>(
+    x: A,
+    keyA: AA,
+    keyB: BB,
+    mapLeft: (a: UnionIntersectionMerge<A>[AA]) => X = (a) => a as X,
+    mapRight: (b: UnionIntersectionMerge<A>[BB]) => X = (a) => a as X
+): X {
+    const a = x[keyA];
+
+    if (typeof a !== "undefined") {
+        return mapLeft(a as UnionIntersectionMerge<A>[AA]);
+    }
+
+    const b = x[keyB];
+    return typeof b === "undefined"
+        ? b
+        : mapRight(b as UnionIntersectionMerge<A>[BB]);
+}
+
+type UserUnion = packed.PackUserBase | Misskey.entities.User;
+
+export function magTransUsername(x: UserUnion): string {
+    return (
+        (x as UnionToIntersection<UserUnion>)["display_name"] ||
+        (x as UnionToIntersection<UserUnion>)["name"] ||
+        (x as UnionToIntersection<UserUnion>)["username"]
+    );
+}
+
+export function magReactionCount(
+    note: packed.PackNoteMaybeFull | Misskey.entities.Note
+): number {
+    if (Array.isArray(note.reactions)) {
+        return Number(
+            note.reactions
+                .map(([, cnt]) => cnt)
+                .reduce((partialSum, val) => partialSum + val, 0)
+        );
+    } else {
+        return Object.values(note).reduce((accum, val) => accum + val, 0);
+    }
+}
+
+export function magHasReacted(
+    note: packed.PackNoteMaybeFull | Misskey.entities.Note
+): boolean {
+    if (Array.isArray(note.reactions)) {
+        return note.reactions.some(([, , reacted]) => reacted === true);
+    } else {
+        return (
+            typeof (note as Misskey.entities.Note).myReaction !== "undefined" &&
+            (note as Misskey.entities.Note).myReaction !== null
+        );
+    }
+}
+
+export function magReactionSelf(
+    note: packed.PackNoteMaybeFull | Misskey.entities.Note
+): string | null {
+    if (Array.isArray(note.reactions)) {
+        const found = note.reactions.find(
+            ([, , reacted]) => reacted === true
+        )?.[0];
+        return typeof found !== "undefined" ? magReactionToLegacy(found) : null;
+    } else if ((note as Misskey.entities.Note).myReaction !== "undefined") {
+        return (note as Misskey.entities.Note).myReaction ?? null;
+    }
+
+    return null;
+}
+
+export function noteIsMag(
+    note: packed.PackNoteMaybeFull | Misskey.entities.Note
+): note is packed.PackNoteMaybeFull {
+    return "created_at" in note;
+}
+
+export function magIsRenote(
+    note: packed.PackNoteMaybeFull | Misskey.entities.Note
+): boolean {
+    return (
+        magTransProperty(note, "renoted_note", "renote") != null &&
+        note.text == null &&
+        magTransProperty(note, "file_ids", "fileIds").length === 0 &&
+        note.poll == null
+    );
+}
+
+export function magEffectiveNote(
+    note: packed.PackNoteMaybeFull | Misskey.entities.Note
+): packed.PackNoteMaybeFull | Misskey.entities.Note {
+    return magIsRenote(note)
+        ? (magTransProperty(note, "renoted_note", "renote") as
+              | packed.PackNoteMaybeFull
+              | Misskey.entities.Note)
+        : note;
+}
+
+export function magLegacyVisibility(
+    vis: types.NoteVisibility | Misskey.entities.Note["visibility"]
+): Misskey.entities.Note["visibility"];
+
+export function magLegacyVisibility(vis: undefined): undefined;
+
+export function magLegacyVisibility(
+    vis: types.NoteVisibility | Misskey.entities.Note["visibility"] | undefined
+): Misskey.entities.Note["visibility"] | undefined {
+    if (typeof vis === "undefined") return vis;
+
+    switch (vis) {
+        case "Public":
+            return "public";
+        case "Home":
+            return "home";
+        case "Followers":
+            return "followers";
+        case "Direct":
+            return "specified";
+
+        case "public":
+        case "home":
+        case "followers":
+        case "specified":
+            return vis;
+    }
+}
+
+export function magConvertReaction(
+    reaction: string,
+    urlHint?: string | null
+): types.Reaction {
+    if (reaction.endsWith("@.:")) {
+        reaction = reaction.replaceAll(/@\.:$/, ":");
+    }
+
+    if (reaction.match(/^:.+:$/)) {
+        const [name, host] = reaction.split("@");
+        return {
+            name,
+            host: host || null,
+            url: urlHint!,
+        };
+    } else {
+        return reaction;
+    }
+}
+
+export function magReactionToLegacy(reaction: types.Reaction | string): string {
+    if (typeof reaction === "string") {
+        return reaction;
+    }
+
+    if ("name" in reaction) {
+        if (reaction.host) {
+            return `:${reaction.name}@${reaction.host}:`;
+        } else {
+            return `:${reaction.name}@.:`;
+        }
+    }
+
+    if ("raw" in reaction) {
+        return reaction.raw;
+    }
+
+    return reaction;
+}
+
+export function magReactionPairToLegacy(
+    reaction: types.ReactionPair | [string, number]
+): [string, number] {
+    const legacy = magReactionToLegacy(reaction[0]);
+    return [legacy, reaction[1]];
+}
+
+export function magReactionIndex(
+    reactions: types.ReactionPair[],
+    reactionType: types.Reaction
+) {
+    return reactions.findIndex(([r, ,]) => {
+        if (typeof r !== typeof reactionType) return false;
+
+        if (typeof r === "string") {
+            return r === reactionType;
+        } else if (
+            "name" in r &&
+            "name" in (reactionType as { name: string; host: string | null })
+        ) {
+            const { name, host } = reactionType as {
+                name: string;
+                host: string | null;
+            };
+            const { name: rName, host: rHost } = r;
+
+            return name === rName && (host ?? null) === (rHost ?? null);
+        } else if ("raw" in r && "raw" in (reactionType as { raw: string })) {
+            return r.raw === (reactionType as { raw: string }).raw;
+        }
+
+        return false;
+    });
+}
diff --git a/fe_calckey/frontend/client/src/scripts/check-word-mute.ts b/fe_calckey/frontend/client/src/scripts/check-word-mute.ts
index 349b8ee..1b0f294 100644
--- a/fe_calckey/frontend/client/src/scripts/check-word-mute.ts
+++ b/fe_calckey/frontend/client/src/scripts/check-word-mute.ts
@@ -1,23 +1,28 @@
+import { packed } from "magnetar-common";
+import * as Misskey from "calckey-js";
+import { magTransMap, magTransProperty } from "@/scripts-mag/mag-util";
+
 export type Muted = {
     muted: boolean;
     matched: string[];
-    what?: string; // "note" || "reply" || "renote" || "quote"
+    what?: "note" | "reply" | "renote" | "quote";
 };
 
-const NotMuted = { muted: false, matched: [] };
+export type NotMuted = { muted: false; matched: string[] };
 
 function checkWordMute(
-    note: NoteLike,
+    note: packed.PackNoteMaybeFull | Misskey.entities.Note,
     mutedWords: Array<string | string[]>
 ): Muted {
     let text = `${note.cw ?? ""} ${note.text ?? ""}`;
-    if (note.files != null)
-        text += ` ${note.files.map((f) => f.comment ?? "").join(" ")}`;
+    const attachments = magTransProperty(note, "attachments", "files");
+    if (attachments)
+        text += ` ${attachments.map((f) => f.comment ?? "").join(" ")}`;
     text = text.trim();
 
-    if (text === "") return NotMuted;
+    let result: Muted | NotMuted = { muted: false, matched: [] };
 
-    let result = { muted: false, matched: [] };
+    if (text === "") return result;
 
     for (const mutePattern of mutedWords) {
         if (Array.isArray(mutePattern)) {
@@ -59,13 +64,13 @@ function checkWordMute(
 }
 
 export function getWordSoftMute(
-    note: Record<string, any>,
+    note: packed.PackNoteMaybeFull | Misskey.entities.Note,
     me: Record<string, any> | null | undefined,
     mutedWords: Array<string | string[]>
 ): Muted {
     // 自分自身
-    if (me && note.userId === me.id) {
-        return NotMuted;
+    if (me && magTransMap(note, "user", "userId", (u) => u.id) === me.id) {
+        return { muted: false, matched: [] };
     }
 
     if (mutedWords.length > 0) {
@@ -75,16 +80,18 @@ export function getWordSoftMute(
             return noteMuted;
         }
 
-        if (note.renote) {
-            let renoteMuted = checkWordMute(note.renote, mutedWords);
+        const renote = magTransProperty(note, "renoted_note", "renote");
+        if (renote) {
+            let renoteMuted = checkWordMute(renote, mutedWords);
             if (renoteMuted.muted) {
                 renoteMuted.what = note.text == null ? "renote" : "quote";
                 return renoteMuted;
             }
         }
 
-        if (note.reply) {
-            let replyMuted = checkWordMute(note.reply, mutedWords);
+        const reply = magTransProperty(note, "parent_note", "reply");
+        if (reply) {
+            let replyMuted = checkWordMute(reply, mutedWords);
             if (replyMuted.muted) {
                 replyMuted.what = "reply";
                 return replyMuted;
@@ -92,5 +99,5 @@ export function getWordSoftMute(
         }
     }
 
-    return NotMuted;
+    return { muted: false, matched: [] };
 }
diff --git a/fe_calckey/frontend/client/src/scripts/clone.ts b/fe_calckey/frontend/client/src/scripts/clone.ts
deleted file mode 100644
index 32a648e..0000000
--- a/fe_calckey/frontend/client/src/scripts/clone.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// structredCloneが遅いため
-// SEE: http://var.blog.jp/archives/86038606.html
-
-type Cloneable =
-    | string
-    | number
-    | boolean
-    | null
-    | { [key: string]: Cloneable }
-    | Cloneable[];
-
-export function deepClone<T extends Cloneable>(x: T): T {
-    if (typeof x === "object") {
-        if (x === null) return x;
-        if (Array.isArray(x)) return x.map(deepClone) as T;
-        const obj = {} as Record<string, Cloneable>;
-        for (const [k, v] of Object.entries(x)) {
-            obj[k] = deepClone(v);
-        }
-        return obj as T;
-    } else {
-        return x;
-    }
-}
diff --git a/fe_calckey/frontend/client/src/scripts/extract-avg-color-from-blurhash.ts b/fe_calckey/frontend/client/src/scripts/extract-avg-color-from-blurhash.ts
index 245fdc1..34e52fe 100644
--- a/fe_calckey/frontend/client/src/scripts/extract-avg-color-from-blurhash.ts
+++ b/fe_calckey/frontend/client/src/scripts/extract-avg-color-from-blurhash.ts
@@ -1,5 +1,5 @@
-export function extractAvgColorFromBlurhash(hash: string) {
-    return typeof hash === "string"
+export function extractAvgColorFromBlurhash(hash: string | null) {
+    return hash
         ? `#${[...hash.slice(2, 6)]
               .map((x) =>
                   "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz#$%*+,-.:;=?@[]^_{|}~".indexOf(
diff --git a/fe_calckey/frontend/client/src/scripts/get-note-menu.ts b/fe_calckey/frontend/client/src/scripts/get-note-menu.ts
index f744608..5fe1489 100644
--- a/fe_calckey/frontend/client/src/scripts/get-note-menu.ts
+++ b/fe_calckey/frontend/client/src/scripts/get-note-menu.ts
@@ -9,24 +9,23 @@ import { url } from "@/config";
 import { noteActions } from "@/store";
 import { shareAvailable } from "@/scripts/share-available";
 import { getUserMenu } from "@/scripts/get-user-menu";
+import {
+    magEffectiveNote,
+    magTransMap,
+    magTransProperty,
+    magTransUsername,
+} from "@/scripts-mag/mag-util";
+import { packed } from "magnetar-common";
 
 export function getNoteMenu(props: {
-    note: misskey.entities.Note;
+    note: packed.PackNoteMaybeFull | misskey.entities.Note;
     menuButton: Ref<HTMLElement | undefined>;
     translation: Ref<any>;
     translating: Ref<boolean>;
     isDeleted: Ref<boolean>;
     currentClipPage?: Ref<misskey.entities.Clip>;
 }) {
-    const isRenote =
-        props.note.renote != null &&
-        props.note.text == null &&
-        props.note.fileIds.length === 0 &&
-        props.note.poll == null;
-
-    const appearNote = isRenote
-        ? (props.note.renote as misskey.entities.Note)
-        : props.note;
+    const appearNote = magEffectiveNote(props.note);
 
     function del(): void {
         os.confirm({
@@ -54,8 +53,8 @@ export function getNoteMenu(props: {
 
             os.post({
                 initialNote: appearNote,
-                renote: appearNote.renote,
-                reply: appearNote.reply,
+                renote: magTransProperty(appearNote, "renoted_note", "renote"),
+                reply: magTransProperty(appearNote, "parent_note", "reply"),
             });
         });
     }
@@ -63,8 +62,8 @@ export function getNoteMenu(props: {
     function edit(): void {
         os.post({
             initialNote: appearNote,
-            renote: appearNote.renote,
-            reply: appearNote.reply,
+            renote: magTransProperty(appearNote, "renoted_note", "renote"),
+            reply: magTransProperty(appearNote, "parent_note", "reply"),
             editId: appearNote.id,
         });
     }
@@ -228,23 +227,12 @@ export function getNoteMenu(props: {
         props.isDeleted.value = true;
     }
 
-    async function promote(): Promise<void> {
-        const { canceled, result: days } = await os.inputNumber({
-            title: i18n.ts.numberOfDays,
-        });
-
-        if (canceled) return;
-
-        os.apiWithDialog("admin/promo/create", {
-            noteId: appearNote.id,
-            expiresAt: Date.now() + 86400000 * days,
-        });
-    }
-
     function share(): void {
         navigator.share({
-            title: i18n.t("noteOf", { user: appearNote.user.name }),
-            text: appearNote.text,
+            title: i18n.t("noteOf", {
+                user: magTransUsername(appearNote.user),
+            }),
+            text: appearNote.text ?? undefined,
             url: `${url}/notes/${appearNote.id}`,
         });
     }
@@ -266,7 +254,8 @@ export function getNoteMenu(props: {
             noteId: appearNote.id,
         });
 
-        const isAppearAuthor = appearNote.userId === $i.id;
+        const isAppearAuthor =
+            magTransMap(appearNote, "user", "userId", (u) => u.id) === $i.id;
         const isModerator = $i.isAdmin || $i.isModerator;
 
         menu = [
@@ -353,7 +342,7 @@ export function getNoteMenu(props: {
                       text: i18n.ts.showOnRemote,
                       action: () => {
                           window.open(
-                              appearNote.url || appearNote.uri,
+                              (appearNote.url || appearNote.uri)!,
                               "_blank"
                           );
                       },
@@ -468,7 +457,7 @@ export function getNoteMenu(props: {
                       text: i18n.ts.showOnRemote,
                       action: () => {
                           window.open(
-                              appearNote.url || appearNote.uri,
+                              (appearNote.url || appearNote.uri)!,
                               "_blank"
                           );
                       },
diff --git a/fe_calckey/frontend/client/src/scripts/get-note-summary.ts b/fe_calckey/frontend/client/src/scripts/get-note-summary.ts
index 7c6063e..0f1c687 100644
--- a/fe_calckey/frontend/client/src/scripts/get-note-summary.ts
+++ b/fe_calckey/frontend/client/src/scripts/get-note-summary.ts
@@ -1,11 +1,14 @@
 import * as misskey from "calckey-js";
-import { i18n } from "@/i18n";
+import { packed } from "magnetar-common";
+import { magTransProperty } from "@/scripts-mag/mag-util";
 
 /**
  * 投稿を表す文字列を取得します。
  * @param {*} note (packされた)投稿
  */
-export const getNoteSummary = (note: misskey.entities.Note): string => {
+export const getNoteSummary = (
+    note: packed.PackNoteMaybeFull | misskey.entities.Note
+): string => {
     /*
 	if (note.deletedAt) {
 		return `(${i18n.ts.deletedNote})`;
@@ -22,8 +25,9 @@ export const getNoteSummary = (note: misskey.entities.Note): string => {
     }
 
     // ファイルが添付されているとき
-    if ((note.files || []).length !== 0) {
-        const len = note.files?.length;
+    const files = magTransProperty(note, "attachments", "files");
+    if ((files || []).length !== 0) {
+        const len = files?.length;
         summary += ` 📎${len !== 1 ? ` (${len})` : ""}`;
     }
 
diff --git a/fe_calckey/frontend/client/src/scripts/page-metadata.ts b/fe_calckey/frontend/client/src/scripts/page-metadata.ts
index 6605823..debd54f 100644
--- a/fe_calckey/frontend/client/src/scripts/page-metadata.ts
+++ b/fe_calckey/frontend/client/src/scripts/page-metadata.ts
@@ -9,6 +9,7 @@ import {
     ref,
     Ref,
 } from "vue";
+import { packed } from "magnetar-common";
 
 export const setPageMetadata = Symbol("setPageMetadata");
 export const pageMetadataProvider = Symbol("pageMetadataProvider");
@@ -17,7 +18,7 @@ export type PageMetadata = {
     title: string;
     subtitle?: string;
     icon?: string | null;
-    avatar?: misskey.entities.User | null;
+    avatar?: packed.PackUserBase | misskey.entities.User | null;
     userName?: misskey.entities.User | null;
     bg?: string;
 };
diff --git a/fe_calckey/frontend/client/src/scripts/theme.ts b/fe_calckey/frontend/client/src/scripts/theme.ts
index 9610209..6b2681a 100644
--- a/fe_calckey/frontend/client/src/scripts/theme.ts
+++ b/fe_calckey/frontend/client/src/scripts/theme.ts
@@ -1,6 +1,8 @@
 import { ref } from "vue";
 import tinycolor from "tinycolor2";
 import { globalEvents } from "@/events";
+import lightTheme from "@/themes/_light.json5";
+import darkTheme from "@/themes/_dark.json5";
 
 export type Theme = {
     id: string;
@@ -11,10 +13,6 @@ export type Theme = {
     props: Record<string, string>;
 };
 
-import lightTheme from "@/themes/_light.json5";
-import darkTheme from "@/themes/_dark.json5";
-import { deepClone } from "./clone";
-
 export const themeProps = Object.keys(lightTheme.props).filter(
     (key) => !key.startsWith("X")
 );
@@ -77,7 +75,7 @@ export function applyTheme(theme: Theme, persist = true) {
     const colorSchema = theme.base === "dark" ? "dark" : "light";
 
     // Deep copy
-    const _theme = deepClone(theme);
+    const _theme = structuredClone(theme);
 
     if (_theme.base) {
         const base = [lightTheme, darkTheme].find((x) => x.id === _theme.base);
diff --git a/fe_calckey/frontend/client/src/scripts/use-note-capture.ts b/fe_calckey/frontend/client/src/scripts/use-note-capture.ts
index 1e917d0..fafe154 100644
--- a/fe_calckey/frontend/client/src/scripts/use-note-capture.ts
+++ b/fe_calckey/frontend/client/src/scripts/use-note-capture.ts
@@ -3,10 +3,16 @@ import * as misskey from "calckey-js";
 import { stream } from "@/stream";
 import { $i } from "@/account";
 import * as os from "@/os";
+import { endpoints, packed } from "magnetar-common";
+import {
+    magConvertReaction,
+    magReactionIndex,
+    noteIsMag,
+} from "@/scripts-mag/mag-util";
 
 export function useNoteCapture(props: {
     rootEl: Ref<HTMLElement>;
-    note: Ref<misskey.entities.Note>;
+    note: Ref<packed.PackNoteMaybeFull | misskey.entities.Note>;
     isDeletedRef: Ref<boolean>;
 }) {
     const note = props.note;
@@ -17,80 +23,188 @@ export function useNoteCapture(props: {
 
         if (id !== note.value.id) return;
 
-        switch (type) {
-            case "reacted": {
-                const reaction = body.reaction;
+        if (noteIsMag(note.value)) {
+            switch (type) {
+                case "reacted": {
+                    const reaction = body.reaction as string;
 
-                if (body.emoji) {
-                    const emojis = note.value.emojis || [];
-                    if (!emojis.includes(body.emoji)) {
-                        note.value.emojis = [...emojis, body.emoji];
+                    if (body.emoji) {
+                        const emojis = note.value.emojis || [];
+                        if (!emojis.includes(body.emoji)) {
+                            note.value.emojis = [
+                                ...emojis,
+                                {
+                                    id: body.emoji.id,
+                                    shortcode: body.emoji.name,
+                                    url: body.emoji.url,
+                                    width: body.emoji.width ?? null,
+                                    height: body.emoji.height ?? null,
+                                    category: null,
+                                },
+                            ];
+                        }
                     }
+
+                    const reactionType = magConvertReaction(reaction);
+                    const foundReaction = magReactionIndex(
+                        note.value.reactions,
+                        reactionType
+                    );
+
+                    const selfReact = ($i && body.userId === $i.id) || false;
+                    if (foundReaction >= 0) {
+                        note.value.reactions[foundReaction] = [
+                            note.value.reactions[foundReaction][0],
+                            note.value.reactions[foundReaction][1] + 1,
+                            selfReact,
+                        ];
+                    } else {
+                        note.value.reactions.push([reactionType, 1, selfReact]);
+                    }
+                    break;
                 }
 
-                // TODO: reactionsプロパティがない場合ってあったっけ？ なければ || {} は消せる
-                const currentCount = note.value.reactions?.[reaction] || 0;
+                case "unreacted": {
+                    const reaction = body.reaction;
 
-                note.value.reactions[reaction] = currentCount + 1;
+                    const reactionType = magConvertReaction(reaction);
+                    const foundReaction = magReactionIndex(
+                        note.value.reactions,
+                        reactionType
+                    );
 
-                if ($i && body.userId === $i.id) {
-                    note.value.myReaction = reaction;
-                }
-                break;
-            }
+                    if (foundReaction >= 0) {
+                        const cnt = note.value.reactions[foundReaction][1];
+                        note.value.reactions[foundReaction] = [
+                            note.value.reactions[foundReaction][0],
+                            cnt === 0 ? 0 : cnt - 1,
+                            false,
+                        ];
+                    }
 
-            case "unreacted": {
-                const reaction = body.reaction;
-
-                // TODO: reactionsプロパティがない場合ってあったっけ？ なければ || {} は消せる
-                const currentCount = note.value.reactions?.[reaction] || 0;
-
-                note.value.reactions[reaction] = Math.max(0, currentCount - 1);
-
-                if ($i && body.userId === $i.id) {
-                    note.value.myReaction = undefined;
-                }
-                break;
-            }
-
-            case "pollVoted": {
-                const choice = body.choice;
-
-                if (note.value.poll) {
-                    const choices = [...note.value.poll.choices];
-                    choices[choice] = {
-                        ...choices[choice],
-                        votes: choices[choice].votes + 1,
-                        ...($i && body.userId === $i.id
-                            ? {
-                                  isVoted: true,
-                              }
-                            : {}),
-                    };
-                    note.value.poll.choices = choices;
+                    break;
                 }
 
-                break;
+                case "pollVoted": {
+                    const choice = body.choice;
+
+                    if (note.value.poll) {
+                        const options = [...note.value.poll.options];
+                        options[choice] = {
+                            ...options[choice],
+                            votes_count: options[choice].votes_count + 1,
+                            voted: ($i && body.userId === $i.id) || null,
+                        };
+                        note.value.poll.options = options;
+                    }
+
+                    break;
+                }
+
+                case "deleted": {
+                    props.isDeletedRef.value = true;
+                    break;
+                }
+
+                case "updated": {
+                    const editedNote = await os.magApi(
+                        endpoints.GetNoteById,
+                        {
+                            attachments: true,
+                            context: true,
+                        },
+                        { id }
+                    );
+
+                    const keys = new Set<string>();
+                    Object.keys(editedNote)
+                        .concat(Object.keys(note.value))
+                        .forEach((key) => keys.add(key));
+                    keys.forEach((key) => {
+                        note.value[key] = editedNote[key];
+                    });
+                    break;
+                }
             }
+        } else {
+            switch (type) {
+                case "reacted": {
+                    const reaction = body.reaction;
 
-            case "deleted": {
-                props.isDeletedRef.value = true;
-                break;
-            }
+                    if (body.emoji) {
+                        const emojis = note.value.emojis || [];
+                        if (!emojis.includes(body.emoji)) {
+                            note.value.emojis = [...emojis, body.emoji];
+                        }
+                    }
 
-            case "updated": {
-                const editedNote = await os.api("notes/show", {
-                    noteId: id,
-                });
+                    // TODO: reactionsプロパティがない場合ってあったっけ？ なければ || {} は消せる
+                    const currentCount = note.value.reactions?.[reaction] || 0;
 
-                const keys = new Set<string>();
-                Object.keys(editedNote)
-                    .concat(Object.keys(note.value))
-                    .forEach((key) => keys.add(key));
-                keys.forEach((key) => {
-                    note.value[key] = editedNote[key];
-                });
-                break;
+                    note.value.reactions[reaction] = currentCount + 1;
+
+                    if ($i && body.userId === $i.id) {
+                        note.value.myReaction = reaction;
+                    }
+                    break;
+                }
+
+                case "unreacted": {
+                    const reaction = body.reaction;
+
+                    // TODO: reactionsプロパティがない場合ってあったっけ？ なければ || {} は消せる
+                    const currentCount = note.value.reactions?.[reaction] || 0;
+
+                    note.value.reactions[reaction] = Math.max(
+                        0,
+                        currentCount - 1
+                    );
+
+                    if ($i && body.userId === $i.id) {
+                        note.value.myReaction = undefined;
+                    }
+                    break;
+                }
+
+                case "pollVoted": {
+                    const choice = body.choice;
+
+                    if (note.value.poll) {
+                        const choices = [...note.value.poll.choices];
+                        choices[choice] = {
+                            ...choices[choice],
+                            votes: choices[choice].votes + 1,
+                            ...($i && body.userId === $i.id
+                                ? {
+                                      isVoted: true,
+                                  }
+                                : {}),
+                        };
+                        note.value.poll.choices = choices;
+                    }
+
+                    break;
+                }
+
+                case "deleted": {
+                    props.isDeletedRef.value = true;
+                    break;
+                }
+
+                case "updated": {
+                    const editedNote = await os.api("notes/show", {
+                        noteId: id,
+                    });
+
+                    const keys = new Set<string>();
+                    Object.keys(editedNote)
+                        .concat(Object.keys(note.value))
+                        .forEach((key) => keys.add(key));
+                    keys.forEach((key) => {
+                        note.value[key] = editedNote[key];
+                    });
+                    break;
+                }
             }
         }
     }
diff --git a/fe_calckey/frontend/client/src/store.ts b/fe_calckey/frontend/client/src/store.ts
index c8ba03f..f12d28a 100644
--- a/fe_calckey/frontend/client/src/store.ts
+++ b/fe_calckey/frontend/client/src/store.ts
@@ -6,11 +6,16 @@ import { Storage } from "./pizzax";
 import lightTheme from "@/themes/l-rosepinedawn.json5";
 import darkTheme from "@/themes/d-rosepine.json5";
 
-export const postFormActions = [];
-export const userActions = [];
-export const noteActions = [];
-export const noteViewInterruptors = [];
-export const notePostInterruptors = [];
+export const postFormActions: {
+    title: any;
+    handler: (form: any, update: any) => void;
+}[] = [];
+export const userActions: { title: any; handler: (user: any) => void }[] = [];
+export const noteActions: { title: any; handler: (note: any) => void }[] = [];
+export const noteViewInterruptors: { handler: (note: any) => Promise<any> }[] =
+    [];
+export const notePostInterruptors: { handler: (note: any) => Promise<any> }[] =
+    [];
 
 const menuOptions = [
     "notifications",
diff --git a/fe_calckey/frontend/client/src/ui/deck/deck-store.ts b/fe_calckey/frontend/client/src/ui/deck/deck-store.ts
index df54180..f599a4a 100644
--- a/fe_calckey/frontend/client/src/ui/deck/deck-store.ts
+++ b/fe_calckey/frontend/client/src/ui/deck/deck-store.ts
@@ -3,7 +3,6 @@ import { markRaw } from "vue";
 import { notificationTypes } from "calckey-js";
 import { Storage } from "../../pizzax";
 import { api } from "@/os";
-import { deepClone } from "@/scripts/clone";
 
 type ColumnWidget = {
     name: string;
@@ -158,7 +157,7 @@ export function swapColumn(a: Column["id"], b: Column["id"]) {
     const aY = deckStore.state.layout[aX].findIndex((id) => id === a);
     const bX = deckStore.state.layout.findIndex((ids) => ids.indexOf(b) !== -1);
     const bY = deckStore.state.layout[bX].findIndex((id) => id === b);
-    const layout = deepClone(deckStore.state.layout);
+    const layout = structuredClone(deckStore.state.layout);
     layout[aX][aY] = b;
     layout[bX][bY] = a;
     deckStore.set("layout", layout);
@@ -166,7 +165,7 @@ export function swapColumn(a: Column["id"], b: Column["id"]) {
 }
 
 export function swapLeftColumn(id: Column["id"]) {
-    const layout = deepClone(deckStore.state.layout);
+    const layout = structuredClone(deckStore.state.layout);
     deckStore.state.layout.some((ids, i) => {
         if (ids.includes(id)) {
             const left = deckStore.state.layout[i - 1];
@@ -182,7 +181,7 @@ export function swapLeftColumn(id: Column["id"]) {
 }
 
 export function swapRightColumn(id: Column["id"]) {
-    const layout = deepClone(deckStore.state.layout);
+    const layout = structuredClone(deckStore.state.layout);
     deckStore.state.layout.some((ids, i) => {
         if (ids.includes(id)) {
             const right = deckStore.state.layout[i + 1];
@@ -198,11 +197,11 @@ export function swapRightColumn(id: Column["id"]) {
 }
 
 export function swapUpColumn(id: Column["id"]) {
-    const layout = deepClone(deckStore.state.layout);
+    const layout = structuredClone(deckStore.state.layout);
     const idsIndex = deckStore.state.layout.findIndex((ids) =>
         ids.includes(id)
     );
-    const ids = deepClone(deckStore.state.layout[idsIndex]);
+    const ids = structuredClone(deckStore.state.layout[idsIndex]);
     ids.some((x, i) => {
         if (x === id) {
             const up = ids[i - 1];
@@ -220,11 +219,11 @@ export function swapUpColumn(id: Column["id"]) {
 }
 
 export function swapDownColumn(id: Column["id"]) {
-    const layout = deepClone(deckStore.state.layout);
+    const layout = structuredClone(deckStore.state.layout);
     const idsIndex = deckStore.state.layout.findIndex((ids) =>
         ids.includes(id)
     );
-    const ids = deepClone(deckStore.state.layout[idsIndex]);
+    const ids = structuredClone(deckStore.state.layout[idsIndex]);
     ids.some((x, i) => {
         if (x === id) {
             const down = ids[i + 1];
@@ -242,7 +241,7 @@ export function swapDownColumn(id: Column["id"]) {
 }
 
 export function stackLeftColumn(id: Column["id"]) {
-    let layout = deepClone(deckStore.state.layout);
+    let layout = structuredClone(deckStore.state.layout);
     const i = deckStore.state.layout.findIndex((ids) => ids.includes(id));
     layout = layout.map((ids) => ids.filter((_id) => _id !== id));
     layout[i - 1].push(id);
@@ -252,7 +251,7 @@ export function stackLeftColumn(id: Column["id"]) {
 }
 
 export function popRightColumn(id: Column["id"]) {
-    let layout = deepClone(deckStore.state.layout);
+    let layout = structuredClone(deckStore.state.layout);
     const i = deckStore.state.layout.findIndex((ids) => ids.includes(id));
     const affected = layout[i];
     layout = layout.map((ids) => ids.filter((_id) => _id !== id));
@@ -260,7 +259,7 @@ export function popRightColumn(id: Column["id"]) {
     layout = layout.filter((ids) => ids.length > 0);
     deckStore.set("layout", layout);
 
-    const columns = deepClone(deckStore.state.columns);
+    const columns = structuredClone(deckStore.state.columns);
     for (const column of columns) {
         if (affected.includes(column.id)) {
             column.active = true;
@@ -272,9 +271,9 @@ export function popRightColumn(id: Column["id"]) {
 }
 
 export function addColumnWidget(id: Column["id"], widget: ColumnWidget) {
-    const columns = deepClone(deckStore.state.columns);
+    const columns = structuredClone(deckStore.state.columns);
     const columnIndex = deckStore.state.columns.findIndex((c) => c.id === id);
-    const column = deepClone(deckStore.state.columns[columnIndex]);
+    const column = structuredClone(deckStore.state.columns[columnIndex]);
     if (column == null) return;
     if (column.widgets == null) column.widgets = [];
     column.widgets.unshift(widget);
@@ -284,9 +283,9 @@ export function addColumnWidget(id: Column["id"], widget: ColumnWidget) {
 }
 
 export function removeColumnWidget(id: Column["id"], widget: ColumnWidget) {
-    const columns = deepClone(deckStore.state.columns);
+    const columns = structuredClone(deckStore.state.columns);
     const columnIndex = deckStore.state.columns.findIndex((c) => c.id === id);
-    const column = deepClone(deckStore.state.columns[columnIndex]);
+    const column = structuredClone(deckStore.state.columns[columnIndex]);
     if (column == null) return;
     column.widgets = column.widgets.filter((w) => w.id !== widget.id);
     columns[columnIndex] = column;
@@ -295,9 +294,9 @@ export function removeColumnWidget(id: Column["id"], widget: ColumnWidget) {
 }
 
 export function setColumnWidgets(id: Column["id"], widgets: ColumnWidget[]) {
-    const columns = deepClone(deckStore.state.columns);
+    const columns = structuredClone(deckStore.state.columns);
     const columnIndex = deckStore.state.columns.findIndex((c) => c.id === id);
-    const column = deepClone(deckStore.state.columns[columnIndex]);
+    const column = structuredClone(deckStore.state.columns[columnIndex]);
     if (column == null) return;
     column.widgets = widgets;
     columns[columnIndex] = column;
@@ -310,9 +309,9 @@ export function updateColumnWidget(
     widgetId: string,
     widgetData: any
 ) {
-    const columns = deepClone(deckStore.state.columns);
+    const columns = structuredClone(deckStore.state.columns);
     const columnIndex = deckStore.state.columns.findIndex((c) => c.id === id);
-    const column = deepClone(deckStore.state.columns[columnIndex]);
+    const column = structuredClone(deckStore.state.columns[columnIndex]);
     if (column == null) return;
     column.widgets = column.widgets.map((w) =>
         w.id === widgetId
@@ -328,9 +327,9 @@ export function updateColumnWidget(
 }
 
 export function updateColumn(id: Column["id"], column: Partial<Column>) {
-    const columns = deepClone(deckStore.state.columns);
+    const columns = structuredClone(deckStore.state.columns);
     const columnIndex = deckStore.state.columns.findIndex((c) => c.id === id);
-    const currentColumn = deepClone(deckStore.state.columns[columnIndex]);
+    const currentColumn = structuredClone(deckStore.state.columns[columnIndex]);
     if (currentColumn == null) return;
     for (const [k, v] of Object.entries(column)) {
         currentColumn[k] = v;
diff --git a/fe_calckey/frontend/client/src/widgets/job-queue.vue b/fe_calckey/frontend/client/src/widgets/job-queue.vue
index c88e094..21f911a 100644
--- a/fe_calckey/frontend/client/src/widgets/job-queue.vue
+++ b/fe_calckey/frontend/client/src/widgets/job-queue.vue
@@ -123,20 +123,12 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, reactive, ref } from "vue";
-import {
-    useWidgetPropsManager,
-    Widget,
-    WidgetComponentEmits,
-    WidgetComponentExpose,
-    WidgetComponentProps,
-} from "./widget";
+import { onUnmounted, reactive } from "vue";
+import { useWidgetPropsManager, Widget, WidgetComponentExpose } from "./widget";
 import { GetFormResultType } from "@/scripts/form";
 import { stream } from "@/stream";
 import number from "@/filters/number";
 import * as sound from "@/scripts/sound";
-import * as os from "@/os";
-import { deepClone } from "@/scripts/clone";
 
 const name = "jobQueue";
 
@@ -185,12 +177,12 @@ const prev = reactive({} as typeof current);
 const jammedSound = sound.setVolume(sound.getAudio("syuilo/queue-jammed"), 1);
 
 for (const domain of ["inbox", "deliver"]) {
-    prev[domain] = deepClone(current[domain]);
+    prev[domain] = structuredClone(current[domain]);
 }
 
 const onStats = (stats) => {
     for (const domain of ["inbox", "deliver"]) {
-        prev[domain] = deepClone(current[domain]);
+        prev[domain] = structuredClone(current[domain]);
         current[domain].activeSincePrevTick = stats[domain].activeSincePrevTick;
         current[domain].active = stats[domain].active;
         current[domain].waiting = stats[domain].waiting;
diff --git a/fe_calckey/frontend/client/src/widgets/widget.ts b/fe_calckey/frontend/client/src/widgets/widget.ts
index 9db8010..07511b2 100644
--- a/fe_calckey/frontend/client/src/widgets/widget.ts
+++ b/fe_calckey/frontend/client/src/widgets/widget.ts
@@ -1,8 +1,7 @@
-import { reactive, watch } from "vue";
+import { reactive, toRaw, watch } from "vue";
 import { throttle } from "throttle-debounce";
 import { Form, GetFormResultType } from "@/scripts/form";
 import * as os from "@/os";
-import { deepClone } from "@/scripts/clone";
 
 export type Widget<P extends Record<string, unknown>> = {
     id: string;
@@ -36,7 +35,7 @@ export const useWidgetPropsManager = <
     configure: () => void;
 } => {
     const widgetProps = reactive(
-        props.widget ? deepClone(props.widget.data) : {}
+        props.widget ? structuredClone(toRaw(props.widget.data)) : {}
     );
 
     const mergeProps = () => {
@@ -59,7 +58,7 @@ export const useWidgetPropsManager = <
     });
 
     const configure = async () => {
-        const form = deepClone(propsDef);
+        const form = structuredClone(toRaw(propsDef));
         for (const item of Object.keys(form)) {
             form[item].default = widgetProps[item];
         }
diff --git a/fe_calckey/frontend/client/tsconfig.json b/fe_calckey/frontend/client/tsconfig.json
index 2d292db..4387de3 100644
--- a/fe_calckey/frontend/client/tsconfig.json
+++ b/fe_calckey/frontend/client/tsconfig.json
@@ -36,7 +36,8 @@
 			"esnext",
 			"dom"
 		],
-		"jsx": "preserve"
+		"jsx": "preserve",
+		"jsxImportSource": "vue"
 	},
 	"compileOnSave": false,
 	"include": [
diff --git a/fe_calckey/frontend/magnetar-common/package.json b/fe_calckey/frontend/magnetar-common/package.json
index 9546eca..32dfc4c 100644
--- a/fe_calckey/frontend/magnetar-common/package.json
+++ b/fe_calckey/frontend/magnetar-common/package.json
@@ -1,7 +1,8 @@
 {
   "name": "magnetar-common",
   "version": "0.0.1",
-  "main": "index.js",
+  "main": "./built/index.js",
+  "types": "./built/index.d.ts",
   "scripts": {
     "build": "tsc"
   },
diff --git a/fe_calckey/frontend/magnetar-common/src/be-api.ts b/fe_calckey/frontend/magnetar-common/src/be-api.ts
new file mode 100644
index 0000000..fc0dafc
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/be-api.ts
@@ -0,0 +1,126 @@
+export type Method = "GET" | "POST" | "PUT" | "DELETE" | "PATCH";
+
+export interface BackendApiEndpoint<
+    M extends Method,
+    PP extends string[],
+    T,
+    R
+> {
+    method: M;
+    endpoint: string;
+    pathParams: PP;
+    request?: T;
+    response?: R;
+}
+
+function nestedUrlSearchParams(data: any, topLevel: boolean = true): string {
+    switch (typeof data) {
+        case "string":
+        case "bigint":
+        case "boolean":
+        case "number":
+        case "symbol":
+            if (topLevel) return encodeURIComponent(data.toString()) + "=";
+
+            return data.toString();
+        case "object":
+            if (data === null) return "null";
+
+            if (Array.isArray(data))
+                return data
+                    .map((d) => nestedUrlSearchParams(d, true))
+                    .map(encodeURIComponent)
+                    .join("&");
+
+            const inner = Object.entries(data).map(([k, v]) => [
+                k,
+                nestedUrlSearchParams(v, false),
+            ]);
+
+            return new URLSearchParams(inner).toString();
+
+        default:
+            return "";
+    }
+}
+
+export type MagApiErrorCode = "Client:GenericApiError" | string;
+
+export interface MagApiError {
+    status: number;
+    code: MagApiErrorCode;
+    message: string;
+}
+
+export class MagApiClient {
+    private readonly baseUrl: string;
+
+    constructor(baseUrl: string) {
+        this.baseUrl = baseUrl;
+    }
+
+    async call<
+        T extends BackendApiEndpoint<
+            T["method"] & Method,
+            T["pathParams"] & string[],
+            T["request"],
+            T["response"]
+        >
+    >(
+        { endpoint, method }: T,
+        data: T["request"],
+        pathParams: {
+            [K in keyof T["pathParams"] as T["pathParams"][K] & string]:
+                | string
+                | number;
+        },
+        token?: string | null | undefined
+    ): Promise<T["response"]> {
+        type Response = T["response"];
+
+        const authorizationToken = token ?? undefined;
+        const authorization = authorizationToken
+            ? `Bearer ${authorizationToken}`
+            : undefined;
+
+        for (const name in pathParams) {
+            endpoint = endpoint.replace(`:${name}`, `${pathParams[name]}`);
+        }
+
+        const baseUrl = this.baseUrl.replace(/\/+$/, "");
+        let url = `${baseUrl}${endpoint}`;
+
+        if (method === "GET") {
+            const query = nestedUrlSearchParams(data as any);
+            if (query) {
+                url += `?${query}`;
+            }
+        }
+
+        return await fetch(url, {
+            method,
+            body: method !== "GET" ? JSON.stringify(data) : undefined,
+            credentials: "omit",
+            cache: "no-cache",
+            headers: authorization ? { authorization } : {},
+        })
+            .then(async (res) => {
+                const body = res.status === 204 ? null : await res.json();
+
+                if (res.status === 200) {
+                    return body as Response;
+                } else if (res.status === 204) {
+                    return null as any as Response;
+                } else {
+                    throw body as MagApiError;
+                }
+            })
+            .catch((e) => {
+                throw {
+                    status: -1,
+                    code: "Client:GenericApiError",
+                    message: e,
+                } as MagApiError;
+            });
+    }
+}
diff --git a/fe_calckey/frontend/magnetar-common/src/endpoints.ts b/fe_calckey/frontend/magnetar-common/src/endpoints.ts
new file mode 100644
index 0000000..6528afd
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/endpoints.ts
@@ -0,0 +1,5 @@
+export { GetNoteById } from "./types/endpoints/GetNoteById";
+export { GetTimeline } from "./types/endpoints/GetTimeline";
+export { GetUserById } from "./types/endpoints/GetUserById";
+export { GetUserByAcct } from "./types/endpoints/GetUserByAcct";
+export { GetUserSelf } from "./types/endpoints/GetUserSelf";
diff --git a/fe_calckey/frontend/magnetar-common/src/index.ts b/fe_calckey/frontend/magnetar-common/src/index.ts
new file mode 100644
index 0000000..163b955
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/index.ts
@@ -0,0 +1,28 @@
+import {
+    BackendApiEndpoint,
+    MagApiClient,
+    MagApiError,
+    MagApiErrorCode,
+    Method,
+} from "./be-api";
+
+import {
+    feEndpoints,
+    FrontendApiEndpoint,
+    FrontendApiEndpoints,
+} from "./fe-api";
+
+export * as types from "./types";
+export * as packed from "./packed";
+export * as endpoints from "./endpoints";
+
+export {
+    Method,
+    BackendApiEndpoint,
+    MagApiError,
+    MagApiClient,
+    MagApiErrorCode,
+    feEndpoints,
+    FrontendApiEndpoint,
+    FrontendApiEndpoints,
+};
diff --git a/fe_calckey/frontend/magnetar-common/src/packed.ts b/fe_calckey/frontend/magnetar-common/src/packed.ts
new file mode 100644
index 0000000..f8e2b94
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/packed.ts
@@ -0,0 +1,16 @@
+export { PackDriveFileBase } from "./types/packed/PackDriveFileBase";
+export { PackDriveFileFull } from "./types/packed/PackDriveFileFull";
+export { PackDriveFileWithFolder } from "./types/packed/PackDriveFileWithFolder";
+export { PackDriveFileWithUser } from "./types/packed/PackDriveFileWithUser";
+export { PackDriveFolderBase } from "./types/packed/PackDriveFolderBase";
+export { PackEmojiBase } from "./types/packed/PackEmojiBase";
+export { PackDriveFolderWithParent } from "./types/packed/PackDriveFolderWithParent";
+export { PackNoteBase } from "./types/packed/PackNoteBase";
+export { PackNoteMaybeFull } from "./types/packed/PackNoteMaybeFull";
+export { PackPollBase } from "./types/packed/PackPollBase";
+export { PackNoteMaybeAttachments } from "./types/packed/PackNoteMaybeAttachments";
+export { PackSecurityKeyBase } from "./types/packed/PackSecurityKeyBase";
+export { PackUserBase } from "./types/packed/PackUserBase";
+export { PackUserMaybeAll } from "./types/packed/PackUserMaybeAll";
+export { PackUserSelf } from "./types/packed/PackUserSelf";
+export { PackUserSelfMaybeAll } from "./types/packed/PackUserSelfMaybeAll";
diff --git a/fe_calckey/frontend/magnetar-common/src/types.ts b/fe_calckey/frontend/magnetar-common/src/types.ts
new file mode 100644
index 0000000..462375d
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types.ts
@@ -0,0 +1,40 @@
+export { EmojiContext } from "./types/EmojiContext";
+export { FollowVisibility } from "./types/FollowVisibility";
+export { Id } from "./types/Id";
+export { NotificationSettings } from "./types/NotificationSettings";
+export { EmojiBase } from "./types/EmojiBase";
+export { MmXml } from "./types/MmXml";
+export { NotificationType } from "./types/NotificationType";
+export { NoteBase } from "./types/NoteBase";
+export { NoteAttachmentExt } from "./types/NoteAttachmentExt";
+export { NoteDetailExt } from "./types/NoteDetailExt";
+export { NoteListFilter } from "./types/NoteListFilter";
+export { NoteSelfContextExt } from "./types/NoteSelfContextExt";
+export { NoteVisibility } from "./types/NoteVisibility";
+export { PollBase } from "./types/PollBase";
+export { PollChoice } from "./types/PollChoice";
+export { Reaction } from "./types/Reaction";
+export { ReactionPair } from "./types/ReactionPair";
+export { AvatarDecoration } from "./types/AvatarDecoration";
+export { ProfileField } from "./types/ProfileField";
+export { SecurityKeyBase } from "./types/SecurityKeyBase";
+export { SpeechTransform } from "./types/SpeechTransform";
+export { UserAuthOverviewExt } from "./types/UserAuthOverviewExt";
+export { UserBase } from "./types/UserBase";
+export { UserDetailExt } from "./types/UserDetailExt";
+export { UserProfileExt } from "./types/UserProfileExt";
+export { UserProfilePinsEx } from "./types/UserProfilePinsEx";
+export { UserSecretsExt } from "./types/UserSecretsExt";
+export { UserRelationExt } from "./types/UserRelationExt";
+export { UserSelfExt } from "./types/UserSelfExt";
+export { NoteByIdReq } from "./types/NoteByIdReq";
+export { GetTimelineReq } from "./types/GetTimelineReq";
+export { UserByIdReq } from "./types/UserByIdReq";
+export { UserSelfReq } from "./types/UserSelfReq";
+export { DriveFileBase } from "./types/DriveFileBase";
+export { DriveFileFolderExt } from "./types/DriveFileFolderExt";
+export { DriveFileUserExt } from "./types/DriveFileUserExt";
+export { DriveFolderBase } from "./types/DriveFolderBase";
+export { DriveFolderParentExt } from "./types/DriveFolderParentExt";
+export { ImageMeta } from "./types/ImageMeta";
+export { InstanceTicker } from "./types/InstanceTicker";
diff --git a/fe_calckey/frontend/magnetar-common/src/types/AvatarDecoration.ts b/fe_calckey/frontend/magnetar-common/src/types/AvatarDecoration.ts
new file mode 100644
index 0000000..8121ee6
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/AvatarDecoration.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type AvatarDecoration = "None" | "CatEars";
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/DriveFileBase.ts b/fe_calckey/frontend/magnetar-common/src/types/DriveFileBase.ts
new file mode 100644
index 0000000..906a71e
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/DriveFileBase.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ImageMeta } from "./ImageMeta";
+
+export interface DriveFileBase { name: string, created_at: string, size: number, hash: string | null, mime_type: string, media_metadata: ImageMeta, url: string | null, source_url: string, thumbnail_url: string | null, blurhash: string | null, sensitive: boolean, comment: string | null, folder_id: string | null, user_id: string | null, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/DriveFileFolderExt.ts b/fe_calckey/frontend/magnetar-common/src/types/DriveFileFolderExt.ts
new file mode 100644
index 0000000..0f209f5
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/DriveFileFolderExt.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackDriveFolderBase } from "./packed/PackDriveFolderBase";
+
+export interface DriveFileFolderExt { folder: PackDriveFolderBase, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/DriveFileUserExt.ts b/fe_calckey/frontend/magnetar-common/src/types/DriveFileUserExt.ts
new file mode 100644
index 0000000..c5e96a5
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/DriveFileUserExt.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackUserBase } from "./packed/PackUserBase";
+
+export interface DriveFileUserExt { user: PackUserBase, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/DriveFolderBase.ts b/fe_calckey/frontend/magnetar-common/src/types/DriveFolderBase.ts
new file mode 100644
index 0000000..34bb00c
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/DriveFolderBase.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface DriveFolderBase { name: string, created_at: string, comment: string | null, file_count: number, folder_count: number, parent_id: string | null, user_id: string, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/DriveFolderParentExt.ts b/fe_calckey/frontend/magnetar-common/src/types/DriveFolderParentExt.ts
new file mode 100644
index 0000000..86ef03b
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/DriveFolderParentExt.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { DriveFolderBase } from "./DriveFolderBase";
+
+export interface DriveFolderParentExt { folder: DriveFolderBase, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/EmojiBase.ts b/fe_calckey/frontend/magnetar-common/src/types/EmojiBase.ts
new file mode 100644
index 0000000..b7e2704
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/EmojiBase.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface EmojiBase { shortcode: string, url: string, category: string | null, width: number | null, height: number | null, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/EmojiContext.ts b/fe_calckey/frontend/magnetar-common/src/types/EmojiContext.ts
new file mode 100644
index 0000000..a1ee4b6
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/EmojiContext.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackEmojiBase } from "./packed/PackEmojiBase";
+
+export type EmojiContext = Array<PackEmojiBase>;
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/FollowVisibility.ts b/fe_calckey/frontend/magnetar-common/src/types/FollowVisibility.ts
new file mode 100644
index 0000000..a04d682
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/FollowVisibility.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type FollowVisibility = "Public" | "Followers" | "Private";
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/GetTimelineReq.ts b/fe_calckey/frontend/magnetar-common/src/types/GetTimelineReq.ts
new file mode 100644
index 0000000..00b3b07
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/GetTimelineReq.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { NoteListFilter } from "./NoteListFilter";
+
+export interface GetTimelineReq { limit?: bigint, filter?: NoteListFilter, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/Id.ts b/fe_calckey/frontend/magnetar-common/src/types/Id.ts
new file mode 100644
index 0000000..14270f1
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/Id.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface Id { id: string, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/ImageMeta.ts b/fe_calckey/frontend/magnetar-common/src/types/ImageMeta.ts
new file mode 100644
index 0000000..b3392e1
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/ImageMeta.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface ImageMeta { width: number | null, height: number | null, orientation: number | null, color: string | null, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/InstanceTicker.ts b/fe_calckey/frontend/magnetar-common/src/types/InstanceTicker.ts
new file mode 100644
index 0000000..1da0912
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/InstanceTicker.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface InstanceTicker { name: string | null, software_name: string | null, software_version: string | null, icon_url: string | null, favicon_url: string | null, theme_color: string | null, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/MmXml.ts b/fe_calckey/frontend/magnetar-common/src/types/MmXml.ts
new file mode 100644
index 0000000..2addd37
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/MmXml.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type MmXml = string;
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/NoteAttachmentExt.ts b/fe_calckey/frontend/magnetar-common/src/types/NoteAttachmentExt.ts
new file mode 100644
index 0000000..35efeeb
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/NoteAttachmentExt.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackDriveFileBase } from "./packed/PackDriveFileBase";
+import type { PackPollBase } from "./packed/PackPollBase";
+
+export interface NoteAttachmentExt { poll: PackPollBase | null, attachments: Array<PackDriveFileBase>, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/NoteBase.ts b/fe_calckey/frontend/magnetar-common/src/types/NoteBase.ts
new file mode 100644
index 0000000..e4ed2cf
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/NoteBase.ts
@@ -0,0 +1,8 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { EmojiContext } from "./EmojiContext";
+import type { MmXml } from "./MmXml";
+import type { NoteVisibility } from "./NoteVisibility";
+import type { PackUserBase } from "./packed/PackUserBase";
+import type { ReactionPair } from "./ReactionPair";
+
+export interface NoteBase { created_at: string, updated_at: string | null, cw: string | null, cw_mm: MmXml | null, uri: string | null, url: string | null, text: string, text_mm: MmXml | null, visibility: NoteVisibility, user: PackUserBase, parent_note_id: string | null, renoted_note_id: string | null, reply_count: number, renote_count: number, mentions: Array<string>, visible_user_ids: Array<string> | null, hashtags: Array<string>, reactions: Array<ReactionPair>, local_only: boolean, has_poll: boolean, file_ids: Array<string>, emojis: EmojiContext, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/NoteByIdReq.ts b/fe_calckey/frontend/magnetar-common/src/types/NoteByIdReq.ts
new file mode 100644
index 0000000..89c08ba
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/NoteByIdReq.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface NoteByIdReq { context?: boolean, attachments?: boolean, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/NoteDetailExt.ts b/fe_calckey/frontend/magnetar-common/src/types/NoteDetailExt.ts
new file mode 100644
index 0000000..3482627
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/NoteDetailExt.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackNoteMaybeAttachments } from "./packed/PackNoteMaybeAttachments";
+
+export interface NoteDetailExt { parent_note: PackNoteMaybeAttachments | null, renoted_note: PackNoteMaybeAttachments | null, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/NoteListFilter.ts b/fe_calckey/frontend/magnetar-common/src/types/NoteListFilter.ts
new file mode 100644
index 0000000..7cc828b
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/NoteListFilter.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface NoteListFilter { show_renotes: boolean | null, show_replies: boolean | null, show_files_only: boolean | null, uncwed_sensitive: boolean | null, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/NoteSelfContextExt.ts b/fe_calckey/frontend/magnetar-common/src/types/NoteSelfContextExt.ts
new file mode 100644
index 0000000..0e86d15
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/NoteSelfContextExt.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface NoteSelfContextExt { self_renote_count: number | null, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/NoteVisibility.ts b/fe_calckey/frontend/magnetar-common/src/types/NoteVisibility.ts
new file mode 100644
index 0000000..06ce891
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/NoteVisibility.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type NoteVisibility = "Public" | "Home" | "Followers" | "Direct";
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/NotificationSettings.ts b/fe_calckey/frontend/magnetar-common/src/types/NotificationSettings.ts
new file mode 100644
index 0000000..d7e440c
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/NotificationSettings.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { NotificationType } from "./NotificationType";
+
+export interface NotificationSettings { enabled: Array<NotificationType>, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/NotificationType.ts b/fe_calckey/frontend/magnetar-common/src/types/NotificationType.ts
new file mode 100644
index 0000000..8a53267
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/NotificationType.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type NotificationType = "Follow" | "Mention" | "Reply" | "Renote" | "Quote" | "Reaction" | "PollVote" | "PollEnded" | "FollowRequest" | "FollowRequestAccepted" | "App";
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/PollBase.ts b/fe_calckey/frontend/magnetar-common/src/types/PollBase.ts
new file mode 100644
index 0000000..5547095
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/PollBase.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PollChoice } from "./PollChoice";
+
+export interface PollBase { expires_at: string | null, expired: boolean, multiple_choice: boolean, options: Array<PollChoice>, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/PollChoice.ts b/fe_calckey/frontend/magnetar-common/src/types/PollChoice.ts
new file mode 100644
index 0000000..fa5ec4e
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/PollChoice.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface PollChoice { title: string, votes_count: number, voted: boolean | null, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/ProfileField.ts b/fe_calckey/frontend/magnetar-common/src/types/ProfileField.ts
new file mode 100644
index 0000000..d174e42
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/ProfileField.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { MmXml } from "./MmXml";
+
+export interface ProfileField { name: string, value: string, value_mm: MmXml | null, verified_at: string | null, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/Reaction.ts b/fe_calckey/frontend/magnetar-common/src/types/Reaction.ts
new file mode 100644
index 0000000..f78902e
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/Reaction.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type Reaction = string | { name: string, host: string | null, url: string, } | { raw: string, };
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/ReactionPair.ts b/fe_calckey/frontend/magnetar-common/src/types/ReactionPair.ts
new file mode 100644
index 0000000..3d68510
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/ReactionPair.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Reaction } from "./Reaction";
+
+export type ReactionPair = [Reaction, number] | [Reaction, number, boolean];
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/SecurityKeyBase.ts b/fe_calckey/frontend/magnetar-common/src/types/SecurityKeyBase.ts
new file mode 100644
index 0000000..4c43089
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/SecurityKeyBase.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface SecurityKeyBase { name: string, last_used_at: string | null, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/SpeechTransform.ts b/fe_calckey/frontend/magnetar-common/src/types/SpeechTransform.ts
new file mode 100644
index 0000000..dfd5930
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/SpeechTransform.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type SpeechTransform = "None" | "Cat";
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/UserAuthOverviewExt.ts b/fe_calckey/frontend/magnetar-common/src/types/UserAuthOverviewExt.ts
new file mode 100644
index 0000000..7aa93fa
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/UserAuthOverviewExt.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface UserAuthOverviewExt { has_two_factor_enabled: boolean, has_passwordless_login: boolean, has_security_keys: boolean, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/UserBase.ts b/fe_calckey/frontend/magnetar-common/src/types/UserBase.ts
new file mode 100644
index 0000000..c61ff8a
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/UserBase.ts
@@ -0,0 +1,8 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AvatarDecoration } from "./AvatarDecoration";
+import type { EmojiContext } from "./EmojiContext";
+import type { InstanceTicker } from "./InstanceTicker";
+import type { MmXml } from "./MmXml";
+import type { SpeechTransform } from "./SpeechTransform";
+
+export interface UserBase { acct: string, username: string, display_name: string, display_name_mm: MmXml | null, host: string | null, speech_transform: SpeechTransform, created_at: string, avatar_url: string, avatar_blurhash: string | null, avatar_decoration: AvatarDecoration, is_admin: boolean, is_moderator: boolean, is_bot: boolean, emojis: EmojiContext, instance: InstanceTicker | null, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/UserByIdReq.ts b/fe_calckey/frontend/magnetar-common/src/types/UserByIdReq.ts
new file mode 100644
index 0000000..91ba28b
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/UserByIdReq.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface UserByIdReq { profile?: boolean, pins?: boolean, detail?: boolean, relation?: boolean, auth?: boolean, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/UserDetailExt.ts b/fe_calckey/frontend/magnetar-common/src/types/UserDetailExt.ts
new file mode 100644
index 0000000..adfd2bb
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/UserDetailExt.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface UserDetailExt { last_fetched_at: string | null, uri: string | null, updated_at: string | null, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/UserProfileExt.ts b/fe_calckey/frontend/magnetar-common/src/types/UserProfileExt.ts
new file mode 100644
index 0000000..52080d7
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/UserProfileExt.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { MmXml } from "./MmXml";
+import type { ProfileField } from "./ProfileField";
+
+export interface UserProfileExt { is_locked: boolean, is_silenced: boolean, is_suspended: boolean, description: string | null, description_mm: MmXml | null, location: string | null, birthday: string | null, fields: Array<ProfileField>, follower_count: number | null, following_count: number | null, note_count: number | null, url: string | null, moved_to_uri: string | null, also_known_as: string | null, banner_url: string | null, banner_blurhash: string | null, has_public_reactions: boolean, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/UserProfilePinsEx.ts b/fe_calckey/frontend/magnetar-common/src/types/UserProfilePinsEx.ts
new file mode 100644
index 0000000..18f6842
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/UserProfilePinsEx.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackNoteMaybeFull } from "./packed/PackNoteMaybeFull";
+
+export interface UserProfilePinsEx { pinned_notes: Array<PackNoteMaybeFull>, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/UserRelationExt.ts b/fe_calckey/frontend/magnetar-common/src/types/UserRelationExt.ts
new file mode 100644
index 0000000..4aa3da8
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/UserRelationExt.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface UserRelationExt { follows_you: boolean, you_follow: boolean, you_request_follow: boolean, they_request_follow: boolean, blocks_you: boolean, you_block: boolean, mute: boolean, mute_renotes: boolean, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/UserSecretsExt.ts b/fe_calckey/frontend/magnetar-common/src/types/UserSecretsExt.ts
new file mode 100644
index 0000000..4ba1e2c
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/UserSecretsExt.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackSecurityKeyBase } from "./packed/PackSecurityKeyBase";
+
+export interface UserSecretsExt { email: string | null, email_verified: boolean, security_keys: Array<PackSecurityKeyBase>, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/UserSelfExt.ts b/fe_calckey/frontend/magnetar-common/src/types/UserSelfExt.ts
new file mode 100644
index 0000000..64c179c
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/UserSelfExt.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { NotificationSettings } from "./NotificationSettings";
+
+export interface UserSelfExt { avatar_id: string | null, banner_id: string | null, email_announcements: boolean, always_mark_sensitive: boolean, reject_bot_follow_requests: boolean, reject_crawlers: boolean, reject_ai_training: boolean, has_unread_announcements: boolean, has_unread_antenna: boolean, has_unread_notifications: boolean, has_pending_follow_requests: boolean, word_mutes: Array<string>, instance_mutes: Array<string>, notification_settings: NotificationSettings, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/UserSelfReq.ts b/fe_calckey/frontend/magnetar-common/src/types/UserSelfReq.ts
new file mode 100644
index 0000000..20202e8
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/UserSelfReq.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface UserSelfReq { profile?: boolean, pins?: boolean, detail?: boolean, secrets?: boolean, }
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/endpoints/GetNoteById.ts b/fe_calckey/frontend/magnetar-common/src/types/endpoints/GetNoteById.ts
new file mode 100644
index 0000000..d292e2f
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/endpoints/GetNoteById.ts
@@ -0,0 +1,12 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { NoteByIdReq } from "../NoteByIdReq";
+import type { PackNoteMaybeFull } from "../packed/PackNoteMaybeFull";
+
+export const GetNoteById = {
+    endpoint: "/notes/:id",
+    pathParams: ["id"] as ["id"],
+    method: "GET" as "GET" | "POST" | "PUT" | "DELETE" | "PATCH",
+    request: undefined as unknown as NoteByIdReq,
+    response: undefined as unknown as PackNoteMaybeFull
+}
+                    
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/endpoints/GetTimeline.ts b/fe_calckey/frontend/magnetar-common/src/types/endpoints/GetTimeline.ts
new file mode 100644
index 0000000..d2b6375
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/endpoints/GetTimeline.ts
@@ -0,0 +1,12 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { GetTimelineReq } from "../GetTimelineReq";
+import type { PackNoteMaybeFull } from "../packed/PackNoteMaybeFull";
+
+export const GetTimeline = {
+    endpoint: "/timeline",
+    pathParams: [] as [],
+    method: "GET" as "GET" | "POST" | "PUT" | "DELETE" | "PATCH",
+    request: undefined as unknown as GetTimelineReq,
+    response: undefined as unknown as Array<PackNoteMaybeFull>
+}
+                    
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/endpoints/GetUserByAcct.ts b/fe_calckey/frontend/magnetar-common/src/types/endpoints/GetUserByAcct.ts
new file mode 100644
index 0000000..561116a
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/endpoints/GetUserByAcct.ts
@@ -0,0 +1,12 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackUserMaybeAll } from "../packed/PackUserMaybeAll";
+import type { UserByIdReq } from "../UserByIdReq";
+
+export const GetUserByAcct = {
+    endpoint: "/users/by-acct/:user_id",
+    pathParams: ["user_id"] as ["user_id"],
+    method: "GET" as "GET" | "POST" | "PUT" | "DELETE" | "PATCH",
+    request: undefined as unknown as UserByIdReq,
+    response: undefined as unknown as PackUserMaybeAll
+}
+                    
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/endpoints/GetUserById.ts b/fe_calckey/frontend/magnetar-common/src/types/endpoints/GetUserById.ts
new file mode 100644
index 0000000..fd203be
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/endpoints/GetUserById.ts
@@ -0,0 +1,12 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackUserMaybeAll } from "../packed/PackUserMaybeAll";
+import type { UserByIdReq } from "../UserByIdReq";
+
+export const GetUserById = {
+    endpoint: "/users/:user_id",
+    pathParams: ["user_id"] as ["user_id"],
+    method: "GET" as "GET" | "POST" | "PUT" | "DELETE" | "PATCH",
+    request: undefined as unknown as UserByIdReq,
+    response: undefined as unknown as PackUserMaybeAll
+}
+                    
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/endpoints/GetUserSelf.ts b/fe_calckey/frontend/magnetar-common/src/types/endpoints/GetUserSelf.ts
new file mode 100644
index 0000000..40303ef
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/endpoints/GetUserSelf.ts
@@ -0,0 +1,12 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackUserSelfMaybeAll } from "../packed/PackUserSelfMaybeAll";
+import type { UserSelfReq } from "../UserSelfReq";
+
+export const GetUserSelf = {
+    endpoint: "/users/@self",
+    pathParams: [] as [],
+    method: "GET" as "GET" | "POST" | "PUT" | "DELETE" | "PATCH",
+    request: undefined as unknown as UserSelfReq,
+    response: undefined as unknown as PackUserSelfMaybeAll
+}
+                    
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/packed/PackDriveFileBase.ts b/fe_calckey/frontend/magnetar-common/src/types/packed/PackDriveFileBase.ts
new file mode 100644
index 0000000..187eec5
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/packed/PackDriveFileBase.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { DriveFileBase } from "../DriveFileBase";
+import type { Id } from "../Id";
+
+export type PackDriveFileBase = Id & DriveFileBase;
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/packed/PackDriveFileFull.ts b/fe_calckey/frontend/magnetar-common/src/types/packed/PackDriveFileFull.ts
new file mode 100644
index 0000000..5536c92
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/packed/PackDriveFileFull.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { DriveFileBase } from "../DriveFileBase";
+import type { DriveFileFolderExt } from "../DriveFileFolderExt";
+import type { DriveFileUserExt } from "../DriveFileUserExt";
+import type { Id } from "../Id";
+
+export type PackDriveFileFull = Id & DriveFileBase & DriveFileFolderExt & DriveFileUserExt;
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/packed/PackDriveFileWithFolder.ts b/fe_calckey/frontend/magnetar-common/src/types/packed/PackDriveFileWithFolder.ts
new file mode 100644
index 0000000..c888ebf
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/packed/PackDriveFileWithFolder.ts
@@ -0,0 +1,6 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { DriveFileBase } from "../DriveFileBase";
+import type { DriveFileFolderExt } from "../DriveFileFolderExt";
+import type { Id } from "../Id";
+
+export type PackDriveFileWithFolder = Id & DriveFileBase & DriveFileFolderExt;
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/packed/PackDriveFileWithUser.ts b/fe_calckey/frontend/magnetar-common/src/types/packed/PackDriveFileWithUser.ts
new file mode 100644
index 0000000..65baaab
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/packed/PackDriveFileWithUser.ts
@@ -0,0 +1,6 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { DriveFileBase } from "../DriveFileBase";
+import type { DriveFileUserExt } from "../DriveFileUserExt";
+import type { Id } from "../Id";
+
+export type PackDriveFileWithUser = Id & DriveFileBase & DriveFileUserExt;
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/packed/PackDriveFolderBase.ts b/fe_calckey/frontend/magnetar-common/src/types/packed/PackDriveFolderBase.ts
new file mode 100644
index 0000000..4a9429d
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/packed/PackDriveFolderBase.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { DriveFolderBase } from "../DriveFolderBase";
+import type { Id } from "../Id";
+
+export type PackDriveFolderBase = Id & DriveFolderBase;
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/packed/PackDriveFolderWithParent.ts b/fe_calckey/frontend/magnetar-common/src/types/packed/PackDriveFolderWithParent.ts
new file mode 100644
index 0000000..2b6af70
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/packed/PackDriveFolderWithParent.ts
@@ -0,0 +1,6 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { DriveFolderBase } from "../DriveFolderBase";
+import type { DriveFolderParentExt } from "../DriveFolderParentExt";
+import type { Id } from "../Id";
+
+export type PackDriveFolderWithParent = Id & DriveFolderBase & DriveFolderParentExt;
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/packed/PackEmojiBase.ts b/fe_calckey/frontend/magnetar-common/src/types/packed/PackEmojiBase.ts
new file mode 100644
index 0000000..7ad8c7a
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/packed/PackEmojiBase.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { EmojiBase } from "../EmojiBase";
+import type { Id } from "../Id";
+
+export type PackEmojiBase = Id & EmojiBase;
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/packed/PackNoteBase.ts b/fe_calckey/frontend/magnetar-common/src/types/packed/PackNoteBase.ts
new file mode 100644
index 0000000..2586669
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/packed/PackNoteBase.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Id } from "../Id";
+import type { NoteBase } from "../NoteBase";
+
+export type PackNoteBase = Id & NoteBase;
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/packed/PackNoteMaybeAttachments.ts b/fe_calckey/frontend/magnetar-common/src/types/packed/PackNoteMaybeAttachments.ts
new file mode 100644
index 0000000..1b7f8bf
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/packed/PackNoteMaybeAttachments.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Id } from "../Id";
+import type { NoteAttachmentExt } from "../NoteAttachmentExt";
+import type { NoteBase } from "../NoteBase";
+import type { NoteSelfContextExt } from "../NoteSelfContextExt";
+
+export type PackNoteMaybeAttachments = Id & NoteBase & Partial<NoteSelfContextExt> & Partial<NoteAttachmentExt>;
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/packed/PackNoteMaybeFull.ts b/fe_calckey/frontend/magnetar-common/src/types/packed/PackNoteMaybeFull.ts
new file mode 100644
index 0000000..bb834c7
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/packed/PackNoteMaybeFull.ts
@@ -0,0 +1,8 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Id } from "../Id";
+import type { NoteAttachmentExt } from "../NoteAttachmentExt";
+import type { NoteBase } from "../NoteBase";
+import type { NoteDetailExt } from "../NoteDetailExt";
+import type { NoteSelfContextExt } from "../NoteSelfContextExt";
+
+export type PackNoteMaybeFull = Id & NoteBase & Partial<NoteSelfContextExt> & Partial<NoteAttachmentExt> & Partial<NoteDetailExt>;
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/packed/PackPollBase.ts b/fe_calckey/frontend/magnetar-common/src/types/packed/PackPollBase.ts
new file mode 100644
index 0000000..4a28cf3
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/packed/PackPollBase.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Id } from "../Id";
+import type { PollBase } from "../PollBase";
+
+export type PackPollBase = Id & PollBase;
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/packed/PackSecurityKeyBase.ts b/fe_calckey/frontend/magnetar-common/src/types/packed/PackSecurityKeyBase.ts
new file mode 100644
index 0000000..db208c8
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/packed/PackSecurityKeyBase.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Id } from "../Id";
+import type { SecurityKeyBase } from "../SecurityKeyBase";
+
+export type PackSecurityKeyBase = Id & SecurityKeyBase;
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/packed/PackUserBase.ts b/fe_calckey/frontend/magnetar-common/src/types/packed/PackUserBase.ts
new file mode 100644
index 0000000..d00fac6
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/packed/PackUserBase.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Id } from "../Id";
+import type { UserBase } from "../UserBase";
+
+export type PackUserBase = Id & UserBase;
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/packed/PackUserMaybeAll.ts b/fe_calckey/frontend/magnetar-common/src/types/packed/PackUserMaybeAll.ts
new file mode 100644
index 0000000..7869d9d
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/packed/PackUserMaybeAll.ts
@@ -0,0 +1,10 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Id } from "../Id";
+import type { UserAuthOverviewExt } from "../UserAuthOverviewExt";
+import type { UserBase } from "../UserBase";
+import type { UserDetailExt } from "../UserDetailExt";
+import type { UserProfileExt } from "../UserProfileExt";
+import type { UserProfilePinsEx } from "../UserProfilePinsEx";
+import type { UserRelationExt } from "../UserRelationExt";
+
+export type PackUserMaybeAll = Id & UserBase & Partial<UserProfileExt> & Partial<UserProfilePinsEx> & Partial<UserDetailExt> & Partial<UserRelationExt> & Partial<UserAuthOverviewExt>;
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/packed/PackUserSelf.ts b/fe_calckey/frontend/magnetar-common/src/types/packed/PackUserSelf.ts
new file mode 100644
index 0000000..477f13e
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/packed/PackUserSelf.ts
@@ -0,0 +1,6 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Id } from "../Id";
+import type { UserBase } from "../UserBase";
+import type { UserSelfExt } from "../UserSelfExt";
+
+export type PackUserSelf = Id & UserBase & UserSelfExt;
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/src/types/packed/PackUserSelfMaybeAll.ts b/fe_calckey/frontend/magnetar-common/src/types/packed/PackUserSelfMaybeAll.ts
new file mode 100644
index 0000000..0b4169b
--- /dev/null
+++ b/fe_calckey/frontend/magnetar-common/src/types/packed/PackUserSelfMaybeAll.ts
@@ -0,0 +1,9 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Id } from "../Id";
+import type { UserBase } from "../UserBase";
+import type { UserDetailExt } from "../UserDetailExt";
+import type { UserProfileExt } from "../UserProfileExt";
+import type { UserProfilePinsEx } from "../UserProfilePinsEx";
+import type { UserSecretsExt } from "../UserSecretsExt";
+
+export type PackUserSelfMaybeAll = Id & UserBase & Partial<UserProfileExt> & Partial<UserProfilePinsEx> & Partial<UserDetailExt> & Partial<UserSecretsExt>;
\ No newline at end of file
diff --git a/fe_calckey/frontend/magnetar-common/tsconfig.json b/fe_calckey/frontend/magnetar-common/tsconfig.json
index 47f57ab..c6908e1 100644
--- a/fe_calckey/frontend/magnetar-common/tsconfig.json
+++ b/fe_calckey/frontend/magnetar-common/tsconfig.json
@@ -19,4 +19,4 @@
     "node_modules",
     "built",
   ]
-}
\ No newline at end of file
+}
diff --git a/fe_calckey/frontend/package.json b/fe_calckey/frontend/package.json
index b5d873b..075d5be 100644
--- a/fe_calckey/frontend/package.json
+++ b/fe_calckey/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey-magnetar",
-	"version": "0.2.1-alpha",
+	"version": "0.3.0-alpha",
 	"codename": "aglais",
 	"repository": {
 		"type": "git",
@@ -9,8 +9,9 @@
 	"packageManager": "pnpm@8.6.3",
 	"private": true,
 	"scripts": {
-		"rebuild": "pnpm run clean && pnpm -r run build && pnpm run gulp",
-		"build": "pnpm -r run build && pnpm run gulp",
+		"magnetar-types": "pnpm node ./scripts/magnetar-types.js",
+		"rebuild": "pnpm run clean && pnpm run magnetar-types && pnpm -r run build && pnpm run gulp",
+		"build": "pnpm run magnetar-types && pnpm -r run build && pnpm run gulp",
 		"gulp": "gulp build",
 		"dev:staging": "NODE_OPTIONS=--max_old_space_size=3072 NODE_ENV=development pnpm run build && pnpm run start",
 		"lint": "pnpm -r run lint",
@@ -25,7 +26,6 @@
 	"dependencies": {
 		"@bull-board/api": "5.2.0",
 		"@bull-board/ui": "5.2.0",
-		"@napi-rs/cli": "^2.16.1",
 		"js-yaml": "4.1.0",
 		"seedrandom": "^3.0.5"
 	},
diff --git a/fe_calckey/frontend/pnpm-lock.yaml b/fe_calckey/frontend/pnpm-lock.yaml
index a8852f4..f892ecb 100644
--- a/fe_calckey/frontend/pnpm-lock.yaml
+++ b/fe_calckey/frontend/pnpm-lock.yaml
@@ -17,9 +17,6 @@ importers:
       '@bull-board/ui':
         specifier: 5.2.0
         version: 5.2.0
-      '@napi-rs/cli':
-        specifier: ^2.16.1
-        version: 2.16.1
       js-yaml:
         specifier: 4.1.0
         version: 4.1.0
@@ -96,11 +93,11 @@ importers:
         specifier: ^1.3.62
         version: 1.3.62
       '@types/node':
-        specifier: 20.3.1
-        version: 20.3.1
+        specifier: 20.8.10
+        version: 20.8.10
       ts-node:
         specifier: 10.4.0
-        version: 10.4.0(@swc/core@1.3.62)(@types/node@20.3.1)(typescript@5.1.3)
+        version: 10.4.0(@swc/core@1.3.62)(@types/node@20.8.10)(typescript@5.1.3)
       tsd:
         specifier: ^0.28.1
         version: 0.28.1
@@ -181,7 +178,7 @@ importers:
         version: 4.19.1
       browser-image-resizer:
         specifier: github:misskey-dev/browser-image-resizer
-        version: github.com/misskey-dev/browser-image-resizer/56f504427ad7f6500e141a6d9f3aee42023d7f3e
+        version: github.com/misskey-dev/browser-image-resizer/5a70660c2ac8aad3d436bfa67a5e7f7c8946cac4
       calckey-js:
         specifier: workspace:*
         version: link:../calckey-js
@@ -220,7 +217,7 @@ importers:
         version: 2.30.0
       emojilib:
         specifier: github:thatonecalculator/emojilib
-        version: github.com/thatonecalculator/emojilib/d3c8c6a77d4362b3b3180099f1d2eac344ce245c
+        version: github.com/thatonecalculator/emojilib/b962bd997e8c600b0b020ff0dd78ae1000a1f0c8
       escape-regexp:
         specifier: 0.0.1
         version: 0.0.1
@@ -577,8 +574,8 @@ packages:
       '@cspotcode/source-map-consumer': 0.8.0
     dev: true
 
-  /@cypress/request@2.88.11:
-    resolution: {integrity: sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==}
+  /@cypress/request@2.88.12:
+    resolution: {integrity: sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==}
     engines: {node: '>= 6'}
     dependencies:
       aws-sign2: 0.7.0
@@ -596,7 +593,7 @@ packages:
       performance-now: 2.1.0
       qs: 6.10.4
       safe-buffer: 5.2.1
-      tough-cookie: 2.5.0
+      tough-cookie: 4.1.3
       tunnel-agent: 0.6.0
       uuid: 8.3.2
     dev: true
@@ -853,6 +850,11 @@ packages:
     engines: {node: '>=6.0.0'}
     dev: true
 
+  /@jridgewell/resolve-uri@3.1.1:
+    resolution: {integrity: sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==}
+    engines: {node: '>=6.0.0'}
+    dev: true
+
   /@jridgewell/set-array@1.1.2:
     resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==}
     engines: {node: '>=6.0.0'}
@@ -865,6 +867,13 @@ packages:
       '@jridgewell/trace-mapping': 0.3.18
     dev: true
 
+  /@jridgewell/source-map@0.3.5:
+    resolution: {integrity: sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==}
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.3
+      '@jridgewell/trace-mapping': 0.3.20
+    dev: true
+
   /@jridgewell/sourcemap-codec@1.4.14:
     resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==}
     dev: true
@@ -880,6 +889,13 @@ packages:
       '@jridgewell/sourcemap-codec': 1.4.14
     dev: true
 
+  /@jridgewell/trace-mapping@0.3.20:
+    resolution: {integrity: sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==}
+    dependencies:
+      '@jridgewell/resolve-uri': 3.1.1
+      '@jridgewell/sourcemap-codec': 1.4.15
+    dev: true
+
   /@kurkle/color@0.3.2:
     resolution: {integrity: sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==}
     dev: true
@@ -898,12 +914,6 @@ packages:
       os-filter-obj: 2.0.0
     dev: true
 
-  /@napi-rs/cli@2.16.1:
-    resolution: {integrity: sha512-L0Gr5iEQIDEbvWdDr1HUaBOxBSHL1VZhWSk1oryawoT8qJIY+KGfLFelU+Qma64ivCPbxYpkfPoKYVG3rcoGIA==}
-    engines: {node: '>= 10'}
-    hasBin: true
-    dev: false
-
   /@nodelib/fs.scandir@2.1.5:
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
     engines: {node: '>= 8'}
@@ -1180,7 +1190,7 @@ packages:
     dependencies:
       '@types/http-cache-semantics': 4.0.1
       '@types/keyv': 3.1.4
-      '@types/node': 20.3.1
+      '@types/node': 20.8.10
       '@types/responselike': 1.0.0
     dev: true
 
@@ -1224,38 +1234,46 @@ packages:
   /@types/glob-stream@8.0.0:
     resolution: {integrity: sha512-fxTWwdQmX9LWSHD7ZLlv3BHR992mKcVcDnT/2v+l/QZZo7TfDdyasqlSYVzOnMGWhRbrWeWkbj/mgezFjKynhw==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 20.8.10
       '@types/picomatch': 2.3.0
       '@types/streamx': 2.9.1
     dev: true
 
+  /@types/glob-stream@8.0.1:
+    resolution: {integrity: sha512-sR8FnsG9sEkjKasMSYbRmzaSVYmY76ui0t+T+9BE2Wr/ansAKfNsu+xT0JvZL+7DDQDO/MPTg6g8hfNdhYWT2g==}
+    dependencies:
+      '@types/node': 20.8.10
+      '@types/picomatch': 2.3.2
+      '@types/streamx': 2.9.3
+    dev: true
+
   /@types/glob@8.1.0:
     resolution: {integrity: sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==}
     dependencies:
       '@types/minimatch': 5.1.2
-      '@types/node': 20.3.1
+      '@types/node': 20.8.10
     dev: true
 
   /@types/gulp-rename@2.0.1:
     resolution: {integrity: sha512-9ZjeS2RHEnmBmTcyi2+oeye3BgCsWhvi4uv3qCnAg8i6plOuRdaeNxjOves0ELysEXYLBl7bCl5fbVs7AZtgTA==}
     dependencies:
-      '@types/node': 20.3.1
-      '@types/vinyl': 2.0.7
+      '@types/node': 20.8.10
+      '@types/vinyl': 2.0.9
     dev: true
 
   /@types/gulp-rename@2.0.2:
     resolution: {integrity: sha512-CQsXqTVtAXqrPd4IbrrlJEEzRkUR3RXsyZbrVoOVqjlchDDmnyRDatAUisjpQjjCg/wjJrSiNg8T1uAbJ/7Qqg==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 20.8.10
       '@types/vinyl': 2.0.7
     dev: true
 
   /@types/gulp@4.0.10:
     resolution: {integrity: sha512-spgZHJFqiEJGwqGlf7T/k4nkBpBcLgP7T0EfN6G2vvnhUfvd4uO1h8RwpXOE8x/54DVYUs1XCAtBHkX/R3axAQ==}
     dependencies:
-      '@types/undertaker': 1.2.8
-      '@types/vinyl-fs': 3.0.2
-      chokidar: 3.3.1
+      '@types/undertaker': 1.2.10
+      '@types/vinyl-fs': 3.0.4
+      chokidar: 3.5.3
     dev: true
 
   /@types/gulp@4.0.11:
@@ -1281,7 +1299,7 @@ packages:
   /@types/keyv@3.1.4:
     resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 20.8.10
     dev: true
 
   /@types/matter-js@0.18.2:
@@ -1296,12 +1314,14 @@ packages:
     resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==}
     dev: true
 
-  /@types/node@14.18.51:
-    resolution: {integrity: sha512-P9bsdGFPpVtofEKlhWMVS2qqx1A/rt9QBfihWlklfHHpUpjtYse5AzFz6j4DWrARLYh6gRnw9+5+DJcrq3KvBA==}
+  /@types/node@14.18.63:
+    resolution: {integrity: sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==}
     dev: true
 
-  /@types/node@20.3.1:
-    resolution: {integrity: sha512-EhcH/wvidPy1WeML3TtYFGR83UzjxeWRen9V402T8aUGYsCHOmfoisV3ZSg03gAFIbLq8TnWOJ0f4cALtnSEUg==}
+  /@types/node@20.8.10:
+    resolution: {integrity: sha512-TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w==}
+    dependencies:
+      undici-types: 5.26.5
     dev: true
 
   /@types/normalize-package-data@2.4.1:
@@ -1312,6 +1332,10 @@ packages:
     resolution: {integrity: sha512-O397rnSS9iQI4OirieAtsDqvCj4+3eY1J+EPdNTKuHuRWIfUoGyzX294o8C4KJYaLqgSrd2o60c5EqCU8Zv02g==}
     dev: true
 
+  /@types/picomatch@2.3.2:
+    resolution: {integrity: sha512-I+BytjxOlNYA285zP/3dVCRcE+OAvgHQZQt26MP7T7JbZ9DM/3W2WfViU1XuLypCzAx8PTC+MlYO3WLqjTyZ3g==}
+    dev: true
+
   /@types/punycode@2.1.0:
     resolution: {integrity: sha512-PG5aLpW6PJOeV2fHRslP4IOMWn+G+Uq8CfnyJ+PDS8ndCbU+soO+fB3NKCKo0p/Jh2Y4aPaiQZsrOXFdzpcA6g==}
     dev: true
@@ -1319,7 +1343,7 @@ packages:
   /@types/responselike@1.0.0:
     resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 20.8.10
     dev: true
 
   /@types/seedrandom@3.0.5:
@@ -1330,14 +1354,20 @@ packages:
     resolution: {integrity: sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==}
     dev: true
 
-  /@types/sizzle@2.3.3:
-    resolution: {integrity: sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==}
+  /@types/sizzle@2.3.5:
+    resolution: {integrity: sha512-tAe4Q+OLFOA/AMD+0lq8ovp8t3ysxAOeaScnfNdZpUxaGl51ZMDEITxkvFl1STudQ58mz6gzVGl9VhMKhwRnZQ==}
     dev: true
 
   /@types/streamx@2.9.1:
     resolution: {integrity: sha512-9bywzhouyedmci7WCIPFwJ8zASDnxt2gaVUy52X0p0Tt085IJSAEP0L6j4SSNeDMSLzpYu6cPz0GrJZ7kPJ6Bg==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 20.8.10
+    dev: true
+
+  /@types/streamx@2.9.3:
+    resolution: {integrity: sha512-D2eONMpz0JX15eA4pxylNVzq4kyqRRGqsMIxIjbfjDGaHMaoCvgFWn2+EkrL8/gODCvbNcPIVp7Eecr/+PX61g==}
+    dependencies:
+      '@types/node': 20.8.10
     dev: true
 
   /@types/throttle-debounce@5.0.0:
@@ -1352,10 +1382,22 @@ packages:
     resolution: {integrity: sha512-Z4TYuEKn9+RbNVk1Ll2SS4x1JeLHecolIbM/a8gveaHsW0Hr+RQMraZACwTO2VD7JvepgA6UO1A1VrbktQrIbQ==}
     dev: true
 
+  /@types/undertaker-registry@1.0.3:
+    resolution: {integrity: sha512-9wabQxkMB6Nb6FuPxvLQiMLBT2KkJXxgC9RoehnSSCvVzrag5GKxI5pekcgnMcZaGupuJOd0CLT+8ZwHHlG5vQ==}
+    dev: true
+
+  /@types/undertaker@1.2.10:
+    resolution: {integrity: sha512-UzbgxdP5Zn0UlaLGF8CxXGpP7MCu/Y/b/24Kj3dK0J3+xOSmAGJw4JJKi21avFNuUviG59BMBUdrcL+KX+z7BA==}
+    dependencies:
+      '@types/node': 20.8.10
+      '@types/undertaker-registry': 1.0.3
+      async-done: 1.3.2
+    dev: true
+
   /@types/undertaker@1.2.8:
     resolution: {integrity: sha512-gW3PRqCHYpo45XFQHJBhch7L6hytPsIe0QeLujlnFsjHPnXLhJcPdN6a9368d7aIQgH2I/dUTPFBlGeSNA3qOg==}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 20.8.10
       '@types/undertaker-registry': 1.0.1
       async-done: 1.3.2
     dev: true
@@ -1368,22 +1410,37 @@ packages:
     resolution: {integrity: sha512-ctNcmmzbMIKooXjRkyyUCOu2Z4AyqibL+RhXoF3pb7K7j+ezItnakmpm31LymkYHSIM5ey0tjIFzTvFOTSBCGw==}
     dependencies:
       '@types/glob-stream': 8.0.0
-      '@types/node': 20.3.1
+      '@types/node': 20.8.10
       '@types/vinyl': 2.0.7
     dev: true
 
+  /@types/vinyl-fs@3.0.4:
+    resolution: {integrity: sha512-UIdM4bMUcWky41J0glmBx4WnCiF48J7Q2S0LJ8heFmZiB7vHeLOHoLx1ABxu4lY6eD2FswVp47cSIc1GFFJkbw==}
+    dependencies:
+      '@types/glob-stream': 8.0.1
+      '@types/node': 20.8.10
+      '@types/vinyl': 2.0.9
+    dev: true
+
   /@types/vinyl@2.0.7:
     resolution: {integrity: sha512-4UqPv+2567NhMQuMLdKAyK4yzrfCqwaTt6bLhHEs8PFcxbHILsrxaY63n4wgE/BRLDWDQeI+WcTmkXKExh9hQg==}
     dependencies:
       '@types/expect': 1.20.4
-      '@types/node': 20.3.1
+      '@types/node': 20.8.10
     dev: true
 
-  /@types/yauzl@2.10.0:
-    resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==}
+  /@types/vinyl@2.0.9:
+    resolution: {integrity: sha512-KCr4aTEUkzSF89qw09e2oxsC/RXXT3K5ZPv4gvj3XTiWVrxNoi7WrqNTahNE/Hul5C9z3B8w+yWNTQgua12oag==}
+    dependencies:
+      '@types/expect': 1.20.4
+      '@types/node': 20.8.10
+    dev: true
+
+  /@types/yauzl@2.10.2:
+    resolution: {integrity: sha512-Km7XAtUIduROw7QPgvcft0lIupeG8a8rdKL8RiSyKvlE7dYY31fEn41HVuQsRFDuROA8tA4K2UVL+WdfFmErBA==}
     requiresBuild: true
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 20.8.10
     dev: true
     optional: true
 
@@ -1653,6 +1710,12 @@ packages:
     engines: {node: '>=0.4.0'}
     dev: true
 
+  /acorn@8.11.2:
+    resolution: {integrity: sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+    dev: true
+
   /acorn@8.8.2:
     resolution: {integrity: sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==}
     engines: {node: '>=0.4.0'}
@@ -1947,7 +2010,7 @@ packages:
     resolution: {integrity: sha512-WKExI/eSGgGAkWAO+wMVdFObZV7hQen54UpD1kCCTN3tvlL3W1jL4+lPP/M7MwoP7Q4RHzKtO3JQ4HxYEcd+xQ==}
     dependencies:
       browserslist: 1.7.7
-      caniuse-db: 1.0.30001502
+      caniuse-db: 1.0.30001561
       normalize-range: 0.1.2
       num2fraction: 1.2.2
       postcss: 5.2.18
@@ -2114,8 +2177,8 @@ packages:
     deprecated: Browserslist 2 could fail on reading Browserslist >3.0 config used in other tools.
     hasBin: true
     dependencies:
-      caniuse-db: 1.0.30001502
-      electron-to-chromium: 1.4.430
+      caniuse-db: 1.0.30001561
+      electron-to-chromium: 1.4.576
     dev: true
 
   /browserslist@4.21.9:
@@ -2182,8 +2245,8 @@ packages:
       responselike: 2.0.1
     dev: true
 
-  /cachedir@2.3.0:
-    resolution: {integrity: sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==}
+  /cachedir@2.4.0:
+    resolution: {integrity: sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==}
     engines: {node: '>=6'}
     dev: true
 
@@ -2194,6 +2257,14 @@ packages:
       get-intrinsic: 1.2.1
     dev: true
 
+  /call-bind@1.0.5:
+    resolution: {integrity: sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==}
+    dependencies:
+      function-bind: 1.1.2
+      get-intrinsic: 1.2.2
+      set-function-length: 1.1.1
+    dev: true
+
   /camelcase-keys@6.2.2:
     resolution: {integrity: sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==}
     engines: {node: '>=8'}
@@ -2217,13 +2288,13 @@ packages:
     resolution: {integrity: sha512-SBTl70K0PkDUIebbkXrxWqZlHNs0wRgRD6QZ8guctShjbh63gEPfF+Wj0Yw+75f5Y8tSzqAI/NcisYv/cCah2Q==}
     dependencies:
       browserslist: 1.7.7
-      caniuse-db: 1.0.30001502
+      caniuse-db: 1.0.30001561
       lodash.memoize: 4.1.2
       lodash.uniq: 4.5.0
     dev: true
 
-  /caniuse-db@1.0.30001502:
-    resolution: {integrity: sha512-nNj61ClInBeMsDqHo20wgMJ40Jhyg9l6W0Z9tipmsc99g43TGvlJky4LP3TlrXbLrVCzRWVS4Gox606M6Hw9Ow==}
+  /caniuse-db@1.0.30001561:
+    resolution: {integrity: sha512-lrMBU9QyHu5Rg24Eu5bILWA6fvm/IxFy4z2lYc8Nnidkmr0io4Pi/UMqDEBU/3LPBao/UaKk4URwJP9Nww9lpQ==}
     dev: true
 
   /caniuse-lite@1.0.30001513:
@@ -2341,6 +2412,21 @@ packages:
       fsevents: 2.1.3
     dev: true
 
+  /chokidar@3.5.3:
+    resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==}
+    engines: {node: '>= 8.10.0'}
+    dependencies:
+      anymatch: 3.1.3
+      braces: 3.0.2
+      glob-parent: 5.1.2
+      is-binary-path: 2.1.0
+      is-glob: 4.0.3
+      normalize-path: 3.0.0
+      readdirp: 3.6.0
+    optionalDependencies:
+      fsevents: 2.3.3
+    dev: true
+
   /chrome-trace-event@1.0.3:
     resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==}
     engines: {node: '>=6.0'}
@@ -2531,7 +2617,7 @@ packages:
     dependencies:
       color: 0.11.4
       css-color-names: 0.0.4
-      has: 1.0.3
+      has: 1.0.4
     dev: true
 
   /colors@1.1.2:
@@ -2625,8 +2711,8 @@ packages:
       is-plain-object: 5.0.0
     dev: true
 
-  /core-js@3.31.1:
-    resolution: {integrity: sha512-2sKLtfq1eFST7l7v62zaqXacPc7uG8ZAya8ogijLhTtaKNcpzpB4TMoTw2Si+8GYKRwFPMMtUT0263QFWFfqyQ==}
+  /core-js@3.33.2:
+    resolution: {integrity: sha512-XeBzWI6QL3nJQiHmdzbAOiMYqjrb7hwU7A39Qhvd/POSa/t9E1AeZyEZx3fNvp/vtM8zXwhoL0FsiS0hD0pruQ==}
     requiresBuild: true
     dev: true
 
@@ -2688,7 +2774,7 @@ packages:
       autoprefixer: 6.7.7
       decamelize: 1.2.0
       defined: 1.0.1
-      has: 1.0.3
+      has: 1.0.4
       object-assign: 4.1.1
       postcss: 5.2.18
       postcss-calc: 5.3.1
@@ -2742,25 +2828,25 @@ packages:
     hasBin: true
     requiresBuild: true
     dependencies:
-      '@cypress/request': 2.88.11
+      '@cypress/request': 2.88.12
       '@cypress/xvfb': 1.2.4(supports-color@8.1.1)
-      '@types/node': 14.18.51
+      '@types/node': 14.18.63
       '@types/sinonjs__fake-timers': 8.1.1
-      '@types/sizzle': 2.3.3
+      '@types/sizzle': 2.3.5
       arch: 2.2.0
       blob-util: 2.0.2
       bluebird: 3.7.2
       buffer: 5.7.1
-      cachedir: 2.3.0
+      cachedir: 2.4.0
       chalk: 4.1.2
       check-more-types: 2.24.0
       cli-cursor: 3.1.0
       cli-table3: 0.6.3
       commander: 5.1.0
       common-tags: 1.8.2
-      dayjs: 1.11.8
+      dayjs: 1.11.10
       debug: 4.3.4(supports-color@8.1.1)
-      enquirer: 2.3.6
+      enquirer: 2.4.1
       eventemitter2: 6.4.7
       execa: 4.1.0
       executable: 4.1.1
@@ -2771,7 +2857,7 @@ packages:
       is-ci: 3.0.1
       is-installed-globally: 0.4.0
       lazy-ass: 1.6.0
-      listr2: 3.14.0(enquirer@2.3.6)
+      listr2: 3.14.0(enquirer@2.4.1)
       lodash: 4.17.21
       log-symbols: 4.1.0
       minimist: 1.2.8
@@ -2779,7 +2865,7 @@ packages:
       pretty-bytes: 5.6.0
       proxy-from-env: 1.0.0
       request-progress: 3.0.0
-      semver: 7.3.8
+      semver: 7.5.4
       supports-color: 8.1.1
       tmp: 0.2.1
       untildify: 4.0.0
@@ -2807,8 +2893,8 @@ packages:
       '@babel/runtime': 7.22.6
     dev: true
 
-  /dayjs@1.11.8:
-    resolution: {integrity: sha512-LcgxzFoWMEPO7ggRv1Y2N31hUf2R0Vj7fuy/m+Bg1K8rr+KAs1AEy4y9jd5DXe8pbHgX+srkHNS7TH6Q6ZhYeQ==}
+  /dayjs@1.11.10:
+    resolution: {integrity: sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==}
     dev: true
 
   /debug@2.6.9:
@@ -2889,11 +2975,21 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /define-properties@1.2.0:
-    resolution: {integrity: sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==}
+  /define-data-property@1.1.1:
+    resolution: {integrity: sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==}
     engines: {node: '>= 0.4'}
     dependencies:
-      has-property-descriptors: 1.0.0
+      get-intrinsic: 1.2.2
+      gopd: 1.0.1
+      has-property-descriptors: 1.0.1
+    dev: true
+
+  /define-properties@1.2.1:
+    resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      define-data-property: 1.1.1
+      has-property-descriptors: 1.0.1
       object-keys: 1.1.1
     dev: true
 
@@ -2901,21 +2997,21 @@ packages:
     resolution: {integrity: sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      is-descriptor: 0.1.6
+      is-descriptor: 0.1.7
     dev: true
 
   /define-property@1.0.0:
     resolution: {integrity: sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      is-descriptor: 1.0.2
+      is-descriptor: 1.0.3
     dev: true
 
   /define-property@2.0.2:
     resolution: {integrity: sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      is-descriptor: 1.0.2
+      is-descriptor: 1.0.3
       isobject: 3.0.1
     dev: true
 
@@ -2977,14 +3073,14 @@ packages:
       safer-buffer: 2.1.2
     dev: true
 
-  /electron-to-chromium@1.4.430:
-    resolution: {integrity: sha512-FytjTbGwz///F+ToZ5XSeXbbSaXalsVRXsz2mHityI5gfxft7ieW3HqFLkU5V1aIrY42aflICqbmFoDxW10etg==}
-    dev: true
-
   /electron-to-chromium@1.4.453:
     resolution: {integrity: sha512-BU8UtQz6CB3T7RIGhId4BjmjJVXQDujb0+amGL8jpcluFJr6lwspBOvkUbnttfpZCm4zFMHmjrX1QrdPWBBMjQ==}
     dev: true
 
+  /electron-to-chromium@1.4.576:
+    resolution: {integrity: sha512-yXsZyXJfAqzWk1WKryr0Wl0MN2D47xodPvEEwlVePBnhU5E7raevLQR+E6b9JAD3GfL/7MbAL9ZtWQQPcLx7wA==}
+    dev: true
+
   /emoji-regex@8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
     dev: true
@@ -3003,11 +3099,12 @@ packages:
       tapable: 2.2.1
     dev: true
 
-  /enquirer@2.3.6:
-    resolution: {integrity: sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==}
+  /enquirer@2.4.1:
+    resolution: {integrity: sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==}
     engines: {node: '>=8.6'}
     dependencies:
       ansi-colors: 4.1.3
+      strip-ansi: 6.0.1
     dev: true
 
   /envinfo@7.10.0:
@@ -3333,7 +3430,7 @@ packages:
       get-stream: 5.2.0
       yauzl: 2.10.0
     optionalDependencies:
-      '@types/yauzl': 2.10.0
+      '@types/yauzl': 2.10.2
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -3604,7 +3701,7 @@ packages:
       at-least-node: 1.0.0
       graceful-fs: 4.2.11
       jsonfile: 6.1.0
-      universalify: 2.0.0
+      universalify: 2.0.1
     dev: true
 
   /fs-mkdirp-stream@1.0.0:
@@ -3628,8 +3725,8 @@ packages:
     dev: true
     optional: true
 
-  /fsevents@2.3.2:
-    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
+  /fsevents@2.3.3:
+    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
     requiresBuild: true
@@ -3645,6 +3742,10 @@ packages:
     resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
     dev: true
 
+  /function-bind@1.1.2:
+    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
+    dev: true
+
   /get-caller-file@1.0.3:
     resolution: {integrity: sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==}
     dev: true
@@ -3658,6 +3759,15 @@ packages:
       has-symbols: 1.0.3
     dev: true
 
+  /get-intrinsic@1.2.2:
+    resolution: {integrity: sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==}
+    dependencies:
+      function-bind: 1.1.2
+      has-proto: 1.0.1
+      has-symbols: 1.0.3
+      hasown: 2.0.0
+    dev: true
+
   /get-stream@3.0.0:
     resolution: {integrity: sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==}
     engines: {node: '>=4'}
@@ -3732,7 +3842,7 @@ packages:
     dependencies:
       anymatch: 2.0.0
       async-done: 1.3.2
-      chokidar: 3.3.1
+      chokidar: 3.5.3
       is-negated-glob: 1.0.0
       just-debounce: 1.1.0
       normalize-path: 3.0.0
@@ -3798,6 +3908,12 @@ packages:
       sparkles: 1.0.1
     dev: true
 
+  /gopd@1.0.1:
+    resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
+    dependencies:
+      get-intrinsic: 1.2.2
+    dev: true
+
   /got@11.8.6:
     resolution: {integrity: sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==}
     engines: {node: '>=10.19.0'}
@@ -3869,8 +3985,8 @@ packages:
     resolution: {integrity: sha512-SVSF7ikuWKhpAW4l4wapAqPPSToJoiNKsbDoUnRrSgwZHH7lH8pbPeQj1aOVYQrbZKhfSVBxVW+Py7vtulRktw==}
     engines: {node: '>=10'}
     dependencies:
-      '@types/node': 20.3.1
-      '@types/vinyl': 2.0.7
+      '@types/node': 20.8.10
+      '@types/vinyl': 2.0.9
       istextorbinary: 3.3.0
       replacestream: 4.0.3
       yargs-parser: 21.1.1
@@ -3881,7 +3997,7 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       plugin-error: 1.0.1
-      terser: 5.18.0
+      terser: 5.24.0
       through2: 4.0.2
       vinyl-sourcemaps-apply: 0.2.1
     dev: true
@@ -3938,10 +4054,10 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /has-property-descriptors@1.0.0:
-    resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==}
+  /has-property-descriptors@1.0.1:
+    resolution: {integrity: sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==}
     dependencies:
-      get-intrinsic: 1.2.1
+      get-intrinsic: 1.2.2
     dev: true
 
   /has-proto@1.0.1:
@@ -3992,6 +4108,18 @@ packages:
       function-bind: 1.1.1
     dev: true
 
+  /has@1.0.4:
+    resolution: {integrity: sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==}
+    engines: {node: '>= 0.4.0'}
+    dev: true
+
+  /hasown@2.0.0:
+    resolution: {integrity: sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      function-bind: 1.1.2
+    dev: true
+
   /homedir-polyfill@1.0.3:
     resolution: {integrity: sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==}
     engines: {node: '>=0.10.0'}
@@ -4144,18 +4272,11 @@ packages:
       is-windows: 1.0.2
     dev: true
 
-  /is-accessor-descriptor@0.1.6:
-    resolution: {integrity: sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==}
-    engines: {node: '>=0.10.0'}
+  /is-accessor-descriptor@1.0.1:
+    resolution: {integrity: sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==}
+    engines: {node: '>= 0.10'}
     dependencies:
-      kind-of: 3.2.2
-    dev: true
-
-  /is-accessor-descriptor@1.0.0:
-    resolution: {integrity: sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      kind-of: 6.0.3
+      hasown: 2.0.0
     dev: true
 
   /is-arrayish@0.2.1:
@@ -4186,36 +4307,33 @@ packages:
       has: 1.0.3
     dev: true
 
-  /is-data-descriptor@0.1.4:
-    resolution: {integrity: sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==}
-    engines: {node: '>=0.10.0'}
+  /is-core-module@2.13.1:
+    resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==}
     dependencies:
-      kind-of: 3.2.2
+      hasown: 2.0.0
     dev: true
 
-  /is-data-descriptor@1.0.0:
-    resolution: {integrity: sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==}
-    engines: {node: '>=0.10.0'}
+  /is-data-descriptor@1.0.1:
+    resolution: {integrity: sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      kind-of: 6.0.3
+      hasown: 2.0.0
     dev: true
 
-  /is-descriptor@0.1.6:
-    resolution: {integrity: sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==}
-    engines: {node: '>=0.10.0'}
+  /is-descriptor@0.1.7:
+    resolution: {integrity: sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      is-accessor-descriptor: 0.1.6
-      is-data-descriptor: 0.1.4
-      kind-of: 5.1.0
+      is-accessor-descriptor: 1.0.1
+      is-data-descriptor: 1.0.1
     dev: true
 
-  /is-descriptor@1.0.2:
-    resolution: {integrity: sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==}
-    engines: {node: '>=0.10.0'}
+  /is-descriptor@1.0.3:
+    resolution: {integrity: sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      is-accessor-descriptor: 1.0.0
-      is-data-descriptor: 1.0.0
-      kind-of: 6.0.3
+      is-accessor-descriptor: 1.0.1
+      is-data-descriptor: 1.0.1
     dev: true
 
   /is-extendable@0.1.1:
@@ -4418,7 +4536,7 @@ packages:
     resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
     engines: {node: '>= 10.13.0'}
     dependencies:
-      '@types/node': 20.3.1
+      '@types/node': 20.8.10
       merge-stream: 2.0.0
       supports-color: 8.1.1
     dev: true
@@ -4507,7 +4625,7 @@ packages:
   /jsonfile@6.1.0:
     resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
     dependencies:
-      universalify: 2.0.0
+      universalify: 2.0.1
     optionalDependencies:
       graceful-fs: 4.2.11
     dev: true
@@ -4608,7 +4726,7 @@ packages:
       is-plain-object: 2.0.4
       object.map: 1.0.1
       rechoir: 0.6.2
-      resolve: 1.22.2
+      resolve: 1.22.8
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -4617,7 +4735,7 @@ packages:
     resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
     dev: true
 
-  /listr2@3.14.0(enquirer@2.3.6):
+  /listr2@3.14.0(enquirer@2.4.1):
     resolution: {integrity: sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==}
     engines: {node: '>=10.0.0'}
     peerDependencies:
@@ -4628,7 +4746,7 @@ packages:
     dependencies:
       cli-truncate: 2.1.0
       colorette: 2.0.20
-      enquirer: 2.3.6
+      enquirer: 2.4.1
       log-update: 4.0.0
       p-map: 4.0.0
       rfdc: 1.3.0
@@ -4765,7 +4883,7 @@ packages:
     dependencies:
       findup-sync: 2.0.0
       micromatch: 3.1.10
-      resolve: 1.22.2
+      resolve: 1.22.8
       stack-trace: 0.0.10
     transitivePeerDependencies:
       - supports-color
@@ -5088,8 +5206,8 @@ packages:
     resolution: {integrity: sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.2.0
+      call-bind: 1.0.5
+      define-properties: 1.2.1
       has-symbols: 1.0.3
       object-keys: 1.1.1
     dev: true
@@ -5469,7 +5587,7 @@ packages:
   /postcss-merge-idents@2.1.7:
     resolution: {integrity: sha512-9DHmfCZ7/hNHhIKnNkz4CU0ejtGen5BbTRJc13Z2uHfCedeCUsK2WEQoAJRBL+phs68iWK6Qf8Jze71anuysWA==}
     dependencies:
-      has: 1.0.3
+      has: 1.0.4
       postcss: 5.2.18
       postcss-value-parser: 3.3.1
     dev: true
@@ -5522,7 +5640,7 @@ packages:
     resolution: {integrity: sha512-e13vxPBSo3ZaPne43KVgM+UETkx3Bs4/Qvm6yXI9HQpQp4nyb7HZ0gKpkF+Wn2x+/dbQ+swNpCdZSbMOT7+TIA==}
     dependencies:
       alphanum-sort: 1.0.2
-      has: 1.0.3
+      has: 1.0.4
       postcss: 5.2.18
       postcss-selector-parser: 2.2.3
     dev: true
@@ -5565,7 +5683,7 @@ packages:
   /postcss-reduce-transforms@1.0.4:
     resolution: {integrity: sha512-lGgRqnSuAR5i5uUg1TA33r9UngfTadWxOyL2qx1KuPoCQzfmtaHjp9PuwX7yVyRxG3BWBzeFUaS5uV9eVgnEgQ==}
     dependencies:
-      has: 1.0.3
+      has: 1.0.4
       postcss: 5.2.18
       postcss-value-parser: 3.3.1
     dev: true
@@ -5602,7 +5720,7 @@ packages:
   /postcss-zindex@2.2.0:
     resolution: {integrity: sha512-uhRZ2hRgj0lorxm9cr62B01YzpUe63h0RXMXQ4gWW3oa2rpJh+FJAiEAytaFCPU/VgaBS+uW2SJ1XKyDNz1h4w==}
     dependencies:
-      has: 1.0.3
+      has: 1.0.4
       postcss: 5.2.18
       uniqs: 2.0.0
     dev: true
@@ -5718,6 +5836,11 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
+  /punycode@2.3.1:
+    resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
+    engines: {node: '>=6'}
+    dev: true
+
   /q@1.5.1:
     resolution: {integrity: sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==}
     engines: {node: '>=0.6.0', teleport: '>=0.2.0'}
@@ -5744,6 +5867,10 @@ packages:
     deprecated: The querystring API is considered Legacy. new code should use the URLSearchParams API instead.
     dev: true
 
+  /querystringify@2.2.0:
+    resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==}
+    dev: true
+
   /queue-lit@1.5.0:
     resolution: {integrity: sha512-IslToJ4eiCEE9xwMzq3viOO5nH8sUWUCwoElrhNMozzr9IIt2qqvB4I+uHu/zJTQVqc9R5DFwok4ijNK1pU3fA==}
     dev: true
@@ -5851,11 +5978,18 @@ packages:
       picomatch: 2.3.1
     dev: true
 
+  /readdirp@3.6.0:
+    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
+    engines: {node: '>=8.10.0'}
+    dependencies:
+      picomatch: 2.3.1
+    dev: true
+
   /rechoir@0.6.2:
     resolution: {integrity: sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==}
     engines: {node: '>= 0.10'}
     dependencies:
-      resolve: 1.22.2
+      resolve: 1.22.8
     dev: true
 
   /rechoir@0.8.0:
@@ -5977,6 +6111,10 @@ packages:
     resolution: {integrity: sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==}
     dev: true
 
+  /requires-port@1.0.0:
+    resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
+    dev: true
+
   /resolve-alpn@1.2.1:
     resolution: {integrity: sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==}
     dev: true
@@ -6022,6 +6160,15 @@ packages:
       supports-preserve-symlinks-flag: 1.0.0
     dev: true
 
+  /resolve@1.22.8:
+    resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==}
+    hasBin: true
+    dependencies:
+      is-core-module: 2.13.1
+      path-parse: 1.0.7
+      supports-preserve-symlinks-flag: 1.0.0
+    dev: true
+
   /responselike@2.0.1:
     resolution: {integrity: sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==}
     dependencies:
@@ -6069,7 +6216,7 @@ packages:
     engines: {node: '>=14.18.0', npm: '>=8.0.0'}
     hasBin: true
     optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
     dev: true
 
   /run-parallel@1.2.0:
@@ -6175,6 +6322,14 @@ packages:
       lru-cache: 6.0.0
     dev: true
 
+  /semver@7.5.4:
+    resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==}
+    engines: {node: '>=10'}
+    hasBin: true
+    dependencies:
+      lru-cache: 6.0.0
+    dev: true
+
   /serialize-javascript@6.0.1:
     resolution: {integrity: sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==}
     dependencies:
@@ -6185,6 +6340,16 @@ packages:
     resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
     dev: true
 
+  /set-function-length@1.1.1:
+    resolution: {integrity: sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      define-data-property: 1.1.1
+      get-intrinsic: 1.2.2
+      gopd: 1.0.1
+      has-property-descriptors: 1.0.1
+    dev: true
+
   /set-value@2.0.1:
     resolution: {integrity: sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==}
     engines: {node: '>=0.10.0'}
@@ -6703,6 +6868,17 @@ packages:
       source-map-support: 0.5.21
     dev: true
 
+  /terser@5.24.0:
+    resolution: {integrity: sha512-ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw==}
+    engines: {node: '>=10'}
+    hasBin: true
+    dependencies:
+      '@jridgewell/source-map': 0.3.5
+      acorn: 8.11.2
+      commander: 2.20.3
+      source-map-support: 0.5.21
+    dev: true
+
   /textarea-caret@3.1.0:
     resolution: {integrity: sha512-cXAvzO9pP5CGa6NKx0WYHl+8CHKZs8byMkt3PCJBCmq2a34YA9pO1NrQET5pzeqnBjBdToF5No4rrmkDUgQC2Q==}
     dev: true
@@ -6825,12 +7001,14 @@ packages:
       ieee754: 1.2.1
     dev: true
 
-  /tough-cookie@2.5.0:
-    resolution: {integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==}
-    engines: {node: '>=0.8'}
+  /tough-cookie@4.1.3:
+    resolution: {integrity: sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==}
+    engines: {node: '>=6'}
     dependencies:
       psl: 1.9.0
-      punycode: 2.1.1
+      punycode: 2.3.1
+      universalify: 0.2.0
+      url-parse: 1.5.10
     dev: true
 
   /trim-newlines@3.0.1:
@@ -6845,7 +7023,7 @@ packages:
       escape-string-regexp: 5.0.0
     dev: true
 
-  /ts-node@10.4.0(@swc/core@1.3.62)(@types/node@20.3.1)(typescript@5.1.3):
+  /ts-node@10.4.0(@swc/core@1.3.62)(@types/node@20.8.10)(typescript@5.1.3):
     resolution: {integrity: sha512-g0FlPvvCXSIO1JDF6S232P5jPYqBkRL9qly81ZgAOSU7rwI0stphCgd2kLiCrU9DjQCrJMWEqcNSjQL02s6d8A==}
     hasBin: true
     peerDependencies:
@@ -6865,7 +7043,7 @@ packages:
       '@tsconfig/node12': 1.0.11
       '@tsconfig/node14': 1.0.3
       '@tsconfig/node16': 1.0.4
-      '@types/node': 20.3.1
+      '@types/node': 20.8.10
       acorn: 8.8.2
       acorn-walk: 8.2.0
       arg: 4.1.3
@@ -7005,6 +7183,10 @@ packages:
       undertaker-registry: 1.0.1
     dev: true
 
+  /undici-types@5.26.5:
+    resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
+    dev: true
+
   /unicode-emoji-json@0.4.0:
     resolution: {integrity: sha512-lVNOwh2AnmbwqtSrEVjAWKQoVzWgyWmXVqPuPkPfKb0tnA0+uYN/4ILCTdy9IRj/+3drAVhmjwjNJQr2dhCwnA==}
     dev: true
@@ -7039,11 +7221,21 @@ packages:
     engines: {node: '>= 4.0.0'}
     dev: true
 
+  /universalify@0.2.0:
+    resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}
+    engines: {node: '>= 4.0.0'}
+    dev: true
+
   /universalify@2.0.0:
     resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
     engines: {node: '>= 10.0.0'}
     dev: true
 
+  /universalify@2.0.1:
+    resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
+    engines: {node: '>= 10.0.0'}
+    dev: true
+
   /unload@2.4.1:
     resolution: {integrity: sha512-IViSAm8Z3sRBYA+9wc0fLQmU9Nrxb16rcDmIiR6Y9LJSZzI7QY5QsDhqPpKOjAn0O9/kfK1TfNEMMAGPTIraPw==}
     dev: true
@@ -7083,6 +7275,13 @@ packages:
     deprecated: Please see https://github.com/lydell/urix#deprecated
     dev: true
 
+  /url-parse@1.5.10:
+    resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==}
+    dependencies:
+      querystringify: 2.2.0
+      requires-port: 1.0.0
+    dev: true
+
   /url-polyfill@1.1.12:
     resolution: {integrity: sha512-mYFmBHCapZjtcNHW0MDq9967t+z4Dmg5CJ0KqysK3+ZbyoNOWQHksGCTWwDhxGXllkWlOc10Xfko6v4a3ucM6A==}
     dev: true
@@ -7244,7 +7443,7 @@ packages:
       rollup: 3.23.1
       sass: 1.62.1
     optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
     dev: true
 
   /vue-isyourpasswordsafe@2.0.0:
@@ -7534,10 +7733,10 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
-  github.com/misskey-dev/browser-image-resizer/56f504427ad7f6500e141a6d9f3aee42023d7f3e:
-    resolution: {tarball: https://codeload.github.com/misskey-dev/browser-image-resizer/tar.gz/56f504427ad7f6500e141a6d9f3aee42023d7f3e}
-    name: browser-image-resizer
-    version: 2.2.1-misskey.4
+  github.com/misskey-dev/browser-image-resizer/5a70660c2ac8aad3d436bfa67a5e7f7c8946cac4:
+    resolution: {tarball: https://codeload.github.com/misskey-dev/browser-image-resizer/tar.gz/5a70660c2ac8aad3d436bfa67a5e7f7c8946cac4}
+    name: '@misskey-dev/browser-image-resizer'
+    version: 2.2.1-misskey.10
     dev: true
 
   github.com/sampotts/plyr/d434c9af16e641400aaee93188594208d88f2658:
@@ -7545,15 +7744,15 @@ packages:
     name: plyr
     version: 3.7.0
     dependencies:
-      core-js: 3.31.1
+      core-js: 3.33.2
       custom-event-polyfill: 1.0.7
       loadjs: 4.2.0
       rangetouch: 2.0.1
       url-polyfill: 1.1.12
     dev: true
 
-  github.com/thatonecalculator/emojilib/d3c8c6a77d4362b3b3180099f1d2eac344ce245c:
-    resolution: {tarball: https://codeload.github.com/thatonecalculator/emojilib/tar.gz/d3c8c6a77d4362b3b3180099f1d2eac344ce245c}
+  github.com/thatonecalculator/emojilib/b962bd997e8c600b0b020ff0dd78ae1000a1f0c8:
+    resolution: {tarball: https://codeload.github.com/thatonecalculator/emojilib/tar.gz/b962bd997e8c600b0b020ff0dd78ae1000a1f0c8}
     name: emojilib
-    version: 3.0.10
+    version: 3.0.11
     dev: true
diff --git a/fe_calckey/frontend/scripts/magnetar-types.js b/fe_calckey/frontend/scripts/magnetar-types.js
new file mode 100644
index 0000000..b9af35d
--- /dev/null
+++ b/fe_calckey/frontend/scripts/magnetar-types.js
@@ -0,0 +1,33 @@
+const fs = require("node:fs");
+const execa = require("execa");
+const chalk = require("chalk");
+const { join } = require("node:path");
+
+(async () => {
+    console.log(chalk.italic`Generating Magnetar types, this may take a while...`)
+
+    const { failed } = await execa.command("cargo test --release --package magnetar_sdk", {
+        cwd: "../../magnetar_sdk",
+        stdout: "inherit"
+    });
+
+    if (failed) {
+        console.error(chalk.red`Type generation failed.`);
+        return;
+    }
+
+    console.log(chalk.green`Successfully generated Magnetar types`);
+
+    const srcPath = "../../magnetar_sdk/bindings";
+    const destPath = "magnetar-common/src/types";
+
+
+    console.log(chalk.italic`Deleting old`, `"${destPath}"`);
+    fs.rmSync(destPath, { recursive: true, force: true });
+    console.log(chalk.italic`Copying generated Magnetar types...`);
+    console.log(chalk.italic`From`, `"${srcPath}"`, chalk.italic`to`, `"${destPath}"`);
+    fs.cpSync(`${srcPath}/`, `${destPath}/`, { recursive: true });
+    console.log(chalk.italic`Deleting`, `"${srcPath}"`);
+    fs.rmSync(srcPath, { recursive: true, force: true });
+
+})();
diff --git a/magnetar_common/Cargo.toml b/magnetar_common/Cargo.toml
index 0aa0726..d6acd8d 100644
--- a/magnetar_common/Cargo.toml
+++ b/magnetar_common/Cargo.toml
@@ -10,7 +10,9 @@ crate-type = ["rlib"]
 magnetar_core = { path = "../core" }
 magnetar_sdk = { path = "../magnetar_sdk" }
 
+idna = { workspace = true }
 percent-encoding = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 toml = { workspace = true }
 thiserror = { workspace = true }
+url = { workspace = true }
diff --git a/magnetar_common/src/config.rs b/magnetar_common/src/config.rs
index a1d6946..77b5c09 100644
--- a/magnetar_common/src/config.rs
+++ b/magnetar_common/src/config.rs
@@ -10,6 +10,8 @@ pub struct MagnetarNetworking {
     pub port: u16,
     pub bind_addr: IpAddr,
     pub protocol: MagnetarNetworkingProtocol,
+    pub media_proxy: Option<String>,
+    pub proxy_remote_files: bool,
 }
 
 #[derive(Deserialize, Debug)]
@@ -66,6 +68,19 @@ fn env_protocol() -> MagnetarNetworkingProtocol {
     }
 }
 
+fn env_media_proxy() -> Option<String> {
+    std::env::var("MAG_C_MEDIA_PROXY")
+        .ok()
+        .filter(String::is_empty)
+}
+
+fn env_proxy_remote_files() -> bool {
+    std::env::var("MAG_C_PROXY_REMOTE_FILES")
+        .unwrap_or_else(|_| "false".to_string())
+        .parse()
+        .expect("MAG_C_PROXY_REMOTE_FILES must be a boolean")
+}
+
 impl Default for MagnetarNetworking {
     fn default() -> Self {
         MagnetarNetworking {
@@ -73,6 +88,8 @@ impl Default for MagnetarNetworking {
             bind_addr: env_bind_addr(),
             port: env_port(),
             protocol: env_protocol(),
+            media_proxy: env_media_proxy(),
+            proxy_remote_files: env_proxy_remote_files(),
         }
     }
 }
@@ -192,6 +209,8 @@ pub enum MagnetarConfigError {
     IoError(#[from] std::io::Error),
     #[error("Failed to parse configuration: {0}")]
     DeserializeError(#[from] toml::de::Error),
+    #[error("Configuration error: Not a valid hostname")]
+    ConfigHostnameError(#[from] idna::Errors),
 }
 
 pub fn load_config() -> Result<MagnetarConfig, MagnetarConfigError> {
@@ -200,7 +219,19 @@ pub fn load_config() -> Result<MagnetarConfig, MagnetarConfigError> {
 
     let str_cfg = std::fs::read_to_string(path)?;
 
-    let config = toml::from_str(&str_cfg)?;
+    let mut config: MagnetarConfig = toml::from_str(&str_cfg)?;
+
+    // Validate the host
+    idna::domain_to_unicode(&config.networking.host).1?;
+
+    if config
+        .networking
+        .media_proxy
+        .as_deref()
+        .is_some_and(str::is_empty)
+    {
+        config.networking.media_proxy = None;
+    }
 
     Ok(config)
 }
diff --git a/magnetar_sdk/macros/src/lib.rs b/magnetar_sdk/macros/src/lib.rs
index 34b07c1..a323b44 100644
--- a/magnetar_sdk/macros/src/lib.rs
+++ b/magnetar_sdk/macros/src/lib.rs
@@ -1,8 +1,11 @@
 use proc_macro::TokenStream;
+use quote::ToTokens;
 use std::collections::HashSet;
 use syn::parse::Parse;
 use syn::punctuated::Punctuated;
-use syn::{Expr, ExprLit, ExprPath, Ident, Lit, Meta, MetaNameValue, Token, Type};
+use syn::{
+    Expr, ExprLit, ExprPath, Ident, Lit, Meta, MetaNameValue, PathArguments, Token, Type, TypePath,
+};
 
 struct Field {
     name: Ident,
@@ -49,7 +52,9 @@ pub fn pack(item: TokenStream) -> TokenStream {
     let fields = &parsed.fields;
 
     let names = fields.iter().map(|f| &f.name);
-    let types = fields.iter().map(|f| &f.ty);
+    let types_decl = fields.iter().map(|f| &f.ty);
+    let types_struct = fields.iter().map(|f| &f.ty);
+    let types_deps = fields.iter().map(|f| &f.ty);
     let types_packed = fields.iter().map(|f| &f.ty);
 
     let names_packed = fields.iter().map(|f| &f.name);
@@ -61,13 +66,19 @@ pub fn pack(item: TokenStream) -> TokenStream {
         (#(#types_packed,)*)
     };
 
+    let name = struct_name.to_string();
+
+    let export_name = Ident::new(
+        &format!("export_bindings_{}", struct_name.to_string().to_lowercase()),
+        struct_name.span(),
+    );
+
     let expanded = quote::quote! {
-        #[derive(Clone, Debug, Deserialize, Serialize, TS)]
-        #[ts(export, export_to = #export_path)]
+        #[derive(Clone, Debug, Deserialize, Serialize)]
         pub struct #struct_name {
             #(
             #[serde(flatten)]
-            pub #names: #types
+            pub #names: #types_struct
             ),*
         }
 
@@ -82,6 +93,40 @@ pub fn pack(item: TokenStream) -> TokenStream {
                 }
             }
         }
+
+        #[cfg(test)]
+        #[test]
+        fn #export_name() {
+            #struct_name::export().expect("could not export type");
+        }
+
+        impl TS for #struct_name {
+            const EXPORT_TO: Option<&'static str> = Some(#export_path);
+
+            fn decl() -> String {
+                format!(
+                    "type {} = {};",
+                    Self::name(),
+                    vec![#(<#types_decl as TS>::inline()),*].join(" & ")
+                )
+            }
+
+            fn name() -> String {
+                #name.to_string()
+            }
+
+            fn dependencies() -> Vec<ts_rs::Dependency> {
+                vec![
+                    #(
+                    <#types_deps as TS>::dependencies()
+                    ),*
+                ].into_iter().flatten().collect::<Vec<_>>()
+            }
+
+            fn transparent() -> bool {
+                false
+            }
+        }
     };
 
     TokenStream::from(expanded)
@@ -109,6 +154,8 @@ pub fn derive_endpoint(item: TokenStream) -> TokenStream {
     let mut method = None;
     let mut request = None;
     let mut response = None;
+    let mut request_args = None;
+    let mut response_args = None;
 
     let mut found = HashSet::new();
 
@@ -145,39 +192,73 @@ pub fn derive_endpoint(item: TokenStream) -> TokenStream {
 
             match key.to_string().as_ref() {
                 "name" => {
-                    let Expr::Lit(ExprLit { lit: Lit::Str(new_name), .. }) = value else {
-                    panic!("expected a string literal");
-                };
+                    let Expr::Lit(ExprLit {
+                        lit: Lit::Str(new_name),
+                        ..
+                    }) = value
+                    else {
+                        panic!("expected a string literal");
+                    };
 
                     name = new_name.value();
                 }
                 "endpoint" => {
-                    let Expr::Lit(ExprLit { lit: Lit::Str(endpoint_val), .. }) = value else {
-                    panic!("expected a string literal");
-                };
+                    let Expr::Lit(ExprLit {
+                        lit: Lit::Str(endpoint_val),
+                        ..
+                    }) = value
+                    else {
+                        panic!("expected a string literal");
+                    };
 
                     endpoint = Some(endpoint_val.value());
                 }
                 "method" => {
                     let Expr::Path(ExprPath { path, .. }) = value else {
-                    panic!("expected a an identifier");
-                };
+                        panic!("expected a an identifier");
+                    };
 
                     method = Some(path);
                 }
                 "request" => {
-                    let Expr::Path(ExprPath { path, .. }) = value else {
-                    panic!("expected a an identifier");
-                };
+                    let Expr::Lit(ExprLit {
+                        lit: Lit::Str(str_lit),
+                        ..
+                    }) = value
+                    else {
+                        panic!("expected a an identifier");
+                    };
 
-                    request = Some(path);
+                    let type_tok: TokenStream = str_lit.value().parse().unwrap();
+                    let req_typ = syn::parse::<TypePath>(type_tok).unwrap();
+
+                    if let Some(seg_last) = req_typ.path.segments.last() {
+                        if let PathArguments::AngleBracketed(args) = &seg_last.arguments {
+                            let args_res = args.args.iter().cloned().collect::<Vec<_>>();
+                            request_args = Some(args_res);
+                        }
+                    }
+
+                    request = Some(req_typ);
                 }
                 "response" => {
-                    let Expr::Path(ExprPath { path, .. }) = value else {
-                    panic!("expected an identifier")
-                };
+                    let Expr::Lit(ExprLit {
+                        lit: Lit::Str(str_lit),
+                        ..
+                    }) = value
+                    else {
+                        panic!("expected a an identifier");
+                    };
 
-                    response = Some(path);
+                    let type_tok: TokenStream = str_lit.value().parse().unwrap();
+                    let res_typ = syn::parse::<TypePath>(type_tok).unwrap();
+                    if let Some(seg_last) = res_typ.path.segments.last() {
+                        if let PathArguments::AngleBracketed(args) = &seg_last.arguments {
+                            let args_res = args.args.iter().cloned().collect::<Vec<_>>();
+                            response_args = Some(args_res);
+                        }
+                    }
+                    response = Some(res_typ);
                 }
                 _ => panic!("unknown attribute: {}", key),
             }
@@ -191,12 +272,63 @@ pub fn derive_endpoint(item: TokenStream) -> TokenStream {
     let request = request.expect("missing request attribute");
     let response = response.expect("missing response attribute");
 
+    let mut endpoint_chars = endpoint.chars();
+    let mut path_params = String::from("[");
+    while let Some(c) = endpoint_chars.next() {
+        if c == ':' {
+            if !path_params.ends_with('[') {
+                path_params += ", ";
+            }
+
+            path_params += "\"";
+            path_params += &endpoint_chars
+                .clone()
+                .take_while(|c| c.is_ascii_alphanumeric() || *c == '_')
+                .collect::<String>();
+            path_params += "\"";
+        }
+    }
+    path_params += "]";
+
     let ts_path = format!("bindings/endpoints/{}.ts", name);
     let export_name = Ident::new(
         &format!("export_bindings_{}", struct_name.to_string().to_lowercase()),
         struct_name.span(),
     );
 
+    let call_name_req = if let Some(ref args) = request_args {
+        let args_str = args
+            .iter()
+            .map(|a| a.into_token_stream().to_string())
+            .collect::<Vec<_>>();
+
+        quote::quote! {
+            <#struct_name as Endpoint>::Request::name_with_type_args(vec![#( #args_str.to_string() ),*])
+        }
+    } else {
+        quote::quote! {
+            <#struct_name as Endpoint>::Request::name()
+        }
+    };
+
+    let call_name_res = if let Some(ref args) = response_args {
+        let args_str = args
+            .iter()
+            .map(|a| a.into_token_stream().to_string())
+            .collect::<Vec<_>>();
+
+        quote::quote! {
+            <#struct_name as Endpoint>::Response::name_with_type_args(vec![#( #args_str.to_string() ),*])
+        }
+    } else {
+        quote::quote! {
+            <#struct_name as Endpoint>::Response::name()
+        }
+    };
+
+    let req_args_flat = request_args.unwrap_or_default();
+    let res_args_flat = response_args.unwrap_or_default();
+
     let expanded = quote::quote! {
         impl Default for #struct_name {
             fn default() -> Self {
@@ -224,18 +356,21 @@ pub fn derive_endpoint(item: TokenStream) -> TokenStream {
 
             fn decl() -> String {
                 format!(
-                    "interface {} {{\n    \
-                        endpoint: \"{}\";\n    \
-                        method: \"{}\";\n    \
-                        request: {};\n    \
-                        response: {};\n\
+                    "const {} = {{\n    \
+                        endpoint: \"{}\",\n    \
+                        pathParams: {} as {},\n    \
+                        method: \"{}\" as \"GET\" | \"POST\" | \"PUT\" | \"DELETE\" | \"PATCH\",\n    \
+                        request: undefined as unknown as {},\n    \
+                        response: undefined as unknown as {}\n\
                     }}
                     ",
                     Self::name(),
                     Self::ENDPOINT,
+                    #path_params,
+                    #path_params,
                     Self::METHOD,
-                    <#struct_name as Endpoint>::Request::name(),
-                    <#struct_name as Endpoint>::Response::name()
+                    #call_name_req,
+                    #call_name_res
                 )
             }
 
@@ -245,9 +380,15 @@ pub fn derive_endpoint(item: TokenStream) -> TokenStream {
 
             fn dependencies() -> Vec<ts_rs::Dependency> {
                 vec![
-                    ts_rs::Dependency::from_ty::<<#struct_name as Endpoint>::Request>().unwrap(),
-                    ts_rs::Dependency::from_ty::<<#struct_name as Endpoint>::Response>().unwrap(),
-                ]
+                    ts_rs::Dependency::from_ty::<<#struct_name as Endpoint>::Request>(),
+                    ts_rs::Dependency::from_ty::<<#struct_name as Endpoint>::Response>(),
+                    #(
+                    ts_rs::Dependency::from_ty::<#req_args_flat>(),
+                    )*
+                    #(
+                    ts_rs::Dependency::from_ty::<#res_args_flat>(),
+                    )*
+                ].into_iter().flatten().collect::<Vec<_>>()
             }
 
             fn transparent() -> bool {
diff --git a/magnetar_sdk/src/endpoints/note.rs b/magnetar_sdk/src/endpoints/note.rs
index 9766294..fe52f99 100644
--- a/magnetar_sdk/src/endpoints/note.rs
+++ b/magnetar_sdk/src/endpoints/note.rs
@@ -9,17 +9,17 @@ use ts_rs::TS;
 #[derive(Serialize, Deserialize, TS)]
 #[ts(export)]
 pub struct NoteByIdReq {
-    #[serde(default)]
-    pub context: bool,
-    #[serde(default)]
-    pub attachments: bool,
+    #[ts(optional)]
+    pub context: Option<bool>,
+    #[ts(optional)]
+    pub attachments: Option<bool>,
 }
 
 #[derive(Endpoint)]
 #[endpoint(
     endpoint = "/notes/:id",
     method = Method::GET,
-    request = NoteByIdReq,
-    response = PackNoteMaybeFull
+    request = "NoteByIdReq",
+    response = "PackNoteMaybeFull"
 )]
 pub struct GetNoteById;
diff --git a/magnetar_sdk/src/endpoints/timeline.rs b/magnetar_sdk/src/endpoints/timeline.rs
index addeb36..d1e7c1e 100644
--- a/magnetar_sdk/src/endpoints/timeline.rs
+++ b/magnetar_sdk/src/endpoints/timeline.rs
@@ -10,26 +10,21 @@ use ts_rs::TS;
 #[derive(Serialize, Deserialize, TS)]
 #[ts(export)]
 pub struct GetTimelineReq {
-    #[serde(default = "default_timeline_limit")]
-    pub limit: U64Range<1, 100>,
-    #[serde(flatten)]
+    #[ts(optional)]
+    pub limit: Option<U64Range<1, 100>>,
+    #[ts(optional)]
     pub filter: Option<NoteListFilter>,
 }
 
-fn default_timeline_limit<const MIN: u64, const MAX: u64>() -> U64Range<MIN, MAX> {
-    15.try_into().unwrap()
+pub fn default_timeline_limit<const MIN: u64, const MAX: u64>() -> U64Range<MIN, MAX> {
+    30.try_into().unwrap()
 }
 
-#[derive(Serialize, Deserialize, TS)]
-#[ts(export)]
-#[repr(transparent)]
-pub struct GetTimelineRes(pub Vec<PackNoteMaybeFull>);
-
 #[derive(Endpoint)]
 #[endpoint(
     endpoint = "/timeline",
     method = Method::GET,
-    request = GetTimelineReq,
-    response = Vec::<PackNoteMaybeFull>,
+    request = "GetTimelineReq",
+    response = "Vec<PackNoteMaybeFull>",
 )]
 pub struct GetTimeline;
diff --git a/magnetar_sdk/src/endpoints/user.rs b/magnetar_sdk/src/endpoints/user.rs
index 540b3c6..436715f 100644
--- a/magnetar_sdk/src/endpoints/user.rs
+++ b/magnetar_sdk/src/endpoints/user.rs
@@ -10,22 +10,22 @@ use crate::types::user::{PackUserMaybeAll, PackUserSelfMaybeAll};
 #[derive(Serialize, Deserialize, TS)]
 #[ts(export)]
 pub struct UserSelfReq {
-    #[serde(default)]
-    pub profile: bool,
-    #[serde(default)]
-    pub pins: bool,
-    #[serde(default)]
-    pub detail: bool,
-    #[serde(default)]
-    pub secrets: bool,
+    #[ts(optional)]
+    pub profile: Option<bool>,
+    #[ts(optional)]
+    pub pins: Option<bool>,
+    #[ts(optional)]
+    pub detail: Option<bool>,
+    #[ts(optional)]
+    pub secrets: Option<bool>,
 }
 
 #[derive(Endpoint)]
 #[endpoint(
     endpoint = "/users/@self",
     method = Method::GET,
-    request = UserSelfReq,
-    response = PackUserSelfMaybeAll
+    request = "UserSelfReq",
+    response = "PackUserSelfMaybeAll"
 )]
 pub struct GetUserSelf;
 
@@ -33,24 +33,24 @@ pub struct GetUserSelf;
 #[derive(Serialize, Deserialize, TS)]
 #[ts(export)]
 pub struct UserByIdReq {
-    #[serde(default)]
-    pub profile: bool,
-    #[serde(default)]
-    pub pins: bool,
-    #[serde(default)]
-    pub detail: bool,
-    #[serde(default)]
-    pub relation: bool,
-    #[serde(default)]
-    pub auth: bool,
+    #[ts(optional)]
+    pub profile: Option<bool>,
+    #[ts(optional)]
+    pub pins: Option<bool>,
+    #[ts(optional)]
+    pub detail: Option<bool>,
+    #[ts(optional)]
+    pub relation: Option<bool>,
+    #[ts(optional)]
+    pub auth: Option<bool>,
 }
 
 #[derive(Endpoint)]
 #[endpoint(
     endpoint = "/users/:user_id",
     method = Method::GET,
-    request = UserByIdReq,
-    response = PackUserMaybeAll
+    request = "UserByIdReq",
+    response = "PackUserMaybeAll"
 )]
 pub struct GetUserById;
 
@@ -60,7 +60,7 @@ pub struct GetUserById;
 #[endpoint(
     endpoint = "/users/by-acct/:user_id",
     method = Method::GET,
-    request = UserByIdReq,
-    response = PackUserMaybeAll
+    request = "UserByIdReq",
+    response = "PackUserMaybeAll"
 )]
 pub struct GetUserByAcct;
diff --git a/magnetar_sdk/src/lib.rs b/magnetar_sdk/src/lib.rs
index 79189ff..c2ba37a 100644
--- a/magnetar_sdk/src/lib.rs
+++ b/magnetar_sdk/src/lib.rs
@@ -1,4 +1,5 @@
 use serde::{Deserialize, Serialize};
+use std::ops::{Deref, DerefMut};
 use ts_rs::TS;
 
 pub use magnetar_mmm_parser as mmm;
@@ -6,10 +7,84 @@ pub mod endpoints;
 pub mod types;
 pub mod util_types;
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize, TS)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize)]
 #[repr(transparent)]
 pub struct Required<T>(pub T);
 
+impl<T: TS + 'static> TS for Required<T> {
+    const EXPORT_TO: Option<&'static str> = None;
+
+    fn decl() -> String {
+        unimplemented!()
+    }
+
+    fn name() -> String {
+        T::name()
+    }
+
+    fn inline() -> String {
+        T::name()
+    }
+
+    fn inline_flattened() -> String {
+        unimplemented!()
+    }
+
+    fn dependencies() -> Vec<ts_rs::Dependency> {
+        ts_rs::Dependency::from_ty::<T>().into_iter().collect()
+    }
+
+    fn transparent() -> bool {
+        false
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize)]
+#[repr(transparent)]
+pub struct Optional<T>(pub Option<T>);
+
+impl<T: TS + 'static> TS for Optional<T> {
+    const EXPORT_TO: Option<&'static str> = None;
+
+    fn decl() -> String {
+        unimplemented!()
+    }
+
+    fn name() -> String {
+        T::name()
+    }
+
+    fn inline() -> String {
+        format!("Partial<{}>", T::name())
+    }
+
+    fn inline_flattened() -> String {
+        unimplemented!()
+    }
+
+    fn dependencies() -> Vec<ts_rs::Dependency> {
+        ts_rs::Dependency::from_ty::<T>().into_iter().collect()
+    }
+
+    fn transparent() -> bool {
+        false
+    }
+}
+
+impl<T: TS> Deref for Optional<T> {
+    type Target = Option<T>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl<T: TS> DerefMut for Optional<T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
 pub trait Packed: 'static {
     type Input: 'static;
 
diff --git a/magnetar_sdk/src/types/drive.rs b/magnetar_sdk/src/types/drive.rs
index 49a8abd..cad33de 100644
--- a/magnetar_sdk/src/types/drive.rs
+++ b/magnetar_sdk/src/types/drive.rs
@@ -12,9 +12,9 @@ use crate::types::Id;
 #[derive(Clone, Debug, Default, Deserialize, Serialize, TS)]
 #[ts(export)]
 pub struct ImageMeta {
-    pub width: Option<u64>,
-    pub height: Option<u64>,
-    pub orientation: Option<u64>,
+    pub width: Option<usize>,
+    pub height: Option<usize>,
+    pub orientation: Option<usize>,
     pub color: Option<String>,
 }
 
@@ -24,8 +24,8 @@ pub struct DriveFolderBase {
     pub name: String,
     pub created_at: DateTime<Utc>,
     pub comment: Option<String>,
-    pub file_count: u64,
-    pub folder_count: u64,
+    pub file_count: usize,
+    pub folder_count: usize,
     pub parent_id: Option<String>,
     pub user_id: String,
 }
@@ -48,12 +48,14 @@ pack!(
 pub struct DriveFileBase {
     pub name: String,
     pub created_at: DateTime<Utc>,
-    pub size: u64,
+    pub size: usize,
     pub hash: Option<String>,
     pub mime_type: String,
     pub media_metadata: ImageMeta,
     pub url: Option<String>,
+    pub source_url: String,
     pub thumbnail_url: Option<String>,
+    pub blurhash: Option<String>,
     pub sensitive: bool,
     pub comment: Option<String>,
     pub folder_id: Option<String>,
diff --git a/magnetar_sdk/src/types/instance.rs b/magnetar_sdk/src/types/instance.rs
new file mode 100644
index 0000000..1153e2c
--- /dev/null
+++ b/magnetar_sdk/src/types/instance.rs
@@ -0,0 +1,13 @@
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[ts(export)]
+pub struct InstanceTicker {
+    pub name: Option<String>,
+    pub software_name: Option<String>,
+    pub software_version: Option<String>,
+    pub icon_url: Option<String>,
+    pub favicon_url: Option<String>,
+    pub theme_color: Option<String>,
+}
diff --git a/magnetar_sdk/src/types/mod.rs b/magnetar_sdk/src/types/mod.rs
index 215c045..126625a 100644
--- a/magnetar_sdk/src/types/mod.rs
+++ b/magnetar_sdk/src/types/mod.rs
@@ -1,5 +1,6 @@
 pub mod drive;
 pub mod emoji;
+pub mod instance;
 pub mod note;
 pub mod timeline;
 pub mod user;
diff --git a/magnetar_sdk/src/types/note.rs b/magnetar_sdk/src/types/note.rs
index da569f3..92e967d 100644
--- a/magnetar_sdk/src/types/note.rs
+++ b/magnetar_sdk/src/types/note.rs
@@ -1,7 +1,7 @@
 use crate::types::emoji::EmojiContext;
 use crate::types::user::PackUserBase;
 use crate::types::{Id, MmXml};
-use crate::{Packed, Required};
+use crate::{Optional, Packed, Required};
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
@@ -32,7 +32,7 @@ pub enum NoteVisibility {
 #[ts(export)]
 pub struct PollChoice {
     pub title: String,
-    pub votes_count: u64,
+    pub votes_count: usize,
     pub voted: Option<bool>,
 }
 
@@ -51,6 +51,7 @@ pack!(PackPollBase, Required<Id> as id & Required<PollBase> as poll);
 #[ts(export)]
 pub struct NoteBase {
     pub created_at: DateTime<Utc>,
+    pub updated_at: Option<DateTime<Utc>>,
     pub cw: Option<String>,
     pub cw_mm: Option<MmXml>,
     pub uri: Option<String>,
@@ -61,9 +62,10 @@ pub struct NoteBase {
     pub user: Box<PackUserBase>,
     pub parent_note_id: Option<String>,
     pub renoted_note_id: Option<String>,
-    pub reply_count: u64,
-    pub renote_count: u64,
+    pub reply_count: usize,
+    pub renote_count: usize,
     pub mentions: Vec<String>,
+    pub visible_user_ids: Option<Vec<String>>,
     pub hashtags: Vec<String>,
     pub reactions: Vec<ReactionPair>,
     pub local_only: bool,
@@ -77,7 +79,7 @@ pack!(PackNoteBase, Required<Id> as id & Required<NoteBase> as note);
 #[derive(Clone, Debug, Deserialize, Serialize, TS)]
 #[ts(export)]
 pub struct NoteSelfContextExt {
-    pub self_renote_count: Option<u64>,
+    pub self_renote_count: Option<usize>,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, TS)]
@@ -89,10 +91,11 @@ pub struct NoteAttachmentExt {
 
 pack!(
     PackNoteMaybeAttachments,
-    Required<Id> as id & Required<NoteBase> as note & Option<NoteSelfContextExt> as user_context & Option<NoteAttachmentExt> as attachment
+    Required<Id> as id & Required<NoteBase> as note & Optional<NoteSelfContextExt> as user_context & Optional<NoteAttachmentExt> as attachment
 );
 
 #[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[ts(export)]
 pub struct NoteDetailExt {
     pub parent_note: Option<Box<PackNoteMaybeAttachments>>,
     pub renoted_note: Option<Box<PackNoteMaybeAttachments>>,
@@ -100,10 +103,11 @@ pub struct NoteDetailExt {
 
 pack!(
     PackNoteMaybeFull,
-    Required<Id> as id & Required<NoteBase> as note & Option<NoteSelfContextExt> as user_context & Option<NoteAttachmentExt> as attachment & Option<NoteDetailExt> as detail
+    Required<Id> as id & Required<NoteBase> as note & Optional<NoteSelfContextExt> as user_context & Optional<NoteAttachmentExt> as attachment & Optional<NoteDetailExt> as detail
 );
 
 #[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[ts(export)]
 #[serde(untagged)]
 pub enum Reaction {
     Unicode(String),
@@ -118,8 +122,9 @@ pub enum Reaction {
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[ts(export)]
 #[serde(untagged)]
 pub enum ReactionPair {
-    WithoutContext(Reaction, u64),
-    WithContext(Reaction, u64, bool),
+    WithoutContext(Reaction, usize),
+    WithContext(Reaction, usize, bool),
 }
diff --git a/magnetar_sdk/src/types/user.rs b/magnetar_sdk/src/types/user.rs
index bcfdaa2..342c7a5 100644
--- a/magnetar_sdk/src/types/user.rs
+++ b/magnetar_sdk/src/types/user.rs
@@ -1,10 +1,11 @@
 use crate::types::emoji::EmojiContext;
 use crate::types::{Id, MmXml, NotificationSettings};
-use crate::{Packed, Required};
+use crate::{Optional, Packed, Required};
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
+use crate::types::instance::InstanceTicker;
 use crate::types::note::PackNoteMaybeFull;
 use magnetar_sdk_macros::pack;
 
@@ -43,14 +44,14 @@ pub struct UserBase {
     pub host: Option<String>,
     pub speech_transform: SpeechTransform,
     pub created_at: DateTime<Utc>,
-    pub avatar_url: Option<String>,
+    pub avatar_url: String,
     pub avatar_blurhash: Option<String>,
-    pub avatar_color: Option<String>,
     pub avatar_decoration: AvatarDecoration,
     pub is_admin: bool,
     pub is_moderator: bool,
     pub is_bot: bool,
     pub emojis: EmojiContext,
+    pub instance: Option<InstanceTicker>,
 }
 
 pack!(PackUserBase, Required<Id> as id & Required<UserBase> as user);
@@ -68,9 +69,9 @@ pub struct UserProfileExt {
     pub birthday: Option<DateTime<Utc>>,
     pub fields: Vec<ProfileField>,
 
-    pub follower_count: Option<u64>,
-    pub following_count: Option<u64>,
-    pub note_count: Option<u64>,
+    pub follower_count: Option<usize>,
+    pub following_count: Option<usize>,
+    pub note_count: Option<usize>,
 
     pub url: Option<String>,
 
@@ -78,11 +79,9 @@ pub struct UserProfileExt {
     pub also_known_as: Option<String>,
 
     pub banner_url: Option<String>,
-    pub banner_color: Option<String>,
     pub banner_blurhash: Option<String>,
 
     pub has_public_reactions: bool,
-    pub emojis: EmojiContext,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, TS)]
@@ -97,6 +96,8 @@ pub struct UserProfilePinsEx {
 pub struct UserRelationExt {
     pub follows_you: bool,
     pub you_follow: bool,
+    pub you_request_follow: bool,
+    pub they_request_follow: bool,
     pub blocks_you: bool,
     pub you_block: bool,
     pub mute: bool,
@@ -164,16 +165,24 @@ pack!(
     PackUserMaybeAll,
     Required<Id> as id
         & Required<UserBase> as user
-        & Option<UserProfileExt> as profile
-        & Option<UserProfilePinsEx> as pins
-        & Option<UserDetailExt> as detail
-        & Option<UserRelationExt> as relation
-        & Option<UserAuthOverviewExt> as auth
+        & Optional<UserProfileExt> as profile
+        & Optional<UserProfilePinsEx> as pins
+        & Optional<UserDetailExt> as detail
+        & Optional<UserRelationExt> as relation
+        & Optional<UserAuthOverviewExt> as auth
 );
 
 impl From<PackUserBase> for PackUserMaybeAll {
     fn from(value: PackUserBase) -> Self {
-        Self::pack_from((value.id, value.user, None, None, None, None, None))
+        Self::pack_from((
+            value.id,
+            value.user,
+            Optional(None),
+            Optional(None),
+            Optional(None),
+            Optional(None),
+            Optional(None),
+        ))
     }
 }
 
@@ -181,14 +190,21 @@ pack!(
     PackUserSelfMaybeAll,
     Required<Id> as id
         & Required<UserBase> as user
-        & Option<UserProfileExt> as profile
-        & Option<UserProfilePinsEx> as pins
-        & Option<UserDetailExt> as detail
-        & Option<UserSecretsExt> as secrets
+        & Optional<UserProfileExt> as profile
+        & Optional<UserProfilePinsEx> as pins
+        & Optional<UserDetailExt> as detail
+        & Optional<UserSecretsExt> as secrets
 );
 
 impl From<PackUserBase> for PackUserSelfMaybeAll {
     fn from(value: PackUserBase) -> Self {
-        Self::pack_from((value.id, value.user, None, None, None, None))
+        Self::pack_from((
+            value.id,
+            value.user,
+            Optional(None),
+            Optional(None),
+            Optional(None),
+            Optional(None),
+        ))
     }
 }
diff --git a/magnetar_sdk/src/util_types.rs b/magnetar_sdk/src/util_types.rs
index 220c207..d8547a1 100644
--- a/magnetar_sdk/src/util_types.rs
+++ b/magnetar_sdk/src/util_types.rs
@@ -17,7 +17,7 @@ impl<const MIN: u64, const MAX: u64> TS for U64Range<MIN, MAX> {
     }
 
     fn dependencies() -> Vec<ts_rs::Dependency> {
-        vec![ts_rs::Dependency::from_ty::<u64>().unwrap()]
+        vec![]
     }
 
     fn transparent() -> bool {
diff --git a/src/api_v1/note.rs b/src/api_v1/note.rs
index d27d453..b2ca4e0 100644
--- a/src/api_v1/note.rs
+++ b/src/api_v1/note.rs
@@ -22,8 +22,8 @@ pub async fn handle_note(
 ) -> Result<Json<Res<GetNoteById>>, ApiError> {
     let ctx = PackingContext::new(service, self_user.clone()).await?;
     let note = NoteModel {
-        attachments,
-        with_context: context,
+        attachments: attachments.unwrap_or_default(),
+        with_context: context.unwrap_or_default(),
     }
     .fetch_single(&ctx, self_user.as_deref(), &id)
     .await?
diff --git a/src/model/data/drive.rs b/src/model/data/drive.rs
index c994ae8..6742f64 100644
--- a/src/model/data/drive.rs
+++ b/src/model/data/drive.rs
@@ -1,22 +1,39 @@
 use magnetar_calckey_model::ck;
 use magnetar_sdk::types::drive::{DriveFileBase, ImageMeta};
 use serde::Deserialize;
+use url::Url;
 
 use crate::model::{PackType, PackingContext};
 
-impl PackType<&ck::drive_file::Model> for DriveFileBase {
-    fn extract(_context: &PackingContext, file: &ck::drive_file::Model) -> Self {
+#[derive(Debug)]
+pub struct PackFileBaseInput<'a> {
+    pub file: &'a ck::drive_file::Model,
+    pub effective_url: Option<&'a Url>,
+    pub effective_thumbnail_url: Option<&'a Url>,
+}
+
+impl PackType<PackFileBaseInput<'_>> for DriveFileBase {
+    fn extract(
+        _context: &PackingContext,
+        PackFileBaseInput {
+            file,
+            effective_url,
+            effective_thumbnail_url,
+        }: PackFileBaseInput<'_>,
+    ) -> Self {
         let media_metadata = ImageMeta::deserialize(file.properties.clone()).unwrap_or_default();
 
         DriveFileBase {
             name: file.name.clone(),
             created_at: file.created_at.into(),
-            size: file.size as u64,
+            size: file.size as usize,
             hash: None, // TODO: blake3
             mime_type: file.r#type.clone(),
             media_metadata,
-            url: Some(file.url.clone()),
-            thumbnail_url: file.thumbnail_url.clone(),
+            url: effective_url.map(Url::to_string),
+            source_url: file.url.clone(),
+            thumbnail_url: effective_thumbnail_url.map(Url::to_string),
+            blurhash: file.blurhash.clone(),
             sensitive: file.is_sensitive,
             comment: file.comment.clone(),
             folder_id: file.folder_id.clone(),
diff --git a/src/model/data/instance.rs b/src/model/data/instance.rs
new file mode 100644
index 0000000..d74a00f
--- /dev/null
+++ b/src/model/data/instance.rs
@@ -0,0 +1,16 @@
+use crate::model::{PackType, PackingContext};
+use magnetar_calckey_model::ck;
+use magnetar_sdk::types::instance::InstanceTicker;
+
+impl<'a> PackType<&'a ck::instance::Model> for InstanceTicker {
+    fn extract(_context: &PackingContext, data: &'a ck::instance::Model) -> Self {
+        InstanceTicker {
+            name: data.name.clone(),
+            software_name: data.software_name.clone(),
+            software_version: data.software_version.clone(),
+            icon_url: data.icon_url.clone(),
+            favicon_url: data.favicon_url.clone(),
+            theme_color: data.theme_color.clone(),
+        }
+    }
+}
diff --git a/src/model/data/mod.rs b/src/model/data/mod.rs
index 0b1c42c..8dc31f4 100644
--- a/src/model/data/mod.rs
+++ b/src/model/data/mod.rs
@@ -1,6 +1,7 @@
 pub mod drive;
 pub mod emoji;
 pub mod id;
+pub mod instance;
 pub mod note;
 pub mod poll;
 pub mod user;
diff --git a/src/model/data/note.rs b/src/model/data/note.rs
index d4bd760..1f20442 100644
--- a/src/model/data/note.rs
+++ b/src/model/data/note.rs
@@ -39,6 +39,7 @@ impl PackType<NoteBaseSource<'_>> for NoteBase {
         use ck::sea_orm_active_enums::NoteVisibilityEnum as NVE;
         NoteBase {
             created_at: note.created_at.into(),
+            updated_at: note.updated_at.map(|d| d.into()),
             cw: note.cw.clone(),
             cw_mm: cw_mm.cloned(),
             uri: note.uri.clone(),
@@ -58,10 +59,12 @@ impl PackType<NoteBaseSource<'_>> for NoteBase {
             ))),
             parent_note_id: note.reply_id.clone(),
             renoted_note_id: note.renote_id.clone(),
-            reply_count: note.replies_count as u64,
-            renote_count: note.renote_count as u64,
+            reply_count: note.replies_count as usize,
+            renote_count: note.renote_count as usize,
             mentions: note.mentions.clone(),
             hashtags: note.tags.clone(),
+            visible_user_ids: matches!(note.visibility, NVE::Specified)
+                .then(|| note.visible_user_ids.clone()),
             reactions: reactions.clone(),
             local_only: note.local_only,
             has_poll: note.has_poll,
@@ -74,7 +77,7 @@ impl PackType<NoteBaseSource<'_>> for NoteBase {
 impl PackType<&sub_interaction_renote::Model> for NoteSelfContextExt {
     fn extract(_context: &PackingContext, data: &sub_interaction_renote::Model) -> Self {
         NoteSelfContextExt {
-            self_renote_count: data.renotes.map(|v| v as u64),
+            self_renote_count: data.renotes.map(|v| v as usize),
         }
     }
 }
diff --git a/src/model/data/poll.rs b/src/model/data/poll.rs
index 934a3b3..495b466 100644
--- a/src/model/data/poll.rs
+++ b/src/model/data/poll.rs
@@ -18,7 +18,7 @@ impl PackType<PollPackInput<'_>> for PollBase {
                 .enumerate()
                 .map(|(i, (name, count))| PollChoice {
                     title: name.to_string(),
-                    votes_count: *count as u64,
+                    votes_count: *count as usize,
                     voted: votes.map(|v| v.iter().any(|v| v.choice as usize == i)),
                 })
                 .collect(),
diff --git a/src/model/data/user.rs b/src/model/data/user.rs
index 608d07a..0d9db04 100644
--- a/src/model/data/user.rs
+++ b/src/model/data/user.rs
@@ -1,12 +1,15 @@
 use magnetar_calckey_model::ck;
 use magnetar_calckey_model::ck::sea_orm_active_enums::UserProfileFfvisibilityEnum;
+use magnetar_sdk::types::drive::PackDriveFileBase;
 use magnetar_sdk::types::emoji::{EmojiContext, PackEmojiBase};
+use magnetar_sdk::types::instance::InstanceTicker;
 use magnetar_sdk::types::note::PackNoteMaybeFull;
 use magnetar_sdk::types::user::{
     AvatarDecoration, PackSecurityKeyBase, ProfileField, SecurityKeyBase, SpeechTransform,
     UserBase, UserDetailExt, UserProfileExt, UserProfilePinsEx, UserRelationExt, UserSecretsExt,
 };
 use magnetar_sdk::types::MmXml;
+use url::Url;
 
 use crate::model::{PackType, PackingContext};
 
@@ -19,8 +22,10 @@ impl PackType<&[PackEmojiBase]> for EmojiContext {
 pub struct UserBaseSource<'a> {
     pub user: &'a ck::user::Model,
     pub username_mm: Option<&'a MmXml>,
-    pub avatar: Option<&'a ck::drive_file::Model>,
+    pub avatar_url: &'a Url,
+    pub avatar: Option<&'a PackDriveFileBase>,
     pub emoji_context: &'a EmojiContext,
+    pub instance: Option<&'a InstanceTicker>,
 }
 
 impl PackType<UserBaseSource<'_>> for UserBase {
@@ -29,8 +34,10 @@ impl PackType<UserBaseSource<'_>> for UserBase {
         UserBaseSource {
             user,
             username_mm,
+            avatar_url,
             avatar,
             emoji_context,
+            instance,
         }: UserBaseSource,
     ) -> Self {
         UserBase {
@@ -49,9 +56,8 @@ impl PackType<UserBaseSource<'_>> for UserBase {
                 SpeechTransform::None
             },
             created_at: user.created_at.into(),
-            avatar_url: avatar.map(|v| v.url.clone()),
-            avatar_blurhash: avatar.and_then(|v| v.blurhash.clone()),
-            avatar_color: None,
+            avatar_url: avatar_url.to_string(),
+            avatar_blurhash: avatar.and_then(|v| v.file.0.blurhash.clone()),
             avatar_decoration: if user.is_cat {
                 AvatarDecoration::CatEars
             } else {
@@ -61,6 +67,7 @@ impl PackType<UserBaseSource<'_>> for UserBase {
             is_moderator: user.is_moderator,
             is_bot: user.is_bot,
             emojis: emoji_context.clone(),
+            instance: instance.map(|i| i.clone()),
         }
     }
 }
@@ -69,9 +76,10 @@ pub struct UserProfileExtSource<'a> {
     pub user: &'a ck::user::Model,
     pub profile: &'a ck::user_profile::Model,
     pub profile_fields: &'a Vec<ProfileField>,
+    pub banner_url: Option<&'a Url>,
+    pub banner: Option<&'a ck::drive_file::Model>,
     pub description_mm: Option<&'a MmXml>,
     pub relation: Option<&'a UserRelationExt>,
-    pub emoji_context: &'a EmojiContext,
 }
 
 impl PackType<UserProfileExtSource<'_>> for UserProfileExt {
@@ -81,9 +89,10 @@ impl PackType<UserProfileExtSource<'_>> for UserProfileExt {
             user,
             profile,
             profile_fields,
+            banner_url,
+            banner,
             description_mm,
             relation,
-            emoji_context,
         }: UserProfileExtSource,
     ) -> Self {
         let follow_visibility = match profile.ff_visibility {
@@ -104,17 +113,15 @@ impl PackType<UserProfileExtSource<'_>> for UserProfileExt {
                 .clone()
                 .and_then(|b| b.parse().map_or_else(|_| None, Some)),
             fields: profile_fields.clone(),
-            follower_count: follow_visibility.then_some(user.followers_count as u64),
-            following_count: follow_visibility.then_some(user.following_count as u64),
-            note_count: Some(user.notes_count as u64),
+            follower_count: follow_visibility.then_some(user.followers_count as usize),
+            following_count: follow_visibility.then_some(user.following_count as usize),
+            note_count: Some(user.notes_count as usize),
             url: profile.url.clone(),
             moved_to_uri: user.moved_to_uri.clone(),
             also_known_as: user.also_known_as.clone(),
-            banner_url: None,
-            banner_color: None,
-            banner_blurhash: None,
+            banner_url: banner_url.map(Url::to_string),
+            banner_blurhash: banner.and_then(|b| b.blurhash.clone()),
             has_public_reactions: profile.public_reactions,
-            emojis: emoji_context.clone(),
         }
     }
 }
@@ -136,6 +143,8 @@ struct UserRelationExtSource<'a> {
     pub block_in: Option<&'a ck::blocking::Model>,
     pub mute: Option<&'a ck::muting::Model>,
     pub renote_mute: Option<&'a ck::renote_muting::Model>,
+    pub follow_request_out: Option<&'a ck::follow_request::Model>,
+    pub follow_request_in: Option<&'a ck::follow_request::Model>,
 }
 
 impl PackType<UserRelationExtSource<'_>> for UserRelationExt {
@@ -148,6 +157,8 @@ impl PackType<UserRelationExtSource<'_>> for UserRelationExt {
             block_in,
             mute,
             renote_mute,
+            follow_request_in,
+            follow_request_out,
         }: UserRelationExtSource,
     ) -> Self {
         let self_user = context.self_user();
@@ -183,6 +194,18 @@ impl PackType<UserRelationExtSource<'_>> for UserRelationExt {
                     self_user.id == renote_mute.muter_id && self_user.id != renote_mute.mutee_id
                 })
             }),
+            you_request_follow: self_user.is_some_and(|self_user| {
+                follow_request_in.is_some_and(|follow_req_in| {
+                    self_user.id == follow_req_in.followee_id
+                        && self_user.id != follow_req_in.follower_id
+                })
+            }),
+            they_request_follow: self_user.is_some_and(|self_user| {
+                follow_request_out.is_some_and(|follow_req_out| {
+                    self_user.id == follow_req_out.follower_id
+                        && self_user.id != follow_req_out.followee_id
+                })
+            }),
         }
     }
 }
diff --git a/src/model/processing/drive.rs b/src/model/processing/drive.rs
index 2e383d0..c400dd5 100644
--- a/src/model/processing/drive.rs
+++ b/src/model/processing/drive.rs
@@ -1,21 +1,144 @@
+use crate::model::data::drive::PackFileBaseInput;
 use crate::model::processing::PackResult;
 use crate::model::{PackType, PackingContext};
 use magnetar_calckey_model::ck;
 use magnetar_sdk::types::drive::{DriveFileBase, PackDriveFileBase};
 use magnetar_sdk::types::Id;
 use magnetar_sdk::{Packed, Required};
+use tracing::warn;
+use url::Url;
 
 pub struct DriveModel;
 
 impl DriveModel {
+    pub fn media_proxy_url(
+        &self,
+        ctx: &PackingContext,
+        url: &str,
+        is_thumbnail: bool,
+    ) -> Option<Url> {
+        if let Some(proxy) = &ctx.service.config.networking.media_proxy {
+            let params = if is_thumbnail {
+                vec![("url", url), ("thumbnail", "1")]
+            } else {
+                vec![("url", url)]
+            };
+
+            let url = Url::parse_with_params(proxy, &params);
+
+            if let Err(e) = url {
+                warn!("Url parse error: {e}");
+            }
+
+            return url.ok();
+        }
+
+        None
+    }
+
+    pub fn builtin_proxy_file(
+        &self,
+        ctx: &PackingContext,
+        file: &ck::drive_file::Model,
+        is_thumbnail: bool,
+    ) -> Option<Url> {
+        let key = if is_thumbnail {
+            file.thumbnail_access_key.as_deref()
+        } else {
+            file.webpublic_access_key.as_deref()
+        };
+
+        if let Some(k) = key {
+            if k != "/" {
+                let url_raw = format!(
+                    "{}://{}/files/{}",
+                    ctx.service.config.networking.protocol.as_ref(),
+                    &ctx.service.config.networking.host,
+                    k
+                );
+                let url = Url::parse(&url_raw);
+
+                if let Err(e) = url {
+                    warn!("Url parse error: {e}");
+                }
+
+                return url.ok();
+            }
+        }
+
+        None
+    }
+
+    pub fn get_public_url(
+        &self,
+        ctx: &PackingContext,
+        file: &ck::drive_file::Model,
+        is_thumbnail: bool,
+    ) -> Option<Url> {
+        if let Some(uri) = &file.uri {
+            if file.user_host.is_none() {
+                if let Some(media_proxy_url) = self.media_proxy_url(ctx, uri, is_thumbnail) {
+                    return Some(media_proxy_url);
+                }
+
+                if file.is_link && ctx.service.config.networking.proxy_remote_files {
+                    if let Some(proxy_url) = self.builtin_proxy_file(ctx, file, is_thumbnail) {
+                        return Some(proxy_url);
+                    }
+                }
+            }
+        }
+
+        let is_image = matches!(
+            file.r#type.as_str(),
+            "image/png"
+                | "image/apng"
+                | "image/gif"
+                | "image/jpeg"
+                | "image/webp"
+                | "image/svg+xml"
+                | "image/avif"
+        );
+
+        let url_raw = if is_thumbnail {
+            file.thumbnail_url
+                .as_deref()
+                .or(is_image.then_some(file.webpublic_url.as_deref().unwrap_or(file.url.as_str())))
+        } else {
+            file.webpublic_url.as_deref().or(Some(file.url.as_str()))
+        };
+
+        if let Some(u) = url_raw {
+            let url = Url::parse(u);
+
+            if let Err(e) = url {
+                warn!("Url parse error: {e}");
+            }
+
+            return url.ok();
+        }
+
+        None
+    }
+
     pub fn pack_existing(
         &self,
         ctx: &PackingContext,
         file: &ck::drive_file::Model,
     ) -> PackDriveFileBase {
+        let url = self.get_public_url(ctx, file, false);
+        let thumbnail_url = self.get_public_url(ctx, file, false);
+
         PackDriveFileBase::pack_from((
             Required(Id::from(&file.id)),
-            Required(DriveFileBase::extract(ctx, &file)),
+            Required(DriveFileBase::extract(
+                ctx,
+                PackFileBaseInput {
+                    file: &file,
+                    effective_url: url.as_ref(),
+                    effective_thumbnail_url: thumbnail_url.as_ref(),
+                },
+            )),
         ))
     }
 
diff --git a/src/model/processing/mod.rs b/src/model/processing/mod.rs
index 33d2fc3..e678d80 100644
--- a/src/model/processing/mod.rs
+++ b/src/model/processing/mod.rs
@@ -1,5 +1,6 @@
 use crate::service::emoji_cache::EmojiCacheError;
 use crate::service::generic_id_cache::GenericIdCacheError;
+use crate::service::instance_cache::RemoteInstanceCacheError;
 use crate::service::instance_meta_cache::InstanceMetaCacheError;
 use magnetar_calckey_model::sea_orm::DbErr;
 use magnetar_calckey_model::CalckeyDbError;
@@ -23,8 +24,12 @@ pub enum PackError {
     InstanceMetaCacheError(#[from] InstanceMetaCacheError),
     #[error("Generic cache error: {0}")]
     GenericCacheError(#[from] GenericIdCacheError),
+    #[error("Remote instance cache error: {0}")]
+    RemoteInstanceCacheError(#[from] RemoteInstanceCacheError),
     #[error("Deserializer error: {0}")]
     DeserializerError(#[from] serde_json::Error),
+    #[error("URL parse error: {0}")]
+    UrlParseError(#[from] url::ParseError),
 }
 
 pub type PackResult<T> = Result<T, PackError>;
diff --git a/src/model/processing/note.rs b/src/model/processing/note.rs
index 270d269..bdd37bc 100644
--- a/src/model/processing/note.rs
+++ b/src/model/processing/note.rs
@@ -27,7 +27,7 @@ use magnetar_sdk::types::note::{
     PackNoteMaybeAttachments, PackNoteMaybeFull, PackPollBase, PollBase, Reaction, ReactionPair,
 };
 use magnetar_sdk::types::{Id, MmXml};
-use magnetar_sdk::{mmm, Packed, Required};
+use magnetar_sdk::{mmm, Optional, Packed, Required};
 use serde::Deserialize;
 use tokio::try_join;
 
@@ -241,7 +241,7 @@ impl NoteModel {
                     )
                 })
                 .map(|(code, count, self_reacted)| {
-                    Ok((code, u64::deserialize(count)?, self_reacted))
+                    Ok((code, usize::deserialize(count)?, self_reacted))
                 })
                 .collect::<Result<Vec<_>, serde_json::Error>>()?;
         // Pick out all successfully-parsed shortcode emojis
@@ -412,8 +412,8 @@ impl NoteModel {
         Ok(PackNoteMaybeAttachments::pack_from((
             id,
             note,
-            self.extract_interaction(ctx, note_data)?,
-            attachments_pack.map(|attachments| {
+            Optional(self.extract_interaction(ctx, note_data)?),
+            Optional(attachments_pack.map(|attachments| {
                 NoteAttachmentExt::extract(
                     ctx,
                     NoteAttachmentSource {
@@ -421,7 +421,7 @@ impl NoteModel {
                         poll: poll_pack.as_ref(),
                     },
                 )
-            }),
+            })),
         )))
     }
 
@@ -505,7 +505,7 @@ impl NoteModel {
             note,
             user_context,
             attachment,
-            detail,
+            Optional(detail),
         ))))
     }
 }
diff --git a/src/model/processing/user.rs b/src/model/processing/user.rs
index 5243857..b244cae 100644
--- a/src/model/processing/user.rs
+++ b/src/model/processing/user.rs
@@ -1,13 +1,18 @@
 use crate::model::data::user::UserBaseSource;
+use crate::model::processing::drive::DriveModel;
 use crate::model::processing::emoji::EmojiModel;
 use crate::model::processing::{get_mm_token_emoji, PackResult};
 use crate::model::{PackType, PackingContext};
 use magnetar_calckey_model::ck;
 use magnetar_sdk::mmm::Token;
+use magnetar_sdk::types::drive::PackDriveFileBase;
 use magnetar_sdk::types::emoji::EmojiContext;
+use magnetar_sdk::types::instance::InstanceTicker;
 use magnetar_sdk::types::user::{PackUserBase, UserBase};
 use magnetar_sdk::types::{Id, MmXml};
 use magnetar_sdk::{mmm, Packed, Required};
+use tracing::warn;
+use url::Url;
 
 pub struct UserModel;
 
@@ -16,15 +21,48 @@ impl UserModel {
         mmm::Context::default().parse_ui(user.name.as_deref().unwrap_or(&user.username))
     }
 
+    pub fn get_effective_avatar_url(
+        &self,
+        ctx: &PackingContext,
+        user: &ck::user::Model,
+        avatar: Option<&PackDriveFileBase>,
+    ) -> PackResult<Url> {
+        Ok(avatar
+            .and_then(
+                |PackDriveFileBase {
+                     file: Required(base),
+                     ..
+                 }| base.thumbnail_url.as_deref(),
+            )
+            .map(Url::parse)
+            .and_then(|r| {
+                if let Err(e) = r {
+                    warn!("Failed to parse avatar URL: {e}");
+                }
+
+                r.ok().map(Ok)
+            })
+            .unwrap_or_else(|| {
+                Url::parse(&format!(
+                    "{}://{}/identicon/{}",
+                    ctx.service.config.networking.protocol,
+                    ctx.service.config.networking.host,
+                    user.id
+                ))
+            })?)
+    }
+
     pub async fn base_from_existing(
         &self,
         ctx: &PackingContext,
         user: &ck::user::Model,
     ) -> PackResult<PackUserBase> {
+        let drive_file_pack = DriveModel;
         let avatar = match &user.avatar_id {
-            Some(av_id) => ctx.service.drive_file_cache.get(av_id).await?,
+            Some(av_id) => drive_file_pack.get_cached_base(ctx, av_id).await?,
             None => None,
         };
+        let avatar_url = &self.get_effective_avatar_url(ctx, user, avatar.as_ref())?;
 
         let username_mm = self.tokenize_username(&user);
 
@@ -33,6 +71,16 @@ impl UserModel {
         let emojis = emoji_model
             .fetch_many_emojis(ctx, &shortcodes, user.host.as_deref())
             .await?;
+        let instance = ctx
+            .service
+            .remote_instance_cache
+            .get(
+                user.host
+                    .as_deref()
+                    .unwrap_or(&ctx.service.config.networking.host),
+            )
+            .await?
+            .map(|i| InstanceTicker::extract(ctx, i.as_ref()));
         let emoji_context = EmojiContext(emojis);
 
         let base = UserBase::extract(
@@ -40,8 +88,10 @@ impl UserModel {
             UserBaseSource {
                 user,
                 username_mm: mmm::to_xml_string(&username_mm).map(MmXml).as_ref().ok(),
-                avatar: avatar.as_deref(),
+                avatar_url,
+                avatar: avatar.as_ref(),
                 emoji_context: &emoji_context,
+                instance: instance.as_ref(),
             },
         );
 
diff --git a/src/nodeinfo.rs b/src/nodeinfo.rs
index c82153d..6111307 100644
--- a/src/nodeinfo.rs
+++ b/src/nodeinfo.rs
@@ -104,6 +104,7 @@ mod tests {
     async fn test_nodeinfo() {
         std::env::set_var("MAG_C_HOST", "nattyarch.local");
         std::env::set_var("MAG_C_DATABASE_URL", "dummy");
+        std::env::set_var("MAG_C_REDIS_URL", "dummy");
 
         let config = MagnetarConfig::default();
         let config_ref = Box::leak(Box::new(config));
diff --git a/src/service/instance_cache.rs b/src/service/instance_cache.rs
new file mode 100644
index 0000000..592ead3
--- /dev/null
+++ b/src/service/instance_cache.rs
@@ -0,0 +1,89 @@
+use crate::web::ApiError;
+use lru::LruCache;
+use magnetar_calckey_model::{ck, CalckeyDbError, CalckeyModel};
+use std::sync::Arc;
+use std::time::{Duration, Instant};
+use strum::EnumVariantNames;
+use thiserror::Error;
+use tokio::sync::Mutex;
+
+#[derive(Debug, Error, EnumVariantNames)]
+pub enum RemoteInstanceCacheError {
+    #[error("Database error: {0}")]
+    DbError(#[from] CalckeyDbError),
+}
+
+impl From<RemoteInstanceCacheError> for ApiError {
+    fn from(err: RemoteInstanceCacheError) -> Self {
+        let mut api_error: ApiError = match err {
+            RemoteInstanceCacheError::DbError(err) => err.into(),
+        };
+
+        api_error.message = format!("Remote instance cache error: {}", api_error.message);
+
+        api_error
+    }
+}
+
+#[derive(Debug)]
+struct CacheEntry {
+    created: Instant,
+    data: Arc<ck::instance::Model>,
+}
+
+impl CacheEntry {
+    fn new(data: Arc<ck::instance::Model>) -> Self {
+        Self {
+            created: Instant::now(),
+            data,
+        }
+    }
+}
+
+pub struct RemoteInstanceCacheService {
+    cache: Mutex<LruCache<String, CacheEntry>>,
+    lifetime_max: Duration,
+    db: CalckeyModel,
+}
+
+impl RemoteInstanceCacheService {
+    pub(super) fn new(db: CalckeyModel, cache_size: usize, entry_lifetime: Duration) -> Self {
+        const CACHE_SIZE: usize = 256;
+
+        Self {
+            cache: Mutex::new(LruCache::new(
+                cache_size
+                    .try_into()
+                    .unwrap_or(CACHE_SIZE.try_into().unwrap()),
+            )),
+            lifetime_max: entry_lifetime,
+            db,
+        }
+    }
+
+    pub async fn get(
+        &self,
+        host: &str,
+    ) -> Result<Option<Arc<ck::instance::Model>>, RemoteInstanceCacheError> {
+        let mut read = self.cache.lock().await;
+        if let Some(item) = read.peek(host) {
+            if item.created + self.lifetime_max >= Instant::now() {
+                let data = item.data.clone();
+                read.promote(host);
+                return Ok(Some(data));
+            }
+        }
+        drop(read);
+
+        let val = self.db.get_instance(host).await?;
+
+        if val.is_none() {
+            return Ok(None);
+        }
+
+        let mut write = self.cache.lock().await;
+        let data = Arc::new(val.unwrap());
+        write.put(host.to_string(), CacheEntry::new(data.clone()));
+        Ok(Some(data))
+    }
+}
diff --git a/src/service/mod.rs b/src/service/mod.rs
index 74a091e..91c0cc3 100644
--- a/src/service/mod.rs
+++ b/src/service/mod.rs
@@ -6,15 +6,19 @@ use thiserror::Error;
 
 pub mod emoji_cache;
 pub mod generic_id_cache;
+pub mod instance_cache;
 pub mod instance_meta_cache;
 pub mod local_user_cache;
 
+#[non_exhaustive]
+
 pub struct MagnetarService {
     pub db: CalckeyModel,
     pub cache: CalckeyCache,
     pub config: &'static MagnetarConfig,
     pub local_user_cache: local_user_cache::LocalUserCacheService,
     pub instance_meta_cache: instance_meta_cache::InstanceMetaCacheService,
+    pub remote_instance_cache: instance_cache::RemoteInstanceCacheService,
     pub emoji_cache: emoji_cache::EmojiCacheService,
     pub drive_file_cache: generic_id_cache::GenericIdCacheService<ck::drive_file::Entity>,
 }
@@ -45,6 +49,11 @@ impl MagnetarService {
             local_user_cache::LocalUserCacheService::new(config, db.clone(), cache.clone()).await?;
         let instance_meta_cache = instance_meta_cache::InstanceMetaCacheService::new(db.clone());
         let emoji_cache = emoji_cache::EmojiCacheService::new(db.clone());
+        let remote_instance_cache = instance_cache::RemoteInstanceCacheService::new(
+            db.clone(),
+            256,
+            Duration::from_secs(100),
+        );
         let drive_file_cache =
             generic_id_cache::GenericIdCacheService::new(db.clone(), 128, Duration::from_secs(10));
 
@@ -54,6 +63,7 @@ impl MagnetarService {
             config,
             local_user_cache,
             instance_meta_cache,
+            remote_instance_cache,
             emoji_cache,
             drive_file_cache,
         })