pake-cli 3.1.0 → 3.2.0-beta

package/src-tauri/src/inject/style.js

@@ -1,4 +1,4 @@
-window.addEventListener('DOMContentLoaded', _event => {
+window.addEventListener("DOMContentLoaded", (_event) => {
   // Customize and transform existing functions
   const contentCSS = `
     #page #footer-wrapper,
@@ -21,7 +21,8 @@ window.addEventListener('DOMContentLoaded', _event => {
     #Rightbar > div:nth-child(6) > div.sidebar_compliance,
     #__next > div.PageWithSidebarLayout_centeringDiv___L9br > aside > div > div > a.ChatPageFollowTwitterLink_followLink__Gl2tt,
     #__next > div.PageWithSidebarLayout_centeringDiv___L9br > aside > div > div > a.Button_buttonBase__0QP_m.Button_primary__pIDjn.ChatPageDownloadLinks_downloadButton__amBRh,
-    #__next > div.PageWithSidebarLayout_centeringDiv___L9br > aside > div > div > section a[href*="/contact"] {
+    #__next > div.PageWithSidebarLayout_centeringDiv___L9br > aside > div > div > section a[href*="/contact"],
+    .dc04ec1d .c7f51894 .a1e75851, .a7f3a288 .b91228e4, .efe408db .a24007f4{
       display: none !important;
     }
 
@@ -60,6 +61,14 @@ window.addEventListener('DOMContentLoaded', _event => {
       margin-left: 10px;
     }
 
+    .a7f3a288.f0d4f23d {
+      padding-top: 34px;
+    }
+
+    .ec92d1d3 {
+      padding-top: 48px;
+    }
+
     .chakra-ui-light #app .chakra-heading,
     .chakra-ui-dark #app .chakra-heading,
     .chakra-ui-light #app .chakra-stack,
@@ -275,8 +284,16 @@ window.addEventListener('DOMContentLoaded', _event => {
       margin: 0;
       display: inline;
     }
+
+    .AppHeader .AppHeader-globalBar.js-global-bar {
+      padding-top: 35px;
+    }
+
+    .header-overlay .header-logged-out {
+      margin-top: 15px;
+    }
   `;
-  const contentStyleElement = document.createElement('style');
+  const contentStyleElement = document.createElement("style");
   contentStyleElement.innerHTML = contentCSS;
   document.head.appendChild(contentStyleElement);
 
@@ -300,7 +317,7 @@ window.addEventListener('DOMContentLoaded', _event => {
     }
 
     #root > .excalidraw-app> .excalidraw-container .App-menu.App-menu_top{
-       margin-top: 15px;
+      margin-top: 15px;
     }
 
     .geist-page nav.dashboard_nav__PRmJv,
@@ -339,8 +356,12 @@ window.addEventListener('DOMContentLoaded', _event => {
       padding-top: 20px;
     }
 
+    .h-dvh.flex-grow .bg-gradient-to-b.from-background.via-background {
+      padding-top: 40px;
+    }
+
     body > div.relative.flex.h-full.w-full.overflow-hidden.transition-colors.z-0 > div.z-\\[21\\].flex-shrink-0.overflow-x-hidden.bg-token-sidebar-surface-primary.max-md\\:\\!w-0 > div > div > div > nav > div.flex.justify-between.h-\\[60px\\].items-center.md\\:h-header-height {
-       padding-top: 25px;
+      padding-top: 25px;
     }
 
     body > div.relative.flex.h-full.w-full.overflow-hidden.transition-colors.z-0 > div.relative.flex.h-full.max-w-full.flex-1.flex-col.overflow-hidden > main > div.composer-parent.flex.h-full.flex-col.focus-visible\\:outline-0 > div.flex-1.overflow-hidden.\\@container\\/thread > div > div.absolute.left-0.right-0 > div{
@@ -436,9 +457,9 @@ window.addEventListener('DOMContentLoaded', _event => {
       }
     }
   `;
-  const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;
-  if (window['pakeConfig']?.hide_title_bar && isMac) {
-    const topPaddingStyleElement = document.createElement('style');
+  const isMac = navigator.platform.toUpperCase().indexOf("MAC") >= 0;
+  if (window["pakeConfig"]?.hide_title_bar && isMac) {
+    const topPaddingStyleElement = document.createElement("style");
     topPaddingStyleElement.innerHTML = topPaddingCSS;
     document.head.appendChild(topPaddingStyleElement);
   }

package/src-tauri/src/lib.rs

@@ -2,11 +2,13 @@
 mod app;
 mod util;
 
-use std::time::Duration;
 use tauri::Manager;
 use tauri_plugin_window_state::Builder as WindowStatePlugin;
 use tauri_plugin_window_state::StateFlags;
 
+#[cfg(target_os = "macos")]
+use std::time::Duration;
+
 use app::{
     invoke::{download_file, download_file_by_binary, send_notification},
     setup::{set_global_shortcut, set_system_tray},
@@ -19,6 +21,7 @@ pub fn run_app() {
     let tauri_app = tauri::Builder::default();
 
     let show_system_tray = pake_config.show_system_tray();
+    let hide_on_close = pake_config.windows[0].hide_on_close;
     let activation_shortcut = pake_config.windows[0].activation_shortcut.clone();
     let init_fullscreen = pake_config.windows[0].fullscreen;
 
@@ -31,6 +34,7 @@ pub fn run_app() {
         })
         .build();
 
+    #[allow(deprecated)]
     tauri_app
         .plugin(window_state_plugin)
         .plugin(tauri_plugin_oauth::init())
@@ -51,19 +55,24 @@ pub fn run_app() {
             window.show().unwrap();
             Ok(())
         })
-        .on_window_event(|_window, _event| {
-            #[cfg(target_os = "macos")]
+        .on_window_event(move |_window, _event| {
             if let tauri::WindowEvent::CloseRequested { api, .. } = _event {
-                let window = _window.clone();
-                tauri::async_runtime::spawn(async move {
-                    if window.is_fullscreen().unwrap_or(false) {
-                        window.set_fullscreen(false).unwrap();
-                        tokio::time::sleep(Duration::from_millis(900)).await;
-                    }
-                    window.minimize().unwrap();
-                    window.hide().unwrap();
-                });
-                api.prevent_close();
+                if hide_on_close {
+                    let window = _window.clone();
+                    tauri::async_runtime::spawn(async move {
+                        #[cfg(target_os = "macos")]
+                        {
+                            if window.is_fullscreen().unwrap_or(false) {
+                                window.set_fullscreen(false).unwrap();
+                                tokio::time::sleep(Duration::from_millis(900)).await;
+                            }
+                        }
+                        window.minimize().unwrap();
+                        window.hide().unwrap();
+                    });
+                    api.prevent_close();
+                }
+                // If hide_on_close is false, allow normal close behavior
             }
         })
         .run(tauri::generate_context!())

package/src-tauri/src/util.rs

@@ -40,7 +40,7 @@ pub fn get_data_dir(app: &AppHandle, package_name: String) -> PathBuf {
 }
 
 pub fn show_toast(window: &WebviewWindow, message: &str) {
-    let script = format!(r#"pakeToast("{}");"#, message);
+    let script = format!(r#"pakeToast("{message}");"#);
     window.eval(&script).unwrap();
 }
 
@@ -98,15 +98,15 @@ pub fn check_file_or_append(file_path: &str) -> String {
             Some(index) if file_stem[index + 1..].parse::<u32>().is_ok() => {
                 let base_name = &file_stem[..index];
                 counter = file_stem[index + 1..].parse::<u32>().unwrap() + 1;
-                format!("{}-{}", base_name, counter)
+                format!("{base_name}-{counter}")
             }
             _ => {
                 counter += 1;
-                format!("{}-{}", file_stem, counter)
+                format!("{file_stem}-{counter}")
             }
         };
 
-        new_path = parent_dir.join(format!("{}.{}", new_file_stem, extension));
+        new_path = parent_dir.join(format!("{new_file_stem}.{extension}"));
     }
 
     new_path.to_string_lossy().into_owned()

package/src-tauri/tauri.conf.json

@@ -1,11 +1,11 @@
 {
-  "productName": "WeRead",
-  "identifier": "com.pake.weread",
+  "productName": "Weekly",
+  "identifier": "com.pake.weekly",
   "version": "1.0.0",
   "app": {
     "withGlobalTauri": true,
     "trayIcon": {
-      "iconPath": "png/weread_512.png",
+      "iconPath": "png/weekly_512.png",
       "iconAsTemplate": false,
       "id": "pake-tray"
     }

package/src-tauri/tauri.linux.conf.json

@@ -1,12 +1,14 @@
 {
   "productName": "we-read",
   "bundle": {
-    "icon": ["png/weread_512.png"],
+    "icon": ["png/weekly.png"],
     "active": true,
     "linux": {
       "deb": {
         "depends": ["curl", "wget"],
-        "files": { "/usr/share/applications/com-pake-weread.desktop": "assets/com-pake-weread.desktop" }
+        "files": {
+          "/usr/share/applications/com-pake-weekly.desktop": "assets/com-pake-weekly.desktop"
+        }
       }
     },
     "targets": ["deb", "appimage"]

package/src-tauri/tauri.macos.conf.json

@@ -1,6 +1,6 @@
 {
   "bundle": {
-    "icon": ["icons/weread.icns"],
+    "icon": ["icons/weekly.icns"],
     "active": true,
     "macOS": {},
     "targets": ["dmg"]

package/src-tauri/tauri.windows.conf.json

@@ -1,8 +1,8 @@
 {
   "bundle": {
-    "icon": ["png/weread_256.ico", "png/weread_32.ico"],
+    "icon": ["png/weekly_256.ico", "png/weekly_32.ico"],
     "active": true,
-    "resources": ["png/weread_32.ico"],
+    "resources": ["png/weekly_32.ico"],
     "targets": ["msi"],
     "windows": {
       "digestAlgorithm": "sha256",

package/src-tauri/.pake/pake.json

@@ -1,30 +0,0 @@
-{
-    "windows": [
-        {
-            "url": "https://weread.qq.com",
-            "url_type": "web",
-            "hide_title_bar": true,
-            "fullscreen": false,
-            "width": 1200,
-            "height": 780,
-            "resizable": true,
-            "always_on_top": false,
-            "dark_mode": false,
-            "activation_shortcut": "",
-            "disabled_web_shortcuts": false
-        }
-    ],
-    "user_agent": {
-        "macos": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.1 Safari/605.1.15",
-        "linux": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36",
-        "windows": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36"
-    },
-    "system_tray": {
-        "macos": false,
-        "linux": true,
-        "windows": true
-    },
-    "system_tray_path": "png/icon_512.png",
-    "inject": [],
-    "proxy_url": ""
-}

package/src-tauri/.pake/tauri.conf.json

@@ -1,24 +0,0 @@
-{
-    "productName": "WeRead",
-    "identifier": "com.pake.bfde08",
-    "version": "1.0.0",
-    "app": {
-        "withGlobalTauri": true
-    },
-    "build": {
-        "frontendDist": "../dist"
-    },
-    "bundle": {
-        "icon": [
-            "/Users/tw93/www/Pake/src-tauri/icons/icon.icns"
-        ],
-        "active": true,
-        "macOS": {},
-        "targets": [
-            "dmg"
-        ],
-        "resources": [
-            "icons/weread.icns"
-        ]
-    }
-}

package/src-tauri/.pake/tauri.macos.conf.json

@@ -1,15 +0,0 @@
-{
-    "bundle": {
-        "icon": [
-            "/Users/tw93/www/Pake/src-tauri/icons/icon.icns"
-        ],
-        "active": true,
-        "macOS": {},
-        "targets": [
-            "dmg"
-        ],
-        "resources": [
-            "icons/weread.icns"
-        ]
-    }
-}