Merge branch 'main' into dev

.github/workflows/pake-cli.yaml

@@ -92,7 +92,7 @@ jobs:
 
       - name: Install dependencies (ubuntu only)
         if: inputs.platform == 'ubuntu-20.04'
-        uses: awalsh128/cache-apt-pkgs-action@latest
+        uses: awalsh128/cache-apt-pkgs-action@v1.4.3
         with:
           packages: libjavascriptcoregtk-4.1-dev libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev gnome-video-effects gnome-video-effects-extra
           version: 1.1

.github/workflows/pake_build_single_app.yaml

@@ -73,7 +73,7 @@ jobs:
 
       - name: Install dependencies (ubuntu only)
         if: matrix.os == 'ubuntu-latest'
-        uses: awalsh128/cache-apt-pkgs-action@latest
+        uses: awalsh128/cache-apt-pkgs-action@v1.4.3
         with:
           packages: libjavascriptcoregtk-4.1-dev libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev gnome-video-effects gnome-video-effects-extra
           version: 1.1

.github/workflows/rust-code-quality-check.yml

@@ -38,14 +38,13 @@ jobs:
           tool: cargo-hack,nextest
       - name: Install dependencies for Ubuntu
         if: matrix.os == 'ubuntu-latest'
-        uses: awalsh128/cache-apt-pkgs-action@latest
+        uses: awalsh128/cache-apt-pkgs-action@v1.4.3
         with:
           packages: libjavascriptcoregtk-4.1-dev libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev gnome-video-effects gnome-video-effects-extra
           version: 1.0
       - name: Run unit & integration tests with nextest
         run: cargo hack --feature-powerset --exclude-features cli-build nextest run --no-tests=pass
 
-
   cargo-clippy:
     name: Check codebase quality (cargo clippy)
     runs-on: ${{ matrix.os }}
@@ -64,7 +63,7 @@ jobs:
       - uses: taiki-e/install-action@cargo-hack
       - name: Install dependencies for Ubuntu
         if: matrix.os == 'ubuntu-latest'
-        uses: awalsh128/cache-apt-pkgs-action@latest
+        uses: awalsh128/cache-apt-pkgs-action@v1.4.3
         with:
           packages: libjavascriptcoregtk-4.1-dev libwebkit2gtk-4.1-dev build-essential curl wget libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev gnome-video-effects gnome-video-effects-extra
           version: 1.0

README.md

@@ -386,6 +386,13 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <sub><b>Fechin</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/GoodbyeNJN">
+            <img src="https://avatars.githubusercontent.com/u/6856639?v=4" width="90;" alt="GoodbyeNJN"/>
+            <br />
+            <sub><b>GoodbyeNJN</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/ImgBotApp">
             <img src="https://avatars.githubusercontent.com/u/31427850?v=4" width="90;" alt="ImgBotApp"/>
@@ -399,15 +406,15 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <br />
             <sub><b>Jiaqi Gu</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/Milo123459">
             <img src="https://avatars.githubusercontent.com/u/50248166?v=4" width="90;" alt="Milo123459"/>
             <br />
             <sub><b>Milo</b></sub>
         </a>
-    </td></tr>
-<tr>
+    </td>
     <td align="center">
         <a href="https://github.com/princemaple">
             <img src="https://avatars.githubusercontent.com/u/1329716?v=4" width="90;" alt="princemaple"/>
@@ -449,15 +456,15 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <br />
             <sub><b>Liusishan</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/piaoyidage">
             <img src="https://avatars.githubusercontent.com/u/5135405?v=4" width="90;" alt="piaoyidage"/>
             <br />
             <sub><b>Ranger</b></sub>
         </a>
-    </td></tr>
-<tr>
+    </td>
     <td align="center">
         <a href="https://github.com/hetz">
             <img src="https://avatars.githubusercontent.com/u/820141?v=4" width="90;" alt="hetz"/>

bin/cli.ts

@@ -30,7 +30,7 @@ program
   .option('--fullscreen', 'Start in full screen', DEFAULT.fullscreen)
   .option('--hide-title-bar', 'For Mac, hide title bar', DEFAULT.hideTitleBar)
   .option('--multi-arch', 'For Mac, both Intel and M1', DEFAULT.multiArch)
-  .option('--inject <url>', 'Injection of .js or .css files', DEFAULT.inject)
+  .option('--inject <url...>', 'Injection of .js or .css files', DEFAULT.inject)
   .option('--debug', 'Debug build and more output', DEFAULT.debug)
   .addOption(new Option('--proxy-url <url>', 'Proxy URL for all network requests').default(DEFAULT_PAKE_OPTIONS.proxyUrl).hideHelp())
   .addOption(new Option('--user-agent <string>', 'Custom user agent').default(DEFAULT.userAgent).hideHelp())

src-tauri/src/app/setup.rs

@@ -67,7 +67,9 @@ pub fn set_global_shortcut(app: &AppHandle, shortcut: String) -> tauri::Result<(
                     let last_triggered = Arc::clone(&last_triggered);
                     move |app, event, _shortcut| {
                         let mut last_triggered = last_triggered.lock().unwrap();
-                        if Instant::now().duration_since(*last_triggered) < Duration::from_millis(300) {
+                        if Instant::now().duration_since(*last_triggered)
+                            < Duration::from_millis(300)
+                        {
                             return;
                         }
                         *last_triggered = Instant::now();