Update deps

Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 3.2.9 to 3.2.10.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Commits](https://github.com/node-fetch/node-fetch/compare/v3.2.9...v3.2.10)

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/FUNDING.yml

@@ -1,2 +1,3 @@
-open_collective: cinny
+github: ajbura
 liberapay: ajbura
+open_collective: cinny

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-<!-- Please read https://github.com/ajbura/cinny/CONTRIBUTING.md before submitting your pull request -->
+<!-- Please read https://github.com/cinnyapp/cinny/blob/dev/CONTRIBUTING.md before submitting your pull request -->
 
 ### Description
 <!-- Please include a summary of the change. Please also include relevant motivation and context. List any dependencies that are required for this change. -->

.github/workflows/tauri.yml

@@ -4,89 +4,230 @@ on:
     types: [published]
 
 jobs:
-  publish-tauri:
+  # Windows-x86_64
-    strategy:
+  windows-x86_64:
-      fail-fast: false
+    runs-on: windows-latest
-      matrix:
-        platform: [macos-latest, ubuntu-latest, windows-latest]
-
-    runs-on: ${{ matrix.platform }}
     steps:
-    - name: Checkout repository
+      - name: Checkout repository
-      uses: actions/checkout@v3.0.2
+        uses: actions/checkout@v3.0.2
-      with: 
+        with: 
-        submodules: true
+          submodules: true
-    - name: Get release
+      - name: Get release
-      id: get_release
+        id: get_release
-      uses: bruceadams/get-release@3a8733307b85cd96d52772b037617bd63d99522e
+        uses: bruceadams/get-release@3a8733307b85cd96d52772b037617bd63d99522e
-      env:
+        env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    - name: Setup node
+      - name: Setup node
-      uses: actions/setup-node@v3.2.0
+        uses: actions/setup-node@v3.4.1
-      with:
+        with:
-        node-version: 16
+          node-version: 17.9.0
-    - name: Install Rust stable
+      - name: Install Rust stable
-      uses: actions-rs/toolchain@v1.0.7
+        uses: actions-rs/toolchain@v1.0.7
-      with:
+        with:
-        toolchain: stable
+          toolchain: stable
-    - name: Install dependencies (ubuntu only)
+      - name: Install cinny dependencies
-      if: matrix.platform == 'ubuntu-latest'
+        run: cd cinny && npm ci
-      run: |
+      - name: Install tauri dependencies
-        sudo apt-get update
+        run: npm ci
-        sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
+      - name: Build desktop app with Tauri
-    - name: Install cinny dependencies
+        uses: tauri-apps/tauri-action@v0.3.1
-      run: cd cinny && npm ci
+        env:
-    - name: Install tauri dependencies
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: npm ci
+          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
-    - name: Build desktop app with Tauri
+          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
-      uses: tauri-apps/tauri-action@v0.3.0
+        with:
-      env:
+          releaseId: ${{ steps.get_release.outputs.upload_url }}
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Get app version (windows)
-        TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
+        run: |
-        TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+          $json = (Get-Content "src-tauri\tauri.conf.json" -Raw) | ConvertFrom-Json
-      with:
+          $version = $json.package.version
-        releaseId: ${{ steps.get_release.outputs.upload_url }}
+          echo "Version: ${version}"
-    - name: Get app version (macos, ubuntu)
+          echo "TAURI_VERSION=${version}" >> $Env:GITHUB_ENV
-      if: matrix.platform != 'windows-latest'
+          echo "${Env:TAURI_VERSION}"
-      id: vars
+        shell: pwsh
-      run: echo ::set-output name=tag::$(jq .package.version src-tauri/tauri.conf.json | tr -d '"')
+      - name: Move msi
-    - name: Upload tagged release (macos)
+        run: mv "src-tauri\target\release\bundle\msi\Cinny_${{ env.TAURI_VERSION }}_x64_en-US.msi" "src-tauri\target\release\bundle\msi\Cinny_desktop-x86_64.msi"
-      if: matrix.platform == 'macos-latest'
+      - name: Move msi.zip
-      uses: softprops/action-gh-release@1e07f4398721186383de40550babbdf2b84acfc5
+        run: mv "src-tauri\target\release\bundle\msi\Cinny_${{ env.TAURI_VERSION }}_x64_en-US.msi.zip" "src-tauri\target\release\bundle\msi\Cinny_desktop-x86_64.msi.zip"
-      with:
+      - name: Move msi.zip.sig
-        files: |
+        run: mv "src-tauri\target\release\bundle\msi\Cinny_${{ env.TAURI_VERSION }}_x64_en-US.msi.zip.sig" "src-tauri\target\release\bundle\msi\Cinny_desktop-x86_64.msi.zip.sig"
-          src-tauri/target/release/bundle/dmg/cinny_${{ steps.vars.outputs.tag }}_x64.dmg
+      - name: Upload tagged release
-          src-tauri/target/release/bundle/macos/cinny.app.tar.gz
+        uses: softprops/action-gh-release@1e07f4398721186383de40550babbdf2b84acfc5
-          src-tauri/target/release/bundle/macos/cinny.app.tar.gz.sig
+        with:
-    - name: Upload tagged release (ubuntu)
+          files: |
-      if: matrix.platform == 'ubuntu-latest'
+            src-tauri\target\release\bundle\msi\Cinny_desktop-x86_64.msi
-      uses: softprops/action-gh-release@1e07f4398721186383de40550babbdf2b84acfc5
+            src-tauri\target\release\bundle\msi\Cinny_desktop-x86_64.msi.zip
-      with:
+            src-tauri\target\release\bundle\msi\Cinny_desktop-x86_64.msi.zip.sig
-        files: |
-          src-tauri/target/release/bundle/deb/cinny_${{ steps.vars.outputs.tag }}_amd64.deb
-          src-tauri/target/release/bundle/appimage/cinny_${{ steps.vars.outputs.tag }}_amd64.AppImage
-          src-tauri/target/release/bundle/appimage/cinny_${{ steps.vars.outputs.tag }}_amd64.AppImage.tar.gz
-          src-tauri/target/release/bundle/appimage/cinny_${{ steps.vars.outputs.tag }}_amd64.AppImage.tar.gz.sig
-    - name: Get app version (windows)
-      if: matrix.platform == 'windows-latest'
-      run: |
-        $json = (Get-Content "src-tauri\tauri.conf.json" -Raw) | ConvertFrom-Json
-        $version = $json.package.version
-        echo "Version: ${version}"
-        echo "TAURI_VERSION=${version}" >> $Env:GITHUB_ENV
-        echo "${Env:TAURI_VERSION}"
-      shell: pwsh
-    - name: Upload tagged release (windows)
-      if: matrix.platform == 'windows-latest'
-      uses: softprops/action-gh-release@1e07f4398721186383de40550babbdf2b84acfc5
-      with:
-        files: |
-          src-tauri\target\release\bundle\msi\cinny_${{ env.TAURI_VERSION }}_x64_en-US.msi
-          src-tauri\target\release\bundle\msi\cinny_${{ env.TAURI_VERSION }}_x64_en-US.msi.zip
-          src-tauri\target\release\bundle\msi\cinny_${{ env.TAURI_VERSION }}_x64_en-US.msi.zip.sig
 
+  # Linux-x86_64
+  linux-x86_64:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3.0.2
+        with: 
+          submodules: true
+      - name: Get release
+        id: get_release
+        uses: bruceadams/get-release@3a8733307b85cd96d52772b037617bd63d99522e
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Setup node
+        uses: actions/setup-node@v3.4.1
+        with:
+          node-version: 17.9.0
+      - name: Install Rust stable
+        uses: actions-rs/toolchain@v1.0.7
+        with:
+          toolchain: stable
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
+      - name: Install cinny dependencies
+        run: cd cinny && npm ci
+      - name: Install tauri dependencies
+        run: npm ci
+      - name: Build desktop app with Tauri
+        uses: tauri-apps/tauri-action@v0.3.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
+          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+        with:
+          releaseId: ${{ steps.get_release.outputs.upload_url }}
+      - name: Get app version
+        id: vars
+        run: echo ::set-output name=tag::$(jq .package.version src-tauri/tauri.conf.json | tr -d '"')
+      - name: Move deb
+        run: mv "src-tauri/target/release/bundle/deb/cinny_${{ steps.vars.outputs.tag }}_amd64.deb" "src-tauri/target/release/bundle/deb/Cinny_desktop-x86_64.deb"
+      - name: Move AppImage
+        run: mv "src-tauri/target/release/bundle/appimage/cinny_${{ steps.vars.outputs.tag }}_amd64.AppImage" "src-tauri/target/release/bundle/appimage/Cinny_desktop-x86_64.AppImage"
+      - name: Move AppImage.tar.gz
+        run: mv "src-tauri/target/release/bundle/appimage/cinny_${{ steps.vars.outputs.tag }}_amd64.AppImage.tar.gz" "src-tauri/target/release/bundle/appimage/Cinny_desktop-x86_64.AppImage.tar.gz"
+      - name: Move AppImage.tar.gz.sig
+        run: mv "src-tauri/target/release/bundle/appimage/cinny_${{ steps.vars.outputs.tag }}_amd64.AppImage.tar.gz.sig" "src-tauri/target/release/bundle/appimage/Cinny_desktop-x86_64.AppImage.tar.gz.sig"
+      - name: Upload tagged release
+        uses: softprops/action-gh-release@1e07f4398721186383de40550babbdf2b84acfc5
+        with:
+          files: |
+            src-tauri/target/release/bundle/deb/Cinny_desktop-x86_64.deb
+            src-tauri/target/release/bundle/appimage/Cinny_desktop-x86_64.AppImage
+            src-tauri/target/release/bundle/appimage/Cinny_desktop-x86_64.AppImage.tar.gz
+            src-tauri/target/release/bundle/appimage/Cinny_desktop-x86_64.AppImage.tar.gz.sig
+
+  # macos-x86_64
+  macos-x86_64:
+    runs-on: macos-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3.0.2
+        with: 
+          submodules: true
+      - name: Get release
+        id: get_release
+        uses: bruceadams/get-release@3a8733307b85cd96d52772b037617bd63d99522e
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Setup node
+        uses: actions/setup-node@v3.4.1
+        with:
+          node-version: 17.9.0
+      - name: Install Rust stable
+        uses: actions-rs/toolchain@v1.0.7
+        with:
+          toolchain: stable
+      - name: Install cinny dependencies
+        run: cd cinny && npm ci
+      - name: Install tauri dependencies
+        run: npm ci
+      - name: Build desktop app with Tauri
+        uses: tauri-apps/tauri-action@v0.3.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
+          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+        with:
+          releaseId: ${{ steps.get_release.outputs.upload_url }}
+      - name: Get app version
+        id: vars
+        run: echo ::set-output name=tag::$(jq .package.version src-tauri/tauri.conf.json | tr -d '"')
+      - name: Move dmg
+        run: mv "src-tauri/target/release/bundle/dmg/Cinny_${{ steps.vars.outputs.tag }}_x64.dmg" "src-tauri/target/release/bundle/dmg/Cinny_desktop-x86_64.dmg"
+      - name: Move app.tar.gz
+        run: mv "src-tauri/target/release/bundle/macos/Cinny.app.tar.gz" "src-tauri/target/release/bundle/macos/Cinny_desktop-x86_64.app.tar.gz"
+      - name: Move app.tar.gz.sig
+        run: mv "src-tauri/target/release/bundle/macos/Cinny.app.tar.gz.sig" "src-tauri/target/release/bundle/macos/Cinny_desktop-x86_64.app.tar.gz.sig"
+      - name: Upload tagged release
+        uses: softprops/action-gh-release@1e07f4398721186383de40550babbdf2b84acfc5
+        with:
+          files: |
+            src-tauri/target/release/bundle/dmg/Cinny_desktop-x86_64.dmg
+            src-tauri/target/release/bundle/macos/Cinny_desktop-x86_64.app.tar.gz
+            src-tauri/target/release/bundle/macos/Cinny_desktop-x86_64.app.tar.gz.sig
+
+  # macos-aarch64
+  # macos-aarch64:
+  #   runs-on: macos-12
+  #   steps:
+  #     - name: Checkout repository
+  #       uses: actions/checkout@v3.0.2
+  #       with: 
+  #         submodules: true
+  #     - name: Get release
+  #       id: get_release
+  #       uses: bruceadams/get-release@3a8733307b85cd96d52772b037617bd63d99522e
+  #       env:
+  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  #     - name: Setup node
+  #       uses: actions/setup-node@v3.4.1
+  #       with:
+  #         node-version: 17.9.0
+  #     - name: Install Rust stable
+  #       uses: actions-rs/toolchain@v1.0.7
+  #       with:
+  #         toolchain: stable
+  #     - name: Install cinny dependencies
+  #       run: cd cinny && npm ci
+  #     - name: Install tauri dependencies
+  #       run: npm ci
+  #     - name: Install rustup target aarch64 darwin
+  #       run: rustup target add aarch64-apple-darwin
+  #     - name: Build desktop app with Tauri
+  #       uses: tauri-apps/tauri-action@v0.3.1
+  #       env:
+  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  #         TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
+  #         TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+  #       with:
+  #         args: --target aarch64-apple-darwin
+  #         releaseId: ${{ steps.get_release.outputs.upload_url }}
+  #     - name: Get app version
+  #       if: always()
+  #       id: vars
+  #       run: echo ::set-output name=tag::$(jq .package.version src-tauri/tauri.conf.json | tr -d '"')
+  #     - name: Move dmg
+  #       if: always()
+  #       run: mv "src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/Cinny_${{ steps.vars.outputs.tag }}_aarch64.dmg" "src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/Cinny_desktop-aarch64.dmg"
+  #     - name: Move app.tar.gz
+  #       if: always()
+  #       run: mv "src-tauri/target/aarch64-apple-darwin/release/bundle/macos/Cinny.app.tar.gz" "src-tauri/target/aarch64-apple-darwin/release/bundle/macos/Cinny_desktop-aarch64.app.tar.gz"
+  #     - name: Move app.tar.gz.sig
+  #       if: always()
+  #       run: mv "src-tauri/target/aarch64-apple-darwin/release/bundle/macos/Cinny.app.tar.gz.sig" "src-tauri/target/aarch64-apple-darwin/release/bundle/macos/Cinny_desktop-aarch64.app.tar.gz.sig"
+  #     - name: Upload tagged release
+  #       if: always()
+  #       uses: softprops/action-gh-release@1e07f4398721186383de40550babbdf2b84acfc5
+  #       with:
+  #         files: |
+  #           src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/Cinny_desktop-aarch64.dmg
+  #           src-tauri/target/aarch64-apple-darwin/release/bundle/macos/Cinny_desktop-aarch64.tar.gz
+  #           src-tauri/target/aarch64-apple-darwin/release/bundle/macos/Cinny_desktop-aarch64.tar.gz.sig
+
+  # Upload release.json
   release-update:
-    needs: publish-tauri
+    if: always()
+    needs: [windows-x86_64, linux-x86_64, macos-x86_64] #, macos-aarch64]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository

.github/workflows/test.yml

@@ -17,9 +17,9 @@ jobs:
       with: 
         submodules: true
     - name: Setup node
-      uses: actions/setup-node@v3.2.0
+      uses: actions/setup-node@v3.4.1
       with:
-        node-version: 16
+        node-version: 17.9.0
     - name: Install Rust stable
       uses: actions-rs/toolchain@v1.0.7
       with:
@@ -34,6 +34,6 @@ jobs:
     - name: Install tauri dependencies
       run: npm ci
     - name: Build desktop app with Tauri
-      uses: tauri-apps/tauri-action@v0.3.0
+      uses: tauri-apps/tauri-action@v0.3.1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "cinny"]
 	path = cinny
