Release v1.47.0

DESIGN.md

@@ -247,7 +247,7 @@ NoteDeck のスカラー設定 (選択・トグル・ユーザー preferences) 
 |---|---|---|
 | テーマ選択状態 | `theme.manual`, `theme.selectedDarkThemeId` | テーマ **定義** は `themes/*.ndtheme.json5` に別置き |
 | モード | `modes.realtime`, `modes.offline` | |
-| デック | `deck.activeProfileId`, `deck.wallpaper` | プロファイル **定義** は `profiles/*.ndprofile.json5` に別置き |
+| デック | `deck.wallpaper` | プロファイル **定義** は `profiles/*.ndprofile.json5` に別置き。アクティブプロファイルはウィンドウごとに切り替わるためファイルに持たない |
 | ミュート | `mute.emojis` 等 | ワード / インスタンスミュートはサーバー側設定 |
 | 投稿フォームの挙動 | `postForm.preview`, `postForm.rememberVisibility` 等 | ボタン構成そのものは `postform.json5` |
 | キャッシュ | `cache.evictionPreset`, `chat.cacheEnabled` 等 | |

package.json

@@ -2,7 +2,7 @@
   "name": "notedeck",
   "description": "Misskey Pro — integrated deck environment (IDE) for Misskey power users",
   "private": true,
-  "version": "1.46.2",
+  "version": "1.47.0",
   "type": "module",
   "packageManager": "pnpm@11.18.0",
   "engines": {
@@ -53,6 +53,7 @@
     "@codemirror/language-data": "^6.5.2",
     "@codemirror/lint": "^6.9.7",
     "@codemirror/lsp-client": "^6.2.5",
+    "@codemirror/merge": "^6.12.2",
     "@codemirror/state": "^6.6.0",
     "@codemirror/view": "^6.43.1",
     "@lezer/highlight": "^1.2.3",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "notedeck"
-version = "1.46.2"
+version = "1.47.0"
 description = "Misskey Pro — integrated deck environment (IDE) for Misskey power users"
 edition = "2021"
 license = "AGPL-3.0-only"
@@ -37,7 +37,7 @@ tower-http = { version = "0.6", features = ["cors"] }
 reqwest = { version = "0.12", default-features = false, features = ["rustls-tls-native-roots", "stream", "json"] }
 url = "2"
 sha2 = "0.10"
-lru = "0.16"
+lru = "0.18"
 regex = "1"
 async-trait = "0.1"
 mime_guess = "2"

src-tauri/openapi.json

@@ -6,7 +6,7 @@
     "license": {
       "name": "MIT"
     },
-    "version": "1.46.2"
+    "version": "1.47.0"
   },
   "paths": {
     "/api": {

src-tauri/src/commands/settings.rs

@@ -221,10 +221,20 @@ pub async fn export_settings_json(app: tauri::AppHandle) -> Result<bool> {
     Ok(true)
 }
 
+/// import_settings_json の結果。`imported: false` はダイアログのキャンセル。
+/// `warnings` はスキップ / 別名退避したエントリの説明 (#913 付随修正 — フロントは
+/// 復元完了メッセージに件数 + 内容を表示する)。
+#[derive(serde::Serialize, specta::Type)]
+#[serde(rename_all = "camelCase")]
+pub struct ImportSettingsResult {
+    pub imported: bool,
+    pub warnings: Vec<String>,
+}
+
 /// Import settings from a JSON bundle via open dialog.
 #[tauri::command]
 #[specta::specta]
-pub async fn import_settings_json(app: tauri::AppHandle) -> Result<bool> {
+pub async fn import_settings_json(app: tauri::AppHandle) -> Result<ImportSettingsResult> {
     use std::collections::BTreeMap;
     use tauri_plugin_dialog::DialogExt;
 
@@ -237,7 +247,11 @@ pub async fn import_settings_json(app: tauri::AppHandle) -> Result<bool> {
         .blocking_pick_file();
 
     let Some(src) = src else {
-        return Ok(false); // user cancelled
+        // user cancelled
+        return Ok(ImportSettingsResult {
+            imported: false,
+            warnings: vec![],
+        });
     };
 
     let src_path = src
@@ -249,7 +263,10 @@ pub async fn import_settings_json(app: tauri::AppHandle) -> Result<bool> {
     let bundle: BTreeMap<String, String> = serde_json::from_str(&raw)
         .map_err(|e| NoteDeckError::InvalidInput(format!("Invalid JSON: {e}")))?;
 
-    store::import_bundle(&base_dir, &bundle)?;
+    let warnings = store::import_bundle(&base_dir, &bundle)?;
 
-    Ok(true)
+    Ok(ImportSettingsResult {
+        imported: true,
+        warnings,
+    })
 }