Merge branch 'main' into semantic-release

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,58 +0,0 @@
-name: 🐞 Bug Report
-description: Report a bug
-labels: 'type: bug'
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ## First of all
-        1. Please search for [existing issues](https://github.com/cinnyapp/cinny-desktop/issues?q=is%3Aissue) about this problem first.
-        2. Make sure Cinny is up to date.
-        3. Make sure it's an issue with Cinny and not something else you are using.
-        4. Remember to be friendly.
-
-  - type: textarea
-    id: description
-    attributes:
-      label: Describe the bug
-      description: A clear description of what the bug is. Include screenshots if applicable.
-      placeholder: Bug description
-    validations:
-      required: true
-
-  - type: textarea
-    id: reproduction
-    attributes:
-      label: Reproduction
-      description: Steps to reproduce the behavior.
-      placeholder: |
-        1. Go to ...
-        2. Click on ...
-        3. See error
-
-  - type: textarea
-    id: expected-behavior
-    attributes:
-      label: Expected behavior
-      description: A clear description of what you expected to happen.
-
-  - type: textarea
-    id: info
-    attributes:
-      label: Platform and versions
-      description: "Provide OS, browser and Cinny version with your Homeserver."
-      placeholder: |
-       1. OS: [e.g. Windows 10, MacOS]
-       2. Cinny version: [e.g. 1.8.1]
-       3. Matrix homeserver: [e.g. matrix.org]
-       4. Downloaded from: [e.g. GitHub, Flatpak]
-      render: shell
-    validations:
-      required: true
-
-  - type: textarea
-    id: context
-    attributes:
-      label: Additional context
-      description: Add any other context about the problem here.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,5 @@
+blank_issues_enabled: false
 contact_links:
-  - name: 💬 Matrix Chat
+  - name: Features, Bug Reports, Questions
-    url: https://matrix.to/#/#cinny:matrix.org
+    url: https://github.com/cinnyapp/cinny/discussions/new/choose
-    about: Ask questions and talk to other Cinny users and the maintainers
+    about: Our preferred starting point if you have any questions or suggestions about features or behavior.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,34 +0,0 @@
-name: 💡 Feature Request
-description: Suggest an idea
-labels: 'type: feature'
-
-body:
-  - type: textarea
-    id: problem
-    attributes:
-      label: Describe the problem
-      description: A clear description of the problem this feature would solve
-      placeholder: "I'm always frustrated when..."
-    validations:
-      required: true
-
-  - type: textarea
-    id: solution
-    attributes:
-      label: "Describe the solution you'd like"
-      description: A clear description of what change you would like
-      placeholder: "I would like to..."
-    validations:
-      required: true
-
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: Alternatives considered
-      description: "Any alternative solutions you've considered"
-
-  - type: textarea
-    id: context
-    attributes:
-      label: Additional context
-      description: Add any other context about the problem here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,22 +0,0 @@
-<!-- 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. -->
-
-
-Fixes #
-
-#### Type of change
-
-- [ ] Bug fix (non-breaking change which fixes an issue)
-- [ ] New feature (non-breaking change which adds functionality)
-- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
-- [ ] This change requires a documentation update
-
-### Checklist:
-
-- [ ] My code follows the style guidelines of this project
-- [ ] I have performed a self-review of my own code
-- [ ] I have commented my code, particularly in hard-to-understand areas
-- [ ] I have made corresponding changes to the documentation
-- [ ] My changes generate no new warnings

.github/SECURITY.md

@@ -1,3 +0,0 @@
-# Reporting a Vulnerability
-
-**If you've found a security vulnerability, please report it to cinnyapp@gmail.com**

.github/workflows/test.yml

@@ -44,8 +44,35 @@ jobs:
       uses: tauri-apps/tauri-action@73fb865345c54760d875b94642314f8c0c894afa # v0.6.1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
-        TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
         NODE_OPTIONS: "--max_old_space_size=4096"
       with:
-          args: ${{ matrix.args }}
+          args: ${{ matrix.args }} --config '{"bundle":{"createUpdaterArtifacts":false}}'
+    - name: Upload macOS artifacts
+      if: matrix.platform == 'macos-latest'
+      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+      with:
+        name: release-artifacts-macos
+        path: |
+          src-tauri/target/universal-apple-darwin/release/bundle/macos/Cinny*.app
+        if-no-files-found: warn
+
+    - name: Upload Linux artifacts
+      if: matrix.platform == 'ubuntu-22.04'
+      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+      with:
+        name: release-artifacts-linux
+        path: |
+          src-tauri/target/release/bundle/deb/Cinny_*.deb
+          src-tauri/target/release/bundle/rpm/Cinny-*.rpm
+          src-tauri/target/release/bundle/appimage/Cinny_*.AppImage
+        if-no-files-found: warn
+
+    - name: Upload Windows artifacts
+      if: matrix.platform == 'windows-latest'
+      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+      with:
+        name: release-artifacts-windows
+        path: |
+          src-tauri/target/release/bundle/msi/Cinny_*_x64_*.msi
+          src-tauri/target/release/bundle/nsis/Cinny_*_x64-setup.exe
+        if-no-files-found: warn

README.md

@@ -23,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.app/v1/guides/getting-started/prerequisites).
+Firstly, to setup Rust, NodeJS and build tools follow [Tauri documentation](https://v2.tauri.app/start/prerequisites/).
 
 Now, to setup development locally run the following commands:
 * `git clone --recursive https://github.com/cinnyapp/cinny-desktop.git`

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "cinny",
-  "version": "4.10.5",
+  "version": "4.11.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cinny",
-      "version": "4.10.5",
+      "version": "4.11.2",
       "license": "AGPL-3.0-only",
       "dependencies": {
         "@tauri-apps/api": "2.7.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cinny",
-  "version": "4.10.5",
+  "version": "4.11.2",
   "description": "Yet another matrix client",
   "main": "index.js",
   "engines": {

src-tauri/Cargo.lock

@@ -548,7 +548,7 @@ checksum = "6e4de3bc4ea267985becf712dc6d9eed8b04c953b3fcfb339ebc87acd9804901"
 
 [[package]]
 name = "cinny"
-version = "4.10.5"
+version = "4.11.2"
 dependencies = [
  "serde",
  "serde_json",

src-tauri/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "cinny"
-version = "4.10.5"
+version = "4.11.2"
 description = "Yet another matrix client"
 authors = ["Ajay Bura"]
 license = "AGPL-3.0-only"

src-tauri/src/lib.rs

@@ -21,8 +21,17 @@ pub fn run() {
         .plugin(tauri_plugin_localhost::Builder::new(port).build())
         .plugin(tauri_plugin_window_state::Builder::default().build())
         .setup(move |app| {
-            let url = format!("http://localhost:{}", port).parse().unwrap();
+            // Dev: use devUrl from tauri.conf.json (http://localhost:8080) to support HMR
-            let window_url = WebviewUrl::External(url);
+            #[cfg(debug_assertions)]
+            let window_url = WebviewUrl::App(Default::default());
+
+            // Release: tauri-plugin-localhost serves bundled frontend assets on this port
+            #[cfg(not(debug_assertions))]
+            let window_url = {
+                let url = format!("http://localhost:{}", port).parse().unwrap();
+                WebviewUrl::External(url)
+            };
+
             WebviewWindowBuilder::new(app, "main".to_string(), window_url)
                 .title("Cinny")
                 .build()?;

src-tauri/tauri.conf.json

@@ -47,7 +47,7 @@
   },
   "productName": "Cinny",
   "mainBinaryName": "cinny",
-  "version": "4.10.5",
+  "version": "4.11.2",
   "identifier": "in.cinny.app",
   "plugins": {
     "updater": {
@@ -59,19 +59,7 @@
   },
   "app": {
     "security": {
-      "csp": "script-src blob: data: filesystem: ws: wss: http: https: tauri: 'unsafe-eval' 'unsafe-inline' 'self' img-src: 'self'; connect-src ipc: http://ipc.localhost"
+      "csp": "default-src 'self' blob: data: filesystem: ws: wss: http: https: tauri:; script-src 'self' 'unsafe-eval' 'unsafe-inline' blob: data: filesystem: ws: wss: http: https: tauri:; img-src 'self' data: blob: filesystem: http: https:; connect-src 'self' blob: ipc: ws: wss: http: https: http://ipc.localhost"
-    },
+    }
-    "windows": [
-      {
-        "title": "Cinny",
-        "width": 1280,
-        "height": 905,
-        "center": true,
-        "resizable": true,
-        "fullscreen": false,
-        "dragDropEnabled": false,
-        "useHttpsScheme": true
-      }
-    ]
   }
 }