-	url = https://github.com/ajbura/cinny
+	url = https://github.com/cinnyapp/cinny.git

README.md

@@ -3,14 +3,18 @@
 <a href="https://github.com/cinnyapp/cinny-desktop/releases">
   <img alt="GitHub release downloads" src="https://img.shields.io/github/downloads/cinnyapp/cinny-desktop/total?style=social"></a>
 
-Dekstop app of Cinny made with Tauri. Cinny is a matrix client focusing primarily on simple, elegant and secure interface.
+Cinny is a matrix client focusing primarily on simple, elegant and secure interface. The desktop app is made with Tauri.
-
-![Image](resources/screenshot2.png)
 
 ## Download
 
 Installers for macOS, Windows and Linux can be downloaded from [Github releases](https://github.com/cinnyapp/cinny-desktop/releases). Releases are signed with a [Ed25519](https://ed25519.cr.yp.to/) public-key.
 
+Operating System | Download
+---|---
+Windows | <a href='https://github.com/cinnyapp/cinny-desktop/releases/latest/download/Cinny_desktop-x86_64.msi'>Get it on Windows</a>
+macOS | <a href='https://github.com/cinnyapp/cinny-desktop/releases/latest/download/Cinny_desktop-x86_64.dmg'>Get it on macOS</a>
+Linux | <a href='https://github.com/cinnyapp/cinny-desktop/releases/latest/download/Cinny_desktop-x86_64.AppImage'>Get it on Linux</a>
+
 Decoded pulic key:
 > RWRflTUQD3RHFtn25QNANCmePR9+4LSK89kAKTMEEB4OKpOFpLMgc64z
 
@@ -19,7 +23,7 @@ To verify release files, you need to download [minisign](https://jedisct1.github
 
 ## Local development
 
-Firstly, to setup Rust, NodeJS and build tools follow [Tauri documentation](https://tauri.studio/docs/getting-started/prerequisites).
+Firstly, to setup Rust, NodeJS and build tools follow [Tauri documentation](https://tauri.app/v1/guides/getting-started/prerequisites).
 
 Now, to setup development locally run the following commands:
 * `git clone --recursive https://github.com/cinnyapp/cinny-desktop.git`

package-lock.json

@@ -1,24 +1,24 @@
 {
   "name": "cinny",
-  "version": "2.0.4",
+  "version": "2.1.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "cinny",
-      "version": "2.0.4",
+      "version": "2.1.3",
       "license": "MIT",
       "dependencies": {
-        "@tauri-apps/api": "^1.0.0-rc.6"
+        "@tauri-apps/api": "^1.0.2"
       },
       "devDependencies": {
         "@actions/github": "^5.0.3",
-        "@tauri-apps/cli": "^1.0.0-rc.13",
+        "@tauri-apps/cli": "^1.0.5",
-        "node-fetch": "^3.2.3"
+        "node-fetch": "^3.2.10"
       },
       "engines": {
-        "node": ">=14.6.0",
+        "node": ">=14.15.0 <=17.9.0",
-        "npm": ">=6.14.11"
+        "npm": ">=6.14.8 <=8.5.5"
       }
     },
     "node_modules/@actions/github": {
@@ -174,14 +174,11 @@
       }
     },
     "node_modules/@tauri-apps/api": {
-      "version": "1.0.0-rc.6",
+      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-1.0.0-rc.6.tgz",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-1.0.2.tgz",
-      "integrity": "sha512-/PbVs3/dUzid0/1XbML8tAkRSOmp+6Gv9ql02HGt3aIjNTvaL2902qEbiTX6xK++3oUoKJJ88t+V6IiNd1JUkw==",
+      "integrity": "sha512-yuNW0oeJ1/ZA7wNF1KgxhHrSu5viPVzY/UgUczzN5ptLM8dH15Juy5rEGkoHfeXGju90Y/l22hi3BtIrp/za+w==",
-      "dependencies": {
-        "type-fest": "2.12.2"
-      },
       "engines": {
-        "node": ">= 12.13.0",
+        "node": ">= 12.22.0",
         "npm": ">= 6.6.0",
         "yarn": ">= 1.19.1"
       },
@@ -191,9 +188,9 @@
       }
     },
     "node_modules/@tauri-apps/cli": {
-      "version": "1.0.0-rc.13",
+      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-1.0.0-rc.13.tgz",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-1.0.5.tgz",
-      "integrity": "sha512-q7i45Mi1SMv5XllNoX09QS4Q/fYVFwD6piVYmqMSrKY/T5RwedQhytiVH60TxC2xk6o0akVHa7BdYiyJvXNR8A==",
+      "integrity": "sha512-vbY+MwK+xN65x0R/o16UQPxBtJl8pmzVzC0TZKokZfmeOkomoqOEOinSwznAMeyR1ZMJW+fXVgJCPvGsRQ0LGg==",
       "dev": true,
       "bin": {
         "tauri": "tauri.js"
@@ -206,21 +203,21 @@
         "url": "https://opencollective.com/tauri"
       },
       "optionalDependencies": {
-        "@tauri-apps/cli-darwin-arm64": "1.0.0-rc.13",
+        "@tauri-apps/cli-darwin-arm64": "1.0.5",
-        "@tauri-apps/cli-darwin-x64": "1.0.0-rc.13",
+        "@tauri-apps/cli-darwin-x64": "1.0.5",
-        "@tauri-apps/cli-linux-arm-gnueabihf": "1.0.0-rc.13",
+        "@tauri-apps/cli-linux-arm-gnueabihf": "1.0.5",
-        "@tauri-apps/cli-linux-arm64-gnu": "1.0.0-rc.13",
+        "@tauri-apps/cli-linux-arm64-gnu": "1.0.5",
-        "@tauri-apps/cli-linux-arm64-musl": "1.0.0-rc.13",
+        "@tauri-apps/cli-linux-arm64-musl": "1.0.5",
-        "@tauri-apps/cli-linux-x64-gnu": "1.0.0-rc.13",
+        "@tauri-apps/cli-linux-x64-gnu": "1.0.5",
-        "@tauri-apps/cli-linux-x64-musl": "1.0.0-rc.13",
+        "@tauri-apps/cli-linux-x64-musl": "1.0.5",
-        "@tauri-apps/cli-win32-ia32-msvc": "1.0.0-rc.13",
+        "@tauri-apps/cli-win32-ia32-msvc": "1.0.5",
-        "@tauri-apps/cli-win32-x64-msvc": "1.0.0-rc.13"
+        "@tauri-apps/cli-win32-x64-msvc": "1.0.5"
       }
     },
     "node_modules/@tauri-apps/cli-darwin-arm64": {
-      "version": "1.0.0-rc.13",
+      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.0.0-rc.13.tgz",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.0.5.tgz",
-      "integrity": "sha512-/EqOz7ASHOU98H58Ibbkg12pLG/P5oyQz8OlueaMYryajkJdmi+bHTkJ05DfbS0owAaHkRJ6f+NmoW/AnyqUbg==",
+      "integrity": "sha512-oxpFb9ZeMiC3xPUJ9NsXWCnnwFSVkPbJUvDKpc9IaoDIUpsMTV72W4P0Nh0uQRbyhx4modPpstt7+ONypNVYNg==",
       "cpu": [
         "arm64"
       ],
@@ -234,9 +231,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-darwin-x64": {
-      "version": "1.0.0-rc.13",
+      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.0.0-rc.13.tgz",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.0.5.tgz",
-      "integrity": "sha512-bvZ0MBKFD1kc4gdVPXgwUA6tHNKj0EmlQK0Xolk6PYP9vZZeNTP1vejevW0bh2IqxC8DuqUArbG9USXwu+LFbQ==",
+      "integrity": "sha512-hRNYC6L9edz2dEqK33tssPylF2ti6x6udidBlGWc5GSoeEb/05qKMEA1MESQYKBG+4q+wjJvACA2vvz6AfgJ3Q==",
       "cpu": [
         "x64"
       ],
@@ -250,9 +247,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-linux-arm-gnueabihf": {
-      "version": "1.0.0-rc.13",
+      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.0.0-rc.13.tgz",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.0.5.tgz",
-      "integrity": "sha512-yODvfUkNvtYYdDTOJSDXMx9fpoEB66I2PTrYx1UKonKTEaLrQDcpw2exD/S9LPQzCYgyTuJ/kHRhG1uLdO/UUQ==",
+      "integrity": "sha512-hc/Jp3TtFpxB8XVkLEwWy7MNcUBlS8rNCafQBUt4KSElXB+/oGo50jPO+wd5GSMSOR59UCzH08v11P0b+sAa/w==",
       "cpu": [
         "arm"
       ],
@@ -266,9 +263,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-linux-arm64-gnu": {
-      "version": "1.0.0-rc.13",
+      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.0.0-rc.13.tgz",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.0.5.tgz",
-      "integrity": "sha512-kVDJHERD8CmTeMcd2VTnD/nVCHdnNAK8a6ur3l0KTR1iF8A1AtN/sPahMQjK4f7Ar00UDjIzTw74liqakOeiZg==",
+      "integrity": "sha512-btFlkD2PG+yzJBZzWeJmyCy8ZV+iys2Jl66Fs4g9lSi3KrBDnyfQ26RpGZb2pRfkkcVP8/x1WSfByO+Rj+PTBA==",
       "cpu": [
         "arm64"
       ],
@@ -282,9 +279,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-linux-arm64-musl": {
-      "version": "1.0.0-rc.13",
+      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.0.0-rc.13.tgz",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.0.5.tgz",
-      "integrity": "sha512-PFHz+0xKCGMqqn2TmbOSPvTRS61xJQV7srwTZjs5sHBvK536mdBnF/6V6BPEvTn5LzfRnxMu2A5X5GFkYnrZ7w==",
+      "integrity": "sha512-p5JFdWab2AWhfgAZW/mgOLu+YiIJXKV0NdATGmdiBgQCMmz1k/FM8iOFApCgGbo3/zkR58cJ7Z7hyWmQ07M6Pw==",
       "cpu": [
         "arm64"
       ],
@@ -298,9 +295,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-linux-x64-gnu": {
-      "version": "1.0.0-rc.13",
+      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.0.0-rc.13.tgz",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.0.5.tgz",
-      "integrity": "sha512-EWhTOUNHaaMM7mxp/ue+Osnzn6/o9/7qVle3MSnNI9pGQzumc/dOtBs+sWS/NPXdVEiWKET2mFMK120KJlYcQQ==",
+      "integrity": "sha512-fOXR635AXxwSO7MCfBhMLnGpcg1H83XGw9ocuyg4jjvtE8QoYPwC4ksfb5lLhDVMui9iIKY93NAK3EkQiSGGmQ==",
       "cpu": [
         "x64"
       ],
@@ -314,9 +311,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-linux-x64-musl": {
-      "version": "1.0.0-rc.13",
+      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.0.0-rc.13.tgz",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.0.5.tgz",
-      "integrity": "sha512-i8lsKw5iAGTAhqSQHeUCISLjhRXNrloHPoFCaSZtU0/GAPGbW/qST7u593h7cKWxRooeMwzo74ij4GhgmddClQ==",
+      "integrity": "sha512-8be4zJVkuMs427JqONhFx5Ia5zWsQ5tbZXd80C3dHNL+5/3VIOK6nGQ0iijyZSLXiE9JKEH2jp1EHB+1TVJRcw==",
       "cpu": [
         "x64"
       ],
@@ -330,9 +327,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-win32-ia32-msvc": {
-      "version": "1.0.0-rc.13",
+      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.0.0-rc.13.tgz",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.0.5.tgz",
-      "integrity": "sha512-rJxSqWIQXeeT2oLzSiQyqZPgDKSGH5sK7MUr8cOCBitqy3T0COlOMX4O7hhqF3cJ/5s0aX+MuNZBzF/D0QUcxA==",
+      "integrity": "sha512-WpnIfzS1e4InGhvd1IDSKC3w6kbI5c6oJgMmtkMTBlhjhiZXhZmQF4XA784A5Y13pzsbXnbNJKOp8DuPVkoTRQ==",
       "cpu": [
         "ia32"
       ],
@@ -346,9 +343,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-win32-x64-msvc": {
-      "version": "1.0.0-rc.13",
+      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.0.0-rc.13.tgz",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.0.5.tgz",
-      "integrity": "sha512-ifOTrJVQoBAQUYX+EVnE4XJ/FCMHs4FQ8qxGNszqkSxrU24mmT7La6tzj77352q80KnxRa05xjjLL6GGhmzXRg==",
+      "integrity": "sha512-8iEhVD3X4LZfrlxEPOV+mAj4QrJrEqKTICiJnwmgjvhYQOOsNHzg5kca7pcBbqcgorQOBydLpfGJtxWRusVPaw==",
       "cpu": [
         "x64"
       ],
@@ -446,9 +443,9 @@
       }
     },
     "node_modules/node-fetch": {
-      "version": "3.2.4",
+      "version": "3.2.10",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.4.tgz",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.10.tgz",
-      "integrity": "sha512-WvYJRN7mMyOLurFR2YpysQGuwYrJN+qrrpHjJDuKMcSPdfFccRUla/kng2mz6HWSBxJcqPbvatS6Gb4RhOzCJw==",
+      "integrity": "sha512-MhuzNwdURnZ1Cp4XTazr69K0BTizsBroX7Zx3UgDSVcZYKF/6p0CBe4EUb/hLqmzVhl0UpYfgRljQ4yxE+iCxA==",
       "dev": true,
       "dependencies": {
         "data-uri-to-buffer": "^4.0.0",
@@ -487,17 +484,6 @@
         "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
       }
     },
-    "node_modules/type-fest": {
-      "version": "2.12.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.12.2.tgz",
-      "integrity": "sha512-qt6ylCGpLjZ7AaODxbpyBZSs9fCI9SkL3Z9q2oxMBQhs/uyY+VD8jHA8ULCGmWQJlBgqvO3EJeAngOHD8zQCrQ==",
-      "engines": {
-        "node": ">=12.20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/universal-user-agent": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
@@ -675,90 +661,87 @@
       }
     },
     "@tauri-apps/api": {
-      "version": "1.0.0-rc.6",
+      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-1.0.0-rc.6.tgz",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-1.0.2.tgz",
-      "integrity": "sha512-/PbVs3/dUzid0/1XbML8tAkRSOmp+6Gv9ql02HGt3aIjNTvaL2902qEbiTX6xK++3oUoKJJ88t+V6IiNd1JUkw==",
+      "integrity": "sha512-yuNW0oeJ1/ZA7wNF1KgxhHrSu5viPVzY/UgUczzN5ptLM8dH15Juy5rEGkoHfeXGju90Y/l22hi3BtIrp/za+w=="
-      "requires": {
-        "type-fest": "2.12.2"
-      }
     },
     "@tauri-apps/cli": {
-      "version": "1.0.0-rc.13",
+      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-1.0.0-rc.13.tgz",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-1.0.5.tgz",
-      "integrity": "sha512-q7i45Mi1SMv5XllNoX09QS4Q/fYVFwD6piVYmqMSrKY/T5RwedQhytiVH60TxC2xk6o0akVHa7BdYiyJvXNR8A==",
+      "integrity": "sha512-vbY+MwK+xN65x0R/o16UQPxBtJl8pmzVzC0TZKokZfmeOkomoqOEOinSwznAMeyR1ZMJW+fXVgJCPvGsRQ0LGg==",
       "dev": true,
       "requires": {
-        "@tauri-apps/cli-darwin-arm64": "1.0.0-rc.13",
+        "@tauri-apps/cli-darwin-arm64": "1.0.5",
-        "@tauri-apps/cli-darwin-x64": "1.0.0-rc.13",
+        "@tauri-apps/cli-darwin-x64": "1.0.5",
-        "@tauri-apps/cli-linux-arm-gnueabihf": "1.0.0-rc.13",
+        "@tauri-apps/cli-linux-arm-gnueabihf": "1.0.5",
-        "@tauri-apps/cli-linux-arm64-gnu": "1.0.0-rc.13",
+        "@tauri-apps/cli-linux-arm64-gnu": "1.0.5",
-        "@tauri-apps/cli-linux-arm64-musl": "1.0.0-rc.13",
+        "@tauri-apps/cli-linux-arm64-musl": "1.0.5",
-        "@tauri-apps/cli-linux-x64-gnu": "1.0.0-rc.13",
+        "@tauri-apps/cli-linux-x64-gnu": "1.0.5",
-        "@tauri-apps/cli-linux-x64-musl": "1.0.0-rc.13",
+        "@tauri-apps/cli-linux-x64-musl": "1.0.5",
-        "@tauri-apps/cli-win32-ia32-msvc": "1.0.0-rc.13",
+        "@tauri-apps/cli-win32-ia32-msvc": "1.0.5",
-        "@tauri-apps/cli-win32-x64-msvc": "1.0.0-rc.13"
+        "@tauri-apps/cli-win32-x64-msvc": "1.0.5"
       }
     },
     "@tauri-apps/cli-darwin-arm64": {
-      "version": "1.0.0-rc.13",
+      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.0.0-rc.13.tgz",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.0.5.tgz",
-      "integrity": "sha512-/EqOz7ASHOU98H58Ibbkg12pLG/P5oyQz8OlueaMYryajkJdmi+bHTkJ05DfbS0owAaHkRJ6f+NmoW/AnyqUbg==",
+      "integrity": "sha512-oxpFb9ZeMiC3xPUJ9NsXWCnnwFSVkPbJUvDKpc9IaoDIUpsMTV72W4P0Nh0uQRbyhx4modPpstt7+ONypNVYNg==",
       "dev": true,
       "optional": true
     },
     "@tauri-apps/cli-darwin-x64": {
-      "version": "1.0.0-rc.13",
+      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.0.0-rc.13.tgz",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.0.5.tgz",
-      "integrity": "sha512-bvZ0MBKFD1kc4gdVPXgwUA6tHNKj0EmlQK0Xolk6PYP9vZZeNTP1vejevW0bh2IqxC8DuqUArbG9USXwu+LFbQ==",
+      "integrity": "sha512-hRNYC6L9edz2dEqK33tssPylF2ti6x6udidBlGWc5GSoeEb/05qKMEA1MESQYKBG+4q+wjJvACA2vvz6AfgJ3Q==",
       "dev": true,
       "optional": true
     },
     "@tauri-apps/cli-linux-arm-gnueabihf": {
-      "version": "1.0.0-rc.13",
+      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.0.0-rc.13.tgz",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.0.5.tgz",
-      "integrity": "sha512-yODvfUkNvtYYdDTOJSDXMx9fpoEB66I2PTrYx1UKonKTEaLrQDcpw2exD/S9LPQzCYgyTuJ/kHRhG1uLdO/UUQ==",
+      "integrity": "sha512-hc/Jp3TtFpxB8XVkLEwWy7MNcUBlS8rNCafQBUt4KSElXB+/oGo50jPO+wd5GSMSOR59UCzH08v11P0b+sAa/w==",
       "dev": true,
       "optional": true
     },
     "@tauri-apps/cli-linux-arm64-gnu": {
-      "version": "1.0.0-rc.13",
+      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.0.0-rc.13.tgz",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.0.5.tgz",
-      "integrity": "sha512-kVDJHERD8CmTeMcd2VTnD/nVCHdnNAK8a6ur3l0KTR1iF8A1AtN/sPahMQjK4f7Ar00UDjIzTw74liqakOeiZg==",
+      "integrity": "sha512-btFlkD2PG+yzJBZzWeJmyCy8ZV+iys2Jl66Fs4g9lSi3KrBDnyfQ26RpGZb2pRfkkcVP8/x1WSfByO+Rj+PTBA==",
       "dev": true,
       "optional": true
     },
     "@tauri-apps/cli-linux-arm64-musl": {
-      "version": "1.0.0-rc.13",
+      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.0.0-rc.13.tgz",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.0.5.tgz",
-      "integrity": "sha512-PFHz+0xKCGMqqn2TmbOSPvTRS61xJQV7srwTZjs5sHBvK536mdBnF/6V6BPEvTn5LzfRnxMu2A5X5GFkYnrZ7w==",
+      "integrity": "sha512-p5JFdWab2AWhfgAZW/mgOLu+YiIJXKV0NdATGmdiBgQCMmz1k/FM8iOFApCgGbo3/zkR58cJ7Z7hyWmQ07M6Pw==",
       "dev": true,
       "optional": true
     },
     "@tauri-apps/cli-linux-x64-gnu": {
-      "version": "1.0.0-rc.13",
+      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.0.0-rc.13.tgz",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.0.5.tgz",
-      "integrity": "sha512-EWhTOUNHaaMM7mxp/ue+Osnzn6/o9/7qVle3MSnNI9pGQzumc/dOtBs+sWS/NPXdVEiWKET2mFMK120KJlYcQQ==",
+      "integrity": "sha512-fOXR635AXxwSO7MCfBhMLnGpcg1H83XGw9ocuyg4jjvtE8QoYPwC4ksfb5lLhDVMui9iIKY93NAK3EkQiSGGmQ==",
       "dev": true,
       "optional": true
     },
     "@tauri-apps/cli-linux-x64-musl": {
-      "version": "1.0.0-rc.13",
+      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.0.0-rc.13.tgz",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.0.5.tgz",
-      "integrity": "sha512-i8lsKw5iAGTAhqSQHeUCISLjhRXNrloHPoFCaSZtU0/GAPGbW/qST7u593h7cKWxRooeMwzo74ij4GhgmddClQ==",
+      "integrity": "sha512-8be4zJVkuMs427JqONhFx5Ia5zWsQ5tbZXd80C3dHNL+5/3VIOK6nGQ0iijyZSLXiE9JKEH2jp1EHB+1TVJRcw==",
       "dev": true,
       "optional": true
     },
     "@tauri-apps/cli-win32-ia32-msvc": {
-      "version": "1.0.0-rc.13",
+      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.0.0-rc.13.tgz",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.0.5.tgz",
-      "integrity": "sha512-rJxSqWIQXeeT2oLzSiQyqZPgDKSGH5sK7MUr8cOCBitqy3T0COlOMX4O7hhqF3cJ/5s0aX+MuNZBzF/D0QUcxA==",
+      "integrity": "sha512-WpnIfzS1e4InGhvd1IDSKC3w6kbI5c6oJgMmtkMTBlhjhiZXhZmQF4XA784A5Y13pzsbXnbNJKOp8DuPVkoTRQ==",
       "dev": true,
       "optional": true
     },
     "@tauri-apps/cli-win32-x64-msvc": {
-      "version": "1.0.0-rc.13",
+      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.0.0-rc.13.tgz",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.0.5.tgz",
-      "integrity": "sha512-ifOTrJVQoBAQUYX+EVnE4XJ/FCMHs4FQ8qxGNszqkSxrU24mmT7La6tzj77352q80KnxRa05xjjLL6GGhmzXRg==",
+      "integrity": "sha512-8iEhVD3X4LZfrlxEPOV+mAj4QrJrEqKTICiJnwmgjvhYQOOsNHzg5kca7pcBbqcgorQOBydLpfGJtxWRusVPaw==",
       "dev": true,
       "optional": true
     },
@@ -812,9 +795,9 @@
       "dev": true
     },
     "node-fetch": {
-      "version": "3.2.4",
+      "version": "3.2.10",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.4.tgz",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.10.tgz",
-      "integrity": "sha512-WvYJRN7mMyOLurFR2YpysQGuwYrJN+qrrpHjJDuKMcSPdfFccRUla/kng2mz6HWSBxJcqPbvatS6Gb4RhOzCJw==",
+      "integrity": "sha512-MhuzNwdURnZ1Cp4XTazr69K0BTizsBroX7Zx3UgDSVcZYKF/6p0CBe4EUb/hLqmzVhl0UpYfgRljQ4yxE+iCxA==",
       "dev": true,
       "requires": {
         "data-uri-to-buffer": "^4.0.0",
@@ -843,11 +826,6 @@
       "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
       "dev": true
     },
-    "type-fest": {
-      "version": "2.12.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.12.2.tgz",
-      "integrity": "sha512-qt6ylCGpLjZ7AaODxbpyBZSs9fCI9SkL3Z9q2oxMBQhs/uyY+VD8jHA8ULCGmWQJlBgqvO3EJeAngOHD8zQCrQ=="
-    },
     "universal-user-agent": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cinny",
-  "version": "2.0.4",
+  "version": "2.1.3",
   "description": "Yet another matrix client",
   "main": "index.js",
   "engines": {
@@ -15,11 +15,11 @@
   "author": "Ajay Bura",
   "license": "MIT",
   "dependencies": {
-    "@tauri-apps/api": "^1.0.0-rc.6"
+    "@tauri-apps/api": "^1.0.2"
   },
   "devDependencies": {
     "@actions/github": "^5.0.3",
-    "@tauri-apps/cli": "^1.0.0-rc.13",
+    "@tauri-apps/cli": "^1.0.5",
-    "node-fetch": "^3.2.3"
+    "node-fetch": "^3.2.10"
   }
 }

resources/in.cinny.Cinny.appdata.xml

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-  <id>in.cinny.Cinny</id>
-  
-  <name>Cinny</name>
-  <summary>Yet another matrix client with simple, elegant and secure interface.</summary>
-  <developer_name>Ajay Bura</developer_name>
-  
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>MIT</project_license>
-  
-  <url type="homepage">https://cinny.in</url>
-  <url type="bugtracker">https://github.com/ajbura/cinny/issues</url>
-  <url type="donation">https://cinny.in/#sponsor</url>
-  
-  <supports>
-    <control>pointing</control>
-    <control>keyboard</control>
-    <control>touch</control>
-  </supports>
-  
-  <description>
-    <p>
-      Cinny is a matrix.org client focusing primarily on simple, elegant and secure interface protected by e2ee with the power of open source.
-    </p>
-    <p>
-      Features: User-friendly design, Login and register, Full space support, Encryption and emoji verification, Ability to create new rooms and tweak settings, Support replies, markdown, message editing, Dark, light, and black themes.
-    </p>
-  </description>
-
-  <custom>
-      <value key="Purism::form_factor">workstation</value>
-      <value key="Purism::form_factor">mobile</value>
-  </custom>
-  
-  <launchable type="desktop-id">in.cinny.Cinny.desktop</launchable>
-  <screenshots>
-    <screenshot type="default">
-      <image>https://raw.githubusercontent.com/cinnyapp/cinny-desktop/main/resources/screenshot1.png</image>
-    </screenshot>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/cinnyapp/cinny-desktop/main/resources/screenshot2.png</image>
-    </screenshot>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/cinnyapp/cinny-desktop/main/resources/screenshot3.png</image>
-    </screenshot>
-  </screenshots>
-
-  <releases>
-      <release version="2.0.3" date="2022-05-15"/>
-  </releases>
-  <content_rating type="oars-1.1"/>
-</component>

resources/in.cinny.Cinny.desktop

@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-
-Name=Cinny
-Comment=Yet another matrix client with simple, elegant and secure interface.
-Icon=cinny
-Exec=cinny
-Terminal=false
-Categories=Network;InstantMessaging;
-Keywords=Matrix;matrix.org;chat;irc;communications;talk;riot;element;fractal;voip;
-X-Purism-FormFactor=Workstation;Mobile;

scripts/release.mjs

@@ -31,33 +31,41 @@ async function createTauriRelease() {
   const latestRelease = await repos.getReleaseByTag({ ...repoMetaData, tag: latestTag.name });
   const latestAssets = latestRelease.data.assets;
 
-  const win64 = {};
+  const windowsX86_64 = {};
-  const linux = {};
+  const linuxX86_64 = {};
-  const darwin = {};
+  const darwinX86_64 = {};
+  // const darwinAarch64 = {};
 
   const promises = latestAssets.map(async (asset) => {
     const { name, browser_download_url } = asset;
 
     if (/\.msi\.zip$/.test(name)) {
-      win64.url = browser_download_url;
+      windowsX86_64.url = browser_download_url;
     }
     if (/\.msi\.zip\.sig$/.test(name)) {
-      win64.signature = await getAssetSign(browser_download_url);
+      windowsX86_64.signature = await getAssetSign(browser_download_url);
     }
 
     if (/\.AppImage\.tar\.gz$/.test(name)) {
-      linux.url = browser_download_url;
+      linuxX86_64.url = browser_download_url;
     }
     if (/\.AppImage\.tar\.gz\.sig$/.test(name)) {
-      linux.signature = await getAssetSign(browser_download_url);
+      linuxX86_64.signature = await getAssetSign(browser_download_url);
     }
 
-    if (/\.app\.tar\.gz$/.test(name)) {
+    if (/x86_64\.app\.tar\.gz$/.test(name)) {
-      darwin.url = browser_download_url;
+      darwinX86_64.url = browser_download_url;
     }
-    if (/\.app\.tar\.gz\.sig$/.test(name)) {
+    if (/x86_64\.app\.tar\.gz\.sig$/.test(name)) {
-      darwin.signature = await getAssetSign(browser_download_url);
+      darwinX86_64.signature = await getAssetSign(browser_download_url);
     }
+
+    // if (/aarch64\.app\.tar\.gz$/.test(name)) {
+    //   darwinAarch64.url = browser_download_url;
+    // }
+    // if (/aarch64\.app\.tar\.gz\.sig$/.test(name)) {
+    //   darwinAarch64.signature = await getAssetSign(browser_download_url);
+    // }
   });
 
   await Promise.allSettled(promises);
@@ -69,14 +77,17 @@ async function createTauriRelease() {
     platforms: {},
   };
 
-  if (win64.url) releaseData.platforms["windows-x86_64"] = win64;
+  if (windowsX86_64.url) releaseData.platforms["windows-x86_64"] = windowsX86_64;
-  else console.error('Failed to get release for win64');
+  else console.error('Failed to get release for windowsX86_64');
 
-  if (linux.url) releaseData.platforms["linux-x86_64"] = linux;
+  if (linuxX86_64.url) releaseData.platforms["linux-x86_64"] = linuxX86_64;
-  else console.error('Failed to get release for linux');
+  else console.error('Failed to get release for linuxX86_64');
 
-  if (darwin.url) releaseData.platforms["darwin-x86_64"] = darwin;
+  if (darwinX86_64.url) releaseData.platforms["darwin-x86_64"] = darwinX86_64;
-  else console.error('Failed to get release for darwin');
+  else console.error('Failed to get release for darwinX86_64');
+
+  // if (darwinAarch64.url) releaseData.platforms["darwin-aarch64"] = darwinAarch64;
+  // else console.error('Failed to get release for darwinAarch64');
 
   const releaseResult = await repos.getReleaseByTag({ ...repoMetaData, tag: 'tauri' });
   const tauriRelease = releaseResult.data;

src-tauri/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "cinny"
-version = "2.0.4"
+version = "2.1.3"
 description = "Yet another matrix client"
 authors = ["Ajay Bura"]
 license = "MIT"
@@ -12,12 +12,12 @@ edition = "2021"
 rust-version = "1.61"
 
 [build-dependencies]
-tauri-build = { version = "1.0.0-rc.12", features = [] }
+tauri-build = { version = "1.0.4", features = [] }
 
 [dependencies]
-serde_json = "1.0.81"
+serde_json = "1.0.85"
-serde = { version = "1.0.137", features = ["derive"] }
+serde = { version = "1.0.144", features = ["derive"] }
-tauri = { version = "1.0.0-rc.14", features = ["api-all", "devtools", "updater"] }
+tauri = { version = "1.0.5", features = ["api-all", "devtools", "updater"] }
 
 [features]
 # by default Tauri runs in production mode

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "package": {
     "productName": "Cinny",
-    "version": "2.0.4"
+    "version": "2.1.3"
   },
   "build": {
     "distDir": "../cinny/dist",
@@ -41,7 +41,11 @@
       "windows": {
         "certificateThumbprint": null,
         "digestAlgorithm": "sha256",
-        "timestampUrl": ""
+        "timestampUrl": "",
+        "wix": {
+          "bannerPath": "wix/banner.bmp",
+          "dialogImagePath": "wix/dialogImage.bmp"
+        }
       }
     },
     "updater": {