Update renovate.json5

Co-authored-by: Laurent Cozic <laurent22@users.noreply.github.com>

.eslintrc.js

@@ -15,6 +15,19 @@ module.exports = {
 	'globals': {
 		'Atomics': 'readonly',
 		'SharedArrayBuffer': 'readonly',
+		'BufferEncoding': 'readonly',
+		'AsyncIterable': 'readonly',
+		'FileSystemFileHandle': 'readonly',
+		'FileSystemDirectoryHandle': 'readonly',
+		'ReadableStreamDefaultReader': 'readonly',
+		'FileSystemCreateWritableOptions': 'readonly',
+		'FileSystemHandle': 'readonly',
+		'IDBTransactionMode': 'readonly',
+
+		// ServiceWorker
+		'ExtendableEvent': 'readonly',
+		'WindowClient': 'readonly',
+		'FetchEvent': 'readonly',
 
 		// Jest variables
 		'test': 'readonly',
@@ -70,6 +83,10 @@ module.exports = {
 		'no-var': ['error'],
 		'no-new-func': ['error'],
 		'import/prefer-default-export': ['error'],
+		'prefer-promise-reject-errors': ['error', {
+			allowEmptyReject: true,
+		}],
+		'no-throw-literal': ['error'],
 
 		// This rule should not be enabled since it matters in what order
 		// imports are done, in particular in relation to the shim.setReact
@@ -101,6 +118,19 @@ module.exports = {
 		'no-unneeded-ternary': 'error',
 		'github/array-foreach': ['error'],
 
+		'no-restricted-properties': ['error',
+			{
+				'property': 'focus',
+				'message': 'Please use focusHandler::focus() instead',
+			},
+			{
+				'property': 'blur',
+				'message': 'Please use focusHandler::blur() instead',
+			},
+		],
+
+		'@typescript-eslint/no-explicit-any': ['error'],
+
 		// -------------------------------
 		// Formatting
 		// -------------------------------
@@ -253,7 +283,15 @@ module.exports = {
 						selector: 'enumMember',
 						format: null,
 						'filter': {
-							'regex': '^(GET|POST|PUT|DELETE|PATCH|HEAD|SQLite|PostgreSQL|ASC|DESC|E2EE|OR|AND|UNION|INTERSECT|EXCLUSION|INCLUSION|EUR|GBP|USD|SJCL.*)$',
+							'regex': '^(GET|POST|PUT|DELETE|PATCH|HEAD|SQLite|PostgreSQL|ASC|DESC|E2EE|OR|AND|UNION|INTERSECT|EXCLUSION|INCLUSION|EUR|GBP|USD|SJCL.*|iOS)$',
+							'match': true,
+						},
+					},
+					{
+						selector: 'enumMember',
+						format: null,
+						'filter': {
+							'regex': '^(sha1|sha256|sha384|sha512|AES_128_GCM|AES_192_GCM|AES_256_GCM)$',
 							'match': true,
 						},
 					},

.github/scripts/run_ci.sh

@@ -67,6 +67,7 @@ echo "IS_MACOS=$IS_MACOS"
 echo "Node $( node -v )"
 echo "Npm $( npm -v )"
 echo "Yarn $( yarn -v )"
+echo "Rust $( rustc --version )"
 
 # =============================================================================
 # Install packages
@@ -90,7 +91,7 @@ if [ "$RUN_TESTS" == "1" ]; then
 	# On Linux, we run the Joplin Server tests using PostgreSQL
 	if [ "$IS_LINUX" == "1" ]; then
 		echo "Running Joplin Server tests using PostgreSQL..."
-		sudo docker-compose --file docker-compose.db-dev.yml up -d
+		sudo docker compose --file docker-compose.db-dev.yml up -d
 		cmdResult=$?
 		if [ $cmdResult -ne 0 ]; then
 			exit $cmdResult
@@ -141,15 +142,13 @@ fi
 # for Linux only is sufficient.
 # =============================================================================
 
-if [ "$IS_PULL_REQUEST" == "1" ]; then
+if [ "$IS_LINUX" == "1" ]; then
-	if [ "$IS_LINUX" == "1" ]; then
+	echo "Step: Validating translations..."
-		echo "Step: Validating translations..."
 
-		node packages/tools/validate-translation.js
+	node packages/tools/validate-translation.js
-		testResult=$?
+	testResult=$?
-		if [ $testResult -ne 0 ]; then
+	if [ $testResult -ne 0 ]; then
-			exit $testResult
+		exit $testResult
-		fi
 	fi
 fi
 
@@ -179,15 +178,17 @@ fi
 # See coding_style.md
 # =============================================================================
 
-if [ "$IS_PULL_REQUEST" == "1" ]; then
+if [ "$IS_LINUX" == "1" ]; then
-	if [ "$IS_LINUX" == "1" ]; then
+	echo "Step: Checking for files that should have been ignored..."
-		echo "Step: Checking for files that should have been ignored..."
 
-		node packages/tools/checkIgnoredFiles.js 
+	# .gitignore and .eslintignore can be modified during yarn install. Reset them
-		testResult=$?
+	# so that checkIgnoredFiles works.
-		if [ $testResult -ne 0 ]; then
+	git restore .gitignore .eslintignore
-			exit $testResult
+
-		fi
+	node packages/tools/checkIgnoredFiles.js 
+	testResult=$?
+	if [ $testResult -ne 0 ]; then
+		exit $testResult
 	fi
 fi
 
@@ -196,11 +197,27 @@ fi
 # =============================================================================
 
 if [ "$RUN_TESTS" == "1" ]; then
-	echo "Step: Check that the website still builds..."
+	if [ "$IS_LINUX" == "1" ]; then
+		echo "Step: Check that the website still builds..."
 
-	mkdir -p ../joplin-website/docs
+		mkdir -p ../joplin-website/docs
-	ll ../joplin-website/docs/api/references/plugin_api
+		CROWDIN_PERSONAL_TOKEN="$CROWDIN_PERSONAL_TOKEN" yarn crowdinDownload
-	SKIP_SPONSOR_PROCESSING=1 yarn buildWebsite
+		SKIP_SPONSOR_PROCESSING=1 yarn buildWebsite
+		testResult=$?
+		if [ $testResult -ne 0 ]; then
+			exit $testResult
+		fi
+	fi
+fi
+
+# =============================================================================
+# Spellchecking
+# =============================================================================
+
+if [ "$IS_LINUX" == "1" ]; then
+	echo "Step: Spellchecking..."
+
+	yarn spellcheck --all
 	testResult=$?
 	if [ $testResult -ne 0 ]; then
 		exit $testResult

.github/workflows/automerge.yml

@@ -0,0 +1,25 @@
+name: automerge
+on:
+  schedule:
+    - cron: '*/10 * * * *'
+jobs:
+
+  # This job will make the action fail if any of the checks hasn't passed
+  # https://github.com/marketplace/actions/allcheckspassed
+  # allchecks:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: wechuli/allcheckspassed@v1
+
+  automerge:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - id: automerge
+        name: automerge
+        uses: "pascalgn/automerge-action@v0.16.3"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          MERGE_METHOD: "squash"
+          LOG: "DEBUG"

.github/workflows/build-android.yml

@@ -5,34 +5,29 @@ name: react-native-android-build-apk
 on: [push, pull_request]
 
 jobs:
-  pre_job:
+  AssembleRelease:
     if: github.repository == 'laurent22/joplin'
     runs-on: ubuntu-latest
-    outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
-    steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5
-        with:
-          concurrent_skipping: 'same_content_newer'
-
-  BuildAndroidDebug:
-    needs: pre_job
-    if: github.repository == 'laurent22/joplin' && needs.pre_job.outputs.should_skip != 'true'
-    runs-on: ubuntu-latest
     steps:
       - name: Install Linux dependencies
         run: |
           sudo apt-get update || true
           sudo apt-get install -y libsecret-1-dev
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '20'
           
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
           node-version: '18'
           cache: 'yarn'
 
+      - uses: dtolnay/rust-toolchain@stable
+
       - name: Install Yarn
         run: |
           corepack enable
@@ -40,7 +35,9 @@ jobs:
       - name: Install
         run:  yarn install
 
-      - name: Build Android Release
+      - name: Assemble Android Release
         run: |
-          cd packages/app-mobile/android && ./gradlew assembleDebug
+          cd packages/app-mobile/android
+          sed -i -- 's/signingConfig signingConfigs.release/signingConfig signingConfigs.debug/' app/build.gradle
+          ./gradlew assembleRelease
           

.github/workflows/build-macos-m1.yml

@@ -1,27 +1,15 @@
 name: Build macOS M1
 on: [push, pull_request]
 jobs:
-  pre_job:
-    if: github.repository == 'laurent22/joplin'
-    runs-on: ubuntu-latest
-    outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
-    steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5
-        with:
-          concurrent_skipping: 'same_content_newer'
-
   Main:
-    needs: pre_job
     # We always process desktop release tags, because they also publish the release
-    if: github.repository == 'laurent22/joplin' && (needs.pre_job.outputs.should_skip != 'true' || startsWith(github.ref, 'refs/tags/v'))
+    if: github.repository == 'laurent22/joplin'
     runs-on: macos-latest
     steps:
 
       - uses: actions/checkout@v4
-      - uses: olegtarasov/get-tag@v2.1
+      - uses: olegtarasov/get-tag@v2.1.3
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
           # We need to pin the version to 18.15, because 18.16+ fails with this error:
           # https://github.com/facebook/react-native/issues/36440
@@ -40,10 +28,18 @@ jobs:
           brew install pango
 
       # See github-action-main.yml for explanation
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.11'
 
+      - name: Set Publish Flag
+        run: |
+          if [[ $GIT_TAG_NAME = v* ]]; then
+            echo "PUBLISH_ENABLED=true" >> $GITHUB_ENV
+          else
+            echo "PUBLISH_ENABLED=false" >> $GITHUB_ENV
+          fi
+
       - name: Build macOS M1 app
         env:
           APPLE_ASC_PROVIDER: ${{ secrets.APPLE_ASC_PROVIDER }}
@@ -56,20 +52,23 @@ jobs:
           GH_REPO: ${{ github.repository }}
           IS_CONTINUOUS_INTEGRATION: 1
           BUILD_SEQUENCIAL: 1
+          PUBLISH_ENABLED: ${{ env.PUBLISH_ENABLED }}
         run: |
           export npm_config_arch=arm64
           export npm_config_target_arch=arm64
           yarn install
           cd packages/app-desktop
           npm pkg set 'build.mac.artifactName'='${productName}-${version}-${arch}.${ext}'
-          npm pkg set 'build.mac.target.target'='dmg'
+          npm pkg set 'build.mac.target[0].target'='dmg'
-          npm pkg set 'build.mac.target.arch[0]'='arm64'
+          npm pkg set 'build.mac.target[0].arch[0]'='arm64'
+          npm pkg set 'build.mac.target[1].target'='zip'
+          npm pkg set 'build.mac.target[1].arch[0]'='arm64'
 
-          if [[ $GIT_TAG_NAME = v* ]]; then
+          if [[ "$PUBLISH_ENABLED" == "true" ]]; then
             echo "Building and publishing desktop application..."
             PYTHON_PATH=$(which python) USE_HARD_LINKS=false yarn dist --mac --arm64
 
-            yarn renameReleaseAssets --repo="$GH_REPO" --tag="$GIT_TAG_NAME" --token="$GITHUB_TOKEN"
+            yarn modifyReleaseAssets --repo="$GH_REPO" --tag="$GIT_TAG_NAME" --token="$GITHUB_TOKEN"
           else
             echo "Building but *not* publishing desktop application..."
 
@@ -81,4 +80,4 @@ jobs:
             npm pkg set 'build.mac.identity'=null --json
 
             PYTHON_PATH=$(which python) USE_HARD_LINKS=false yarn dist  --mac --arm64 --publish=never
-          fi
+          fi

.github/workflows/cla.yml

@@ -13,7 +13,7 @@ jobs:
       - name: "CLA Assistant"
         if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
         # Beta Release
-        uses: contributor-assistant/github-action@v2.3.1
+        uses: contributor-assistant/github-action@v2.3.2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           # the below token should have repo scope and must be manually added by you in the repository's secret

.github/workflows/close-stale-issues.yml

@@ -9,7 +9,7 @@ jobs:
     if: github.repository == 'laurent22/joplin'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v4
+      - uses: actions/stale@v9
         with:
           # Use this to do a dry run from a pull request
           # debug-only: true

.github/workflows/github-actions-main.yml

@@ -1,29 +1,15 @@
 name: Joplin Continuous Integration
 on: [push, pull_request]
 jobs:
-  pre_job:
-    if: github.repository == 'laurent22/joplin'
-    # Do not use unbuntu-latest because it causes `The operation was canceled` failures:
-    # https://github.com/actions/runner-images/issues/6709
-    runs-on: ubuntu-20.04
-    outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
-    steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5
-        with:
-          concurrent_skipping: 'same_content_newer'
-
   Main:
-    needs: pre_job
     # We always process server or desktop release tags, because they also publish the release
-    if: github.repository == 'laurent22/joplin' && (needs.pre_job.outputs.should_skip != 'true' || startsWith(github.ref, 'refs/tags/server-v') || startsWith(github.ref, 'refs/tags/v'))
+    if: github.repository == 'laurent22/joplin'
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         # Do not use unbuntu-latest because it causes `The operation was canceled` failures:
         # https://github.com/actions/runner-images/issues/6709
-        os: [macos-latest, ubuntu-20.04, windows-2019]
+        os: [macos-13, ubuntu-20.04, windows-2019]
     steps:
 
       # Trying to fix random networking issues on Windows
@@ -82,8 +68,9 @@ jobs:
           sudo apt-get install -y docker-ce docker-ce-cli containerd.io
 
       - uses: actions/checkout@v4
-      - uses: olegtarasov/get-tag@v2.1
+      - uses: olegtarasov/get-tag@v2.1.3
-      - uses: actions/setup-node@v2
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: actions/setup-node@v4
         with:
           # We need to pin the version to 18.15, because 18.16+ fails with this error:
           # https://github.com/facebook/react-native/issues/36440
@@ -109,7 +96,7 @@ jobs:
       # Python to an earlier version.
       # Fixes error `ModuleNotFoundError: No module named 'distutils'`
       # Ref: https://github.com/nodejs/node-gyp/issues/2869
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.11'
 
@@ -127,6 +114,7 @@ jobs:
           BUILD_SEQUENCIAL: 1
           SERVER_REPOSITORY: joplin/server
           SERVER_TAG_PREFIX: server
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
         run: |
           "${GITHUB_WORKSPACE}/.github/scripts/run_ci.sh"
 
@@ -156,8 +144,7 @@ jobs:
           yarn install && cd packages/app-desktop && yarn dist --publish=never
 
   ServerDockerImage:
-    needs: pre_job
+    if: github.repository == 'laurent22/joplin'
-    if: github.repository == 'laurent22/joplin' && needs.pre_job.outputs.should_skip != 'true'
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -182,7 +169,7 @@ jobs:
 
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
           node-version: '18'
           cache: 'yarn'

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+	"cSpell.enabled": true
+}

.yarn/patches/husky-npm-3.1.0-5cc13e4e34.patch

@@ -0,0 +1,33 @@
+diff --git a/lib/runner/index.js b/lib/runner/index.js
+index 87e3b3957619728e3ed1ca61e2d83df1c49f928f..6d5ab905415da0577341c8f5b67d4806adcf7549 100644
+--- a/lib/runner/index.js
++++ b/lib/runner/index.js
+@@ -68,15 +68,19 @@ function run([, scriptPath, hookName = '', HUSKY_GIT_PARAMS], getStdinFn = get_s
+             return 0;
+         }
+         catch (err) {
+-            const noVerifyMessage = [
+-                'commit-msg',
+-                'pre-commit',
+-                'pre-rebase',
+-                'pre-push'
+-            ].includes(hookName)
+-                ? '(add --no-verify to bypass)'
+-                : '(cannot be bypassed with --no-verify due to Git specs)';
+-            console.log(`husky > ${hookName} hook failed ${noVerifyMessage}`);
++            // We do not want to print this "add --no-verify to bypass" message because that's
++            // literally what some developers do instead of trying to fix the errors.
++
++            // const noVerifyMessage = [
++            //     'commit-msg',
++            //     'pre-commit',
++            //     'pre-rebase',
++            //     'pre-push'
++            // ].includes(hookName)
++            //     ? '(add --no-verify to bypass)'
++            //     : '(cannot be bypassed with --no-verify due to Git specs)';
++            
++            console.log(`husky > ${hookName} hook failed (Please fix the errors listed above and try again)`);
+             return err.code;
+         }
+     });

.yarn/patches/react-native-npm-0.74.1-754c02ae9e.patch

@@ -1,8 +1,8 @@
 diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
-index 0f52b73c61625db2a3081c0950b6bdd2b06e3d40..b0fc3de4be0b3a26b638683613c63c783c2739bb 100644
+index 8a719ca35af1cc3a4192c5c5f8258fd4f7fea990..5f8831f81cd164a4f627423427ead92fa286b115 100644
 --- a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
 +++ b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
-@@ -38,7 +38,7 @@ import com.facebook.react.uimanager.common.ViewUtil;
+@@ -37,7 +37,7 @@ import com.facebook.react.uimanager.common.ViewUtil;
  import java.util.ArrayList;
  import java.util.List;
  import java.util.Queue;
@@ -11,7 +11,7 @@ index 0f52b73c61625db2a3081c0950b6bdd2b06e3d40..b0fc3de4be0b3a26b638683613c63c78
  import java.util.concurrent.atomic.AtomicReference;
  
  /**
-@@ -151,7 +151,10 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
+@@ -149,7 +149,10 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
    }
  
    private class ConcurrentOperationQueue {

.yarn/patches/rn-fetch-blob-npm-0.12.0-cf02e3c544.patch

@@ -0,0 +1,118 @@
+# Fixes sync issues caused by locale-sensitive lowercasing
+# of HTTP headers.
+# See https://github.com/laurent22/joplin/issues/10681
+diff --git a/android/src/main/java/com/RNFetchBlob/RNFetchBlobConfig.java b/android/src/main/java/com/RNFetchBlob/RNFetchBlobConfig.java
+index 8ac9e7a855162cefbf99024eb013c8a3b11de1ec..1c639cf9d84821b6ffc132960e2d1c044bedbd48 100644
+--- a/android/src/main/java/com/RNFetchBlob/RNFetchBlobConfig.java
++++ b/android/src/main/java/com/RNFetchBlob/RNFetchBlobConfig.java
+@@ -2,6 +2,7 @@ package com.RNFetchBlob;
+ 
+ import com.facebook.react.bridge.ReadableArray;
+ import com.facebook.react.bridge.ReadableMap;
++import java.util.Locale;
+ 
+ class RNFetchBlobConfig {
+ 
+@@ -33,7 +34,7 @@ class RNFetchBlobConfig {
+         }
+         if(options.hasKey("binaryContentTypes"))
+             this.binaryContentTypes = options.getArray("binaryContentTypes");
+-        if(this.path != null && path.toLowerCase().contains("?append=true")) {
++        if(this.path != null && path.toLowerCase(Locale.ROOT).contains("?append=true")) {
+             this.overwrite = false;
+         }
+         if(options.hasKey("overwrite"))
+diff --git a/android/src/main/java/com/RNFetchBlob/RNFetchBlobFS.java b/android/src/main/java/com/RNFetchBlob/RNFetchBlobFS.java
+index a4d70153f41e6c14eec65412b5b59822f1c6750b..d98c439f7b0aeb79afc82ab9f653e9c021086426 100644
+--- a/android/src/main/java/com/RNFetchBlob/RNFetchBlobFS.java
++++ b/android/src/main/java/com/RNFetchBlob/RNFetchBlobFS.java
+@@ -29,6 +29,7 @@ import java.util.ArrayList;
+ import java.util.HashMap;
+ import java.util.Map;
+ import java.util.UUID;
++import java.util.Locale;
+ 
+ class RNFetchBlobFS {
+ 
+@@ -210,7 +211,7 @@ class RNFetchBlobFS {
+                 return;
+             }
+ 
+-            switch (encoding.toLowerCase()) {
++            switch (encoding.toLowerCase(Locale.ROOT)) {
+                 case "base64" :
+                     promise.resolve(Base64.encodeToString(bytes, Base64.NO_WRAP));
+                     break;
+@@ -1050,7 +1051,7 @@ class RNFetchBlobFS {
+         if(encoding.equalsIgnoreCase("ascii")) {
+             return data.getBytes(Charset.forName("US-ASCII"));
+         }
+-        else if(encoding.toLowerCase().contains("base64")) {
++        else if(encoding.toLowerCase(Locale.ROOT).contains("base64")) {
+             return Base64.decode(data, Base64.NO_WRAP);
+ 
+         }
+diff --git a/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java b/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java
+index a8abd71833879201e3438b2fa51d712a311c4551..b70cc13c004229f69157de5f82ae5ec3abf4358e 100644
+--- a/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java
++++ b/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java
+@@ -49,6 +49,7 @@ import java.security.KeyStore;
+ import java.util.ArrayList;
+ import java.util.Arrays;
+ import java.util.List;
++import java.util.Locale;
+ import java.util.HashMap;
+ 
+ import java.util.concurrent.TimeUnit;
+@@ -300,14 +301,14 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
+                             responseFormat = ResponseFormat.UTF8;
+                     }
+                     else {
+-                        builder.header(key.toLowerCase(), value);
+-                        mheaders.put(key.toLowerCase(), value);
++                        builder.header(key.toLowerCase(Locale.ROOT), value);
++                        mheaders.put(key.toLowerCase(Locale.ROOT), value);
+                     }
+                 }
+             }
+ 
+             if(method.equalsIgnoreCase("post") || method.equalsIgnoreCase("put") || method.equalsIgnoreCase("patch")) {
+-                String cType = getHeaderIgnoreCases(mheaders, "Content-Type").toLowerCase();
++                String cType = getHeaderIgnoreCases(mheaders, "Content-Type").toLowerCase(Locale.ROOT);
+ 
+                 if(rawRequestBodyArray != null) {
+                     requestType = RequestType.Form;
+@@ -323,7 +324,7 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
+                             || rawRequestBody.startsWith(RNFetchBlobConst.CONTENT_PREFIX)) {
+                         requestType = RequestType.SingleFile;
+                     }
+-                    else if (cType.toLowerCase().contains(";base64") || cType.toLowerCase().startsWith("application/octet")) {
++                    else if (cType.toLowerCase(Locale.ROOT).contains(";base64") || cType.toLowerCase(Locale.ROOT).startsWith("application/octet")) {
+                         cType = cType.replace(";base64","").replace(";BASE64","");
+                         if(mheaders.containsKey("content-type"))
+                             mheaders.put("content-type", cType);
+@@ -686,7 +687,7 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
+         boolean isCustomBinary = false;
+         if(options.binaryContentTypes != null) {
+             for(int i = 0; i< options.binaryContentTypes.size();i++) {
+-                if(ctype.toLowerCase().contains(options.binaryContentTypes.getString(i).toLowerCase())) {
++                if(ctype.toLowerCase(Locale.ROOT).contains(options.binaryContentTypes.getString(i).toLowerCase(Locale.ROOT))) {
+                     isCustomBinary = true;
+                     break;
+                 }
+@@ -698,13 +699,13 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
+     private String getHeaderIgnoreCases(Headers headers, String field) {
+         String val = headers.get(field);
+         if(val != null) return val;
+-        return headers.get(field.toLowerCase()) == null ? "" : headers.get(field.toLowerCase());
++        return headers.get(field.toLowerCase(Locale.ROOT)) == null ? "" : headers.get(field.toLowerCase(Locale.ROOT));
+     }
+ 
+     private String getHeaderIgnoreCases(HashMap<String,String> headers, String field) {
+         String val = headers.get(field);
+         if(val != null) return val;
+-        String lowerCasedValue = headers.get(field.toLowerCase());
++        String lowerCasedValue = headers.get(field.toLowerCase(Locale.ROOT));
+         return lowerCasedValue == null ? "" : lowerCasedValue;
+     }
+ 

.yarnrc.yml

@@ -6,7 +6,7 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
     spec: "@yarnpkg/plugin-workspace-tools"
 
-yarnPath: .yarn/releases/yarn-3.6.4.cjs
+yarnPath: .yarn/releases/yarn-3.8.3.cjs
 
 logFilters:
 

Assets/WebsiteAssets/rss.xml

@@ -1,4 +1,91 @@
-<?xml version="1.0" encoding="UTF-8"?><rss xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title><![CDATA[Joplin]]></title><description><![CDATA[Joplin, the open source note-taking application]]></description><link>https://joplinapp.org</link><generator>RSS for Node</generator><lastBuildDate>Sat, 27 Jan 2024 00:00:00 GMT</lastBuildDate><atom:link href="https://joplinapp.org/rss.xml" rel="self" type="application/rss+xml"/><pubDate>Sat, 27 Jan 2024 00:00:00 GMT</pubDate><item><title><![CDATA[Support for new plugin metadata]]></title><description><![CDATA[<p>The plugin manifest now supports new properties to better describe and present your plugins on Joplin Plugins website. Those are the <code>icons</code>, <code>categories</code>, <code>screenshots</code> and <code>promo_tile</code> properties.</p>
+<?xml version="1.0" encoding="UTF-8"?><rss xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title><![CDATA[Joplin]]></title><description><![CDATA[Joplin, the open source note-taking application]]></description><link>https://joplinapp.org</link><generator>RSS for Node</generator><lastBuildDate>Mon, 01 Jul 2024 00:00:00 GMT</lastBuildDate><atom:link href="https://joplinapp.org/rss.xml" rel="self" type="application/rss+xml"/><pubDate>Mon, 01 Jul 2024 00:00:00 GMT</pubDate><item><title><![CDATA[What's new in Joplin 3.0]]></title><description><![CDATA[<h2>Desktop application<a name="desktop-application" href="#desktop-application" class="heading-anchor">🔗</a></h2>
+<h3>Trash folder<a name="trash-folder" href="#trash-folder" class="heading-anchor">🔗</a></h3>
+<p>Joplin now support a trash folder - any deleted notes or notebooks will be moved to that folder. You can also choose to have these notes permanently deleted after a number of days.</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20240701-trash.png" alt=""></p>
+<p>Support for the trash folder has a somewhat long history in Joplin since it's an obvious and important feature to add, yet it can be particularly tricky once you start realising how many parts of the app it's going to impact.</p>
+<p>Many attempts have been made over time: my first attempt was based on the note history feature. Indeed since this feature already saves versions of notes, it seems to make sense to use it for the trash feature, and indeed the note history feature <a href="https://joplinapp.org/news/20190523-221026">was designed for this originally</a>. However that approach turned to be needlessly complicated and after modifying hundreds of files just for this, the idea was dropped.</p>
+<p>The next one was based on using a <a href="https://github.com/laurent22/joplin/issues/483">special &quot;trash&quot; tag</a> - deleted notes would have this tag attached to them and would appear in a special &quot;trash&quot; folder. This approach also had <a href="https://github.com/laurent22/joplin/issues/483">many issues</a> probably the main one being that notebooks can't be tagged, which means we would have to add support for tagged notebooks and that in itself would also be a massive change.</p>
+<p><a href="https://discourse.joplinapp.org/t/trashcan/3998/16">Various</a>, <a href="https://discourse.joplinapp.org/t/poll-trash-bin-plugin/19951">ideas,</a> were also attempted using plugins, by creating a special &quot;trash folder&quot;, but in the end no such plugin was ever created, probably due to limitations of the plugin API.</p>
+<p>In the end, turned out that this <a href="https://github.com/laurent22/joplin/issues/483#issuecomment-585655742">old idea</a> of adding a &quot;deleted&quot; property to each note and notebook was the easiest approach. With this it was simpler to get to a working solution relatively quickly, and then it was a matter of ensuring that deleted notes don't appear where they shouldn't, such as search results, etc.</p>
+<h3>Joplin Cloud multi-factor authentication<a name="joplin-cloud-multi-factor-authentication" href="#joplin-cloud-multi-factor-authentication" class="heading-anchor">🔗</a></h3>
+<p>Multi-factor authentication (MFA), also known as two-factor authentication (2FA) is a security process that requires you to provide two or more verification factors to gain access to a system or account. It typically includes something you know (password), something you have (security token), and something you are (biometric verification).</p>
+<p>To better secure your account, Joplin Cloud and all Joplin applications now support MFA. To enable it, go to your Joplin Cloud profile, click on &quot;Enable multi-factor authentication&quot; and follow the instructions. Please note that all your applications will then be disconnected, so you will need to login again (your data of course will remain on the app so you won't have to download it again).</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20240701-mfa.png" alt=""></p>
+<h3>Note list with multiple columns<a name="note-list-with-multiple-columns" href="#note-list-with-multiple-columns" class="heading-anchor">🔗</a></h3>
+<p>In this release we add support for multiple columns in the note list. You can display various properties of the notes, as well as sort the notes by these properties. As usual this feature can be controlled and customised by plugins so for example it should be possible to display custom columns, and display custom information including thumbnails.</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20240701-note-list-multi.png" alt=""></p>
+<h3>Plugin API enhancement<a name="plugin-api-enhancement" href="#plugin-api-enhancement" class="heading-anchor">🔗</a></h3>
+<p>The plugin API has received several updates to facilitate easy customisation of the app As mentioned above, it is now possible to customise the new note list. Besides this, we've added support for loading PDFs and creating images from them, which can for example be used to create thumbnails.</p>
+<p>Many other small enhancements have been made to the plugin API to help you tailor the app to your needs!</p>
+<h3>View OCR data<a name="view-ocr-data" href="#view-ocr-data" class="heading-anchor">🔗</a></h3>
+<p>Now when you right-click on an image or PDF you have an option to view the OCR (Optical character recognition) data associated with it. That will allow you for example to easily copy and paste the text.</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20240701-ocr-data.png" alt=""></p>
+<h2>Plugin support on mobile<a name="plugin-support-on-mobile" href="#plugin-support-on-mobile" class="heading-anchor">🔗</a></h2>
+<p>As always, most of the above changes also apply to mobile (iOS and Android), for example the trash folder and MFA support.</p>
+<p>Additionally the mobile application now adds support for plugins. To enable the feature, go to the settings then to the &quot;Plugins&quot; section. The feature is currently in Beta, in particular it means that some plugins do not work or only partially work. Normally the app should not offer you to install a non-working plugin but that may still happen. In general if you notice any issue with this beta feature please let me us know as we're keen to improve it.</p>
+<p>Support for cross-platform plugins in Joplin is great news as it means a lot of new features become available on mobile. As of now, we have checked the following plugins and can confirm that they work on mobile:</p>
+<ul>
+<li><a href="https://joplinapp.org/plugins/plugin/com.whatever.quick-links/">Quick Links</a></li>
+<li><a href="https://joplinapp.org/plugins/plugin/com.whatever.inline-tags/">Inline Tags</a></li>
+<li><a href="https://joplinapp.org/plugins/plugin/io.github.personalizedrefrigerator.codemirror6-settings/">CodeMirror 6 settings</a></li>
+<li><a href="https://joplinapp.org/plugins/plugin/com.hieuthi.joplin.function-plot/">Function plot</a></li>
+<li><a href="https://joplinapp.org/plugins/plugin/joplin.plugin.space-indenter/">Space indenter</a></li>
+<li><a href="https://joplinapp.org/plugins/plugin/joplin.plugin.alondmnt.tag-navigator/">Inline Tag Navigator</a></li>
+</ul>
+<p>Those are just some examples - many more are working!</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20240701-mobile-plugins.png" alt=""></p>
+<h1>Full changelogs<a name="full-changelogs" href="#full-changelogs" class="heading-anchor">🔗</a></h1>
+<p>This is just an overview of the main features. The full changelogs are available there:</p>
+<ul>
+<li>Desktop: <a href="https://joplinapp.org/help/about/changelog/desktop">https://joplinapp.org/help/about/changelog/desktop</a></li>
+<li>Android: <a href="https://joplinapp.org/help/about/changelog/android/">https://joplinapp.org/help/about/changelog/android/</a></li>
+<li>iOS: <a href="https://joplinapp.org/help/about/changelog/ios/">https://joplinapp.org/help/about/changelog/ios/</a></li>
+</ul>
+]]></description><link>https://joplinapp.org/news/20240701-release-3-0</link><guid isPermaLink="false">20240701-release-3-0</guid><pubDate>Mon, 01 Jul 2024 00:00:00 GMT</pubDate><twitter-text>What&apos;s new in Joplin 3.0</twitter-text></item><item><title><![CDATA[What's new in Joplin 2.14]]></title><description><![CDATA[<h2>OCR<a name="ocr" href="#ocr" class="heading-anchor">🔗</a></h2>
+<p>Optical Character Recognition (OCR) in Joplin enables the transformation of text-containing images into machine-readable text formats. From this version you can enable OCR in the Configuration screen under the &quot;General&quot; section. Once activated, Joplin scans images and PDFs, extracting text data for searchability.</p>
+<p>While OCR search is available on both desktop and mobile apps, document scanning is limited to the desktop due to resource demands. For more information head to the <a href="https://joplinapp.org/help/apps/ocr">OCR official documentation</a>!</p>
+<h2>Bundled plugins<a name="bundled-plugins" href="#bundled-plugins" class="heading-anchor">🔗</a></h2>
+<p>Joplin will now bundle high quality plugins that we feel will benefit most users. With this version we include the great <a href="https://github.com/JackGruber/joplin-plugin-backup">Backup plugin</a> by JackGruber. This will provide another layer of safety when using Joplin as by default it will automatically backup your notes in a &quot;JoplinBackup&quot; folder in your home directory.</p>
+<p>Note that, just like any other plugin, you can change the plugin configuration or even disable it from the settings.</p>
+<h2>ENEX importer<a name="enex-importer" href="#enex-importer" class="heading-anchor">🔗</a></h2>
+<p>As usual in recent version, there are plenty of improvements to the <a href="https://joplinapp.org/help/apps/import_export#importing-from-evernote">Joplin ENEX importer</a>. Besides the various fixes and enhancement to support this format, we've added a few useful features:</p>
+<h3>Restore note links after importing an ENEX file<a name="restore-note-links-after-importing-an-enex-file" href="#restore-note-links-after-importing-an-enex-file" class="heading-anchor">🔗</a></h3>
+<p>Evernote Export files do not include the necessary information to reliably restore the links between notes, so for a long time this feature was not supported by the importer.</p>
+<p>Now however Joplin will try to guess what note is linked to what other note based on the note title, which in many cases will give the expected result. But not always - when that happens, and Joplin cannot detect the link target, the application leaves the original Evernote link. That way you can manually restore it yourself or at least find back what the note was linked to.</p>
+<h3>Import a directory of ENEX files<a name="import-a-directory-of-enex-files" href="#import-a-directory-of-enex-files" class="heading-anchor">🔗</a></h3>
+<p>It is notoriously difficult to export data from Evernote because, among other issues, you can only export one notebook at a time, which is an obvious problems when you have dozens of notebooks. Unfortunately we cannot improve this part of the process since this up to Evernote, however we now make it easier to import all these notebook files by adding support for importing a folder of ENEX files. To use this feature, go to File &gt; Import, and select one of the &quot;ENEX (Directory)&quot; options.</p>
+<p>This will process all the ENEX files in that directory and create a notebook in Joplin for each of them.</p>
+<h2>Beta Markdown editor<a name="beta-markdown-editor" href="#beta-markdown-editor" class="heading-anchor">🔗</a></h2>
+<p>This version features further improvements to the new Markdown editor based on <a href="https://codemirror.net/">CodeMirror 6</a>. The goal eventually is to be able to use the same editor on both the desktop and mobile application (which already uses CodeMirror 6), which will allow a more consistent user experience across devices.</p>
+<p>Plugin support has also been improved in this version - plugin authors can now write native CodeMirror 6 extensions using the plugin API. For more information check the documentation on <a href="https://joplinapp.org/help/api/tutorials/cm6_plugin/">how to create a Markdown plugin</a>!</p>
+<p>Another benefit of this new editor is that, in a future version, it will allow us to support plugins on the mobile application since a plugin written for the desktop app will work on mobile too. There are several other advantages that Henry <a href="https://discourse.joplinapp.org/t/pre-release-v2-13-is-now-available-updated-18-11-2023/32697/12?u=laurent">listed in this forum post</a>.</p>
+<h2>Rich text editor improvements<a name="rich-text-editor-improvements" href="#rich-text-editor-improvements" class="heading-anchor">🔗</a></h2>
+<p>We continue making improvements to the Rich Text Editor (RTE) in particular to improve interoperability with other applications, such as LibreOffice, Office or web browsers, as well as better handling of copy and paste.</p>
+<p>Another notable addition is support for setting colours, which was a frequently asked feature. To use the feature, select it from the &quot;...&quot; button in the toolbar. Note that once applied the colours will work in the Markdown editor too!</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20240301-rte-colors.png" alt=""></p>
+<p>See below for the full list of RTE changes:</p>
+<ul>
+<li>Fixed: Rich text editor: Fix context menu not shown in some cases</li>
+<li>Improved: Speed up pasting text and images in Rich Text Editor</li>
+<li>Fixed: Fix drag-and-drop of images and text in the rich text editor</li>
+<li>Fixed: Fix images with SVG data URLs corrupted in the rich text editor</li>
+<li>Fixed: Pasting rich text in the RTE sometimes result in invalid markup</li>
+<li>Fixed: Rich text editor: Fix newline behavior in new notes</li>
+<li>Improved: Add support for changing text colors in rich text editor</li>
+<li>Fixed: Fix HTML resource links lost when editing notes in the rich text editor</li>
+<li>Fixed: Fix code blocks with blank lines break tables in the rich text editor</li>
+<li>Fixed: Copied and pasted text from Firefox to RTE does not include images</li>
+<li>Fixed: Pasting rich text in the RTE sometimes result in invalid markup</li>
+<li>Fixed: Fixed copying and pasting an image from Chrome in RTE</li>
+</ul>
+<h1>Full changelog<a name="full-changelog" href="#full-changelog" class="heading-anchor">🔗</a></h1>
+<p>This is just an overview of the main features. The full changelog is available there:</p>
+<ul>
+<li>Desktop: <a href="https://joplinapp.org/help/about/changelog/desktop">https://joplinapp.org/help/about/changelog/desktop</a></li>
+<li>Android: <a href="https://joplinapp.org/help/about/changelog/android/">https://joplinapp.org/help/about/changelog/android/</a></li>
+<li>iOS: <a href="https://joplinapp.org/help/about/changelog/ios/">https://joplinapp.org/help/about/changelog/ios/</a></li>
+</ul>
+]]></description><link>https://joplinapp.org/news/20240301-release-2-14</link><guid isPermaLink="false">20240301-release-2-14</guid><pubDate>Fri, 01 Mar 2024 00:00:00 GMT</pubDate><twitter-text>What&apos;s new in Joplin 2.14</twitter-text></item><item><title><![CDATA[Support for new plugin metadata]]></title><description><![CDATA[<p>The plugin manifest now supports new properties to better describe and present your plugins on Joplin Plugins website. Those are the <code>icons</code>, <code>categories</code>, <code>screenshots</code> and <code>promo_tile</code> properties.</p>
 <h2>Icon<a name="icon" href="#icon" class="heading-anchor">🔗</a></h2>
 <p>This is the icon that will be used in various plugin pages, including in your main plugin page. It will be shown on the main result page too. If not provided, a default icon will be displayed instead.</p>
 <h2>Category<a name="category" href="#category" class="heading-anchor">🔗</a></h2>
@@ -350,18 +437,4 @@ sys 0m38.013s</p>
 </tr>
 </tbody>
 </table>
-]]></description><link>https://joplinapp.org/news/20220522-gsoc-contributors</link><guid isPermaLink="false">20220522-gsoc-contributors</guid><pubDate>Sun, 22 May 2022 00:00:00 GMT</pubDate><twitter-text>Joplin received 6 Contributor Projects for GSoC 2022! Welcome to our new contributors who will be working on these projects over summer!</twitter-text></item><item><title><![CDATA[GSoC "Contributor Proposals" phase is starting now!]]></title><description><![CDATA[<p>The &quot;Contributor Proposals&quot; phase of GSoC 2022 is starting today! If you would like to be a contributor, now is the time to choose your project idea, write your proposal, and upload it to <a href="https://summerofcode.withgoogle.com/">https://summerofcode.withgoogle.com/</a></p>
+]]></description><link>https://joplinapp.org/news/20220522-gsoc-contributors</link><guid isPermaLink="false">20220522-gsoc-contributors</guid><pubDate>Sun, 22 May 2022 00:00:00 GMT</pubDate><twitter-text>Joplin received 6 Contributor Projects for GSoC 2022! Welcome to our new contributors who will be working on these projects over summer!</twitter-text></item></channel></rss>
-<p>When it's done, please also let us know by posting an update on your forum introduction post.</p>
-<p>If you haven't created a pull request yet, it's still time to create one. Doing so will greatly increase your chances of being selected!</p>
-]]></description><link>https://joplinapp.org/news/20220405-gsoc-contributor-proposals</link><guid isPermaLink="false">20220405-gsoc-contributor-proposals</guid><pubDate>Tue, 05 Apr 2022 00:00:00 GMT</pubDate><twitter-text></twitter-text></item><item><title><![CDATA[Joplin participates in Google Summer of Code 2022!]]></title><description><![CDATA[<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20220308-gsoc-banner.png" alt=""></p>
-<p>For the third year, Joplin has been selected as a <strong>Google Summer of Code</strong> mentor organisation! We look forward to start working with the contributors on some great new projects. This year's main themes are:</p>
-<ul>
-<li><strong>Mobile and tablet development</strong> - we want to improve the mobile/tablet application on iOS and Android.</li>
-<li><strong>Plugin and external apps</strong> - leverage the Joplin API to create plugins and external apps.</li>
-<li>And of course contributors are welcome to suggest their own ideas.</li>
-</ul>
-<p>Our full idea list is available here: <a href="https://joplinapp.org/help/dev/gsoc/gsoc2022/ideas">GSoC 2022 idea list</a></p>
-<p>In the coming month (<strong>March 7 - April 3</strong>), contributors will start getting involved in the forum and start discussing project ideas with the mentors and community. It's also a good time to start looking at Joplin's source code, perhaps work on fixing bugs or implement small features to get familiar with the source code, and to show us your skills.</p>
-<p>One difference with previous years is that anyone, not just students, are allowed to participate.</p>
-<p>Additionally, last year Google only allowed smaller projects, while this year they allow again small and large projects, so we've indicated this in the idea list - the small ones are <strong>175 hours</strong>, and the large ones <strong>350 hours</strong>.</p>
-]]></description><link>https://joplinapp.org/news/20220308-gsoc2022-start</link><guid isPermaLink="false">20220308-gsoc2022-start</guid><pubDate>Tue, 08 Mar 2022 00:00:00 GMT</pubDate><twitter-text></twitter-text></item></channel></rss>

CONTRIBUTING

@@ -0,0 +1,3 @@
+# Contributing to Joplin
+
+See the guide at https://github.com/laurent22/joplin/blob/dev/readme/dev/index.md

Dockerfile.server

@@ -35,6 +35,9 @@ COPY packages/utils ./packages/utils
 COPY packages/lib ./packages/lib
 COPY packages/server ./packages/server
 
+# We don't want to build onenote-converter since it is not used by the server
+RUN sed --in-place '/onenote-converter/d' ./packages/lib/package.json
+
 # For some reason there's both a .yarn/cache and .yarn/berry/cache that are
 # being generated, and both have the same content. Not clear why it does this
 # but we can delete it anyway. We can delete the cache because we use

Joplin_install_and_update.sh

@@ -28,6 +28,7 @@ SILENT=false
 ALLOW_ROOT=false
 SHOW_CHANGELOG=false
 INCLUDE_PRE_RELEASE=false
+INSTALL_DIR="${HOME}/.joplin"   # default installation directory
 
 print() {
   if [[ "${SILENT}" == false ]]; then
@@ -57,6 +58,7 @@ showHelp() {
   print "\t" "--force" "\t" "Always download the latest version"
   print "\t" "--silent" "\t" "Don't print any output"
   print "\t" "--prerelease" "\t" "Check for new Versions including Pre-Releases"
+  print "\t" "--install-dir" "\t" "Set installation directory; default: \"${INSTALL_DIR}\""
 
   if [[ ! -z $1 ]]; then
     print "\n" "${COLOR_RED}ERROR: " "$*" "${COLOR_RESET}" "\n"
@@ -84,6 +86,7 @@ while getopts "${optspec}" OPT; do
     force )        FORCE=true ;;
     changelog )    SHOW_CHANGELOG=true ;;
     prerelease )   INCLUDE_PRE_RELEASE=true ;;
+    install-dir )  INSTALL_DIR="$OPTARG" ;;
     [^\?]* )       showHelp "Illegal option --${OPT}"; exit 2 ;;
     \? )           showHelp "Illegal option -${OPTARG}"; exit 2 ;;
   esac
@@ -120,9 +123,10 @@ fi
 print "Checking dependencies..."
 ## Check if libfuse2 is present.
 if [[ $(command -v ldconfig) ]]; then
-	LIBFUSE=$(ldconfig -p | grep "libfuse.so.2" || echo '')
+  LIBFUSE=$(ldconfig -p | grep "libfuse.so.2" || echo '')
-else
+fi
-	LIBFUSE=$(find /lib /usr/lib /lib64 /usr/lib64 /usr/local/lib -name "libfuse.so.2" 2>/dev/null | grep "libfuse.so.2" || echo '')
+if [[ $LIBFUSE == "" ]]; then
+  LIBFUSE=$(find /lib /usr/lib /lib64 /usr/lib64 /usr/local/lib -name "libfuse.so.2" 2>/dev/null | grep "libfuse.so.2" || echo '')
 fi
 if [[ $LIBFUSE == "" ]]; then
   print "${COLOR_RED}Error: Can't get libfuse2 on system, please install libfuse2${COLOR_RESET}"
@@ -142,17 +146,17 @@ else
 fi
 
 # Check if it's in the latest version
-if [[ -e ~/.joplin/VERSION ]] && [[ $(< ~/.joplin/VERSION) == "${RELEASE_VERSION}" ]]; then
+if [[ -e "${INSTALL_DIR}/VERSION" ]] && [[ $(< "${INSTALL_DIR}/VERSION") == "${RELEASE_VERSION}" ]]; then
   print "${COLOR_GREEN}You already have the latest version${COLOR_RESET} ${RELEASE_VERSION} ${COLOR_GREEN}installed.${COLOR_RESET}"
   ([[ "$FORCE" == true ]] && print "Forcing installation...") || exit 0
 else
-  [[ -e ~/.joplin/VERSION ]] && CURRENT_VERSION=$(< ~/.joplin/VERSION)
+  [[ -e "${INSTALL_DIR}/VERSION" ]] && CURRENT_VERSION=$(< "${INSTALL_DIR}/VERSION")
   print "The latest version is ${RELEASE_VERSION}, but you have ${CURRENT_VERSION:-no version} installed."
 fi
 
 # Check if it's an update or a new install
 DOWNLOAD_TYPE="New"
-if [[ -f ~/.joplin/Joplin.AppImage ]]; then
+if [[ -f "${INSTALL_DIR}/Joplin.AppImage" ]]; then
   DOWNLOAD_TYPE="Update"
 fi
 
@@ -165,16 +169,16 @@ wget -O "${TEMP_DIR}/joplin.png" https://joplinapp.org/images/Icon512.png
 #-----------------------------------------------------
 print 'Installing Joplin...'
 # Delete previous version (in future versions joplin.desktop shouldn't exist)
-rm -f ~/.joplin/*.AppImage ~/.local/share/applications/joplin.desktop ~/.joplin/VERSION
+rm -f "${INSTALL_DIR}"/*.AppImage ~/.local/share/applications/joplin.desktop "${INSTALL_DIR}/VERSION"
 
 # Creates the folder where the binary will be stored
-mkdir -p ~/.joplin/
+mkdir -p "${INSTALL_DIR}/"
 
 # Download the latest version
-mv "${TEMP_DIR}/Joplin.AppImage" ~/.joplin/Joplin.AppImage
+mv "${TEMP_DIR}/Joplin.AppImage" "${INSTALL_DIR}/Joplin.AppImage"
 
 # Gives execution privileges
-chmod +x ~/.joplin/Joplin.AppImage
+chmod +x "${INSTALL_DIR}/Joplin.AppImage"
 
 print "${COLOR_GREEN}OK${COLOR_RESET}"
 
@@ -202,16 +206,28 @@ if command -v lsb_release &> /dev/null; then
   DISTVER=$(lsb_release -is) && DISTVER=$DISTVER$(lsb_release -rs)
   DISTCODENAME=$(lsb_release -cs)
   DISTMAJOR=$(lsb_release -rs|cut -d. -f1)
+
   #-----------------------------------------------------
   # Check for "The SUID sandbox helper binary was found, but is not configured correctly" problem.
   # It is present in Debian 1X. A (temporary) patch will be applied at .desktop file
   # Linux Mint 4 Debbie is based on Debian 10 and requires the same param handling.
   #
-  # This also works around Ubuntu 23.10+'s restrictions on unprivileged user namespaces. Electron
+  # TODO: Remove: This is likely no longer an issue. See https://issues.chromium.org/issues/40462640.
+  BAD_HELPER_BINARY=false
+  if [[ $DISTVER =~ Debian1. || ( "$DISTVER" = "Linuxmint4" && "$DISTCODENAME" = "debbie" ) || ( "$DISTVER" = "CentOS" && "$DISTMAJOR" =~ 6|7 ) ]]; then
+    BAD_HELPER_BINARY=true
+  fi
+
+  # Work around Ubuntu 23.10+'s restrictions on unprivileged user namespaces. Electron
   # uses these to sandbox processes. Unfortunately, it doesn't look like we can get around this
   # without writing the AppImage to a non-user-writable location (without invalidating other security
   # controls). See https://discourse.joplinapp.org/t/possible-future-requirement-for-no-sandbox-flag-for-ubuntu-23-10/.
-  if [[ $DISTVER = "Ubuntu23.10" || $DISTVER =~ Debian1. || ( "$DISTVER" = "Linuxmint4" && "$DISTCODENAME" = "debbie" ) || ( "$DISTVER" = "CentOS" && "$DISTMAJOR" =~ 6|7 ) ]]; then
+  HAS_USERNS_RESTRICTIONS=false
+  if [[ "$DISTVER" =~ ^Ubuntu && $DISTMAJOR -ge 23 ]]; then
+    HAS_USERNS_RESTRICTIONS=true
+  fi
+
+  if [[ $HAS_USERNS_RESTRICTIONS = true || $BAD_HELPER_BINARY = true ]]; then
     SANDBOXPARAM="--no-sandbox"
     print "${COLOR_YELLOW}WARNING${COLOR_RESET} Electron sandboxing disabled."
     print "    See https://discourse.joplinapp.org/t/32160/5 for details."
@@ -241,13 +257,14 @@ if [[ $DESKTOP =~ .*gnome.*|.*kde.*|.*xfce.*|.*mate.*|.*lxqt.*|.*unity.*|.*x-cin
 Encoding=UTF-8
 Name=Joplin
 Comment=Joplin for Desktop
-Exec=${HOME}/.joplin/Joplin.AppImage ${SANDBOXPARAM} %u
+Exec=env APPIMAGELAUNCHER_DISABLE=TRUE "${INSTALL_DIR}/Joplin.AppImage" ${SANDBOXPARAM} %u
 Icon=joplin
 StartupWMClass=Joplin
 Type=Application
 Categories=Office;
 MimeType=x-scheme-handler/joplin;
-X-GNOME-SingleWindow=true // should be removed eventually as it was upstream to be an XDG specification
+# should be removed eventually as it was upstream to be an XDG specification
+X-GNOME-SingleWindow=true
 SingleMainWindow=true
 EOF
 
@@ -266,7 +283,7 @@ fi
 print "${COLOR_GREEN}Joplin version${COLOR_RESET} ${RELEASE_VERSION} ${COLOR_GREEN}installed.${COLOR_RESET}"
 
 # Record version
-echo "$RELEASE_VERSION" > ~/.joplin/VERSION
+echo "$RELEASE_VERSION" > "${INSTALL_DIR}/VERSION"
 
 #-----------------------------------------------------
 if [[ "$SHOW_CHANGELOG" == true ]]; then

README.md

@@ -31,7 +31,7 @@ Please see the [donation page](https://github.com/laurent22/joplin/blob/dev/read
 # Sponsors
 
 <!-- SPONSORS-ORG -->
-<a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a> <a href="https://www.hosting.de/nextcloud/?mtm_campaign=managed-nextcloud&amp;mtm_kwd=joplinapp&amp;mtm_source=joplinapp-webseite&amp;mtm_medium=banner"><img title="Hosting.de" width="256" src="https://joplinapp.org/images/sponsors/HostingDe.png"/></a> <a href="https://grundstueckspreise.info/"><img title="SP Software GmbH" width="256" src="https://joplinapp.org/images/sponsors/Grundstueckspreise.png"/></a> <a href="https://citricsheep.com"><img title="Citric Sheep" width="256" src="https://joplinapp.org/images/sponsors/CitricSheep.png"/></a> <a href="https://sorted.travel/?utm_source=joplinapp"><img title="Sorted Travel" width="256" src="https://joplinapp.org/images/sponsors/SortedTravel.png"/></a> <a href="https://celebian.com"><img title="Celebian" width="256" src="https://joplinapp.org/images/sponsors/Celebian.png"/></a> <a href="https://bestkru.com"><img title="BestKru" width="256" src="https://joplinapp.org/images/sponsors/BestKru.png"/></a>
+<a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a> <a href="https://www.hosting.de/nextcloud/?mtm_campaign=managed-nextcloud&amp;mtm_kwd=joplinapp&amp;mtm_source=joplinapp-webseite&amp;mtm_medium=banner"><img title="Hosting.de" width="256" src="https://joplinapp.org/images/sponsors/HostingDe.png"/></a> <a href="https://citricsheep.com"><img title="Citric Sheep" width="256" src="https://joplinapp.org/images/sponsors/CitricSheep.png"/></a> <a href="https://sorted.travel/?utm_source=joplinapp"><img title="Sorted Travel" width="256" src="https://joplinapp.org/images/sponsors/SortedTravel.png"/></a> <a href="https://celebian.com"><img title="Celebian" width="256" src="https://joplinapp.org/images/sponsors/Celebian.png"/></a> <a href="https://bestkru.com"><img title="BestKru" width="256" src="https://joplinapp.org/images/sponsors/BestKru.png"/></a> <a href="https://www.socialfollowers.uk/buy-tiktok-followers/"><img title="Social Followers" width="256" src="https://joplinapp.org/images/sponsors/SocialFollowers.png"/></a> <a href="https://stormlikes.com/"><img title="Stormlikes" width="256" src="https://joplinapp.org/images/sponsors/Stormlikes.png"/></a> <a href="https://route4me.com"><img title="Route4Me" width="256" src="https://joplinapp.org/images/sponsors/Route4Me.png"/></a> <a href="https://buyyoutubviews.com"><img title="BYTV" width="256" src="https://joplinapp.org/images/sponsors/BYTV.png"/></a> <a href="https://www.famegear.com"><img title="Famegear" width="256" src="https://joplinapp.org/images/sponsors/Famegear.png"/></a> <a href="https://casinoreviews.net"><img title="Casino Reviews" width="256" src="https://joplinapp.org/images/sponsors/CasinoReviews.png"/></a>
 <!-- SPONSORS-ORG -->
 
 * * *
@@ -39,11 +39,12 @@ Please see the [donation page](https://github.com/laurent22/joplin/blob/dev/read
 <!-- SPONSORS-GITHUB -->
 |       |       |       |       |
 | :---: | :---: | :---: | :---: |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/215668?s=96&v=4"/></br>[avanderberg](https://github.com/avanderberg) | <img width="50" src="https://avatars2.githubusercontent.com/u/67130?s=96&v=4"/></br>[chr15m](https://github.com/chr15m) | <img width="50" src="https://avatars2.githubusercontent.com/u/2793530?s=96&v=4"/></br>[CyberXZT](https://github.com/CyberXZT) | <img width="50" src="https://avatars2.githubusercontent.com/u/1307332?s=96&v=4"/></br>[dbrandonjohnson](https://github.com/dbrandonjohnson) |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/97193607?s=96&v=4"/></br>[Akhil-CM](https://github.com/Akhil-CM) | <img width="50" src="https://avatars2.githubusercontent.com/u/552452?s=96&v=4"/></br>[andypiper](https://github.com/andypiper) | <img width="50" src="https://avatars2.githubusercontent.com/u/215668?s=96&v=4"/></br>[avanderberg](https://github.com/avanderberg) | <img width="50" src="https://avatars2.githubusercontent.com/u/67130?s=96&v=4"/></br>[chr15m](https://github.com/chr15m) |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/14873877?s=96&v=4"/></br>[dchecks](https://github.com/dchecks) | <img width="50" src="https://avatars2.githubusercontent.com/u/56287?s=96&v=4"/></br>[fats](https://github.com/fats) | <img width="50" src="https://avatars2.githubusercontent.com/u/8030470?s=96&v=4"/></br>[Galliver7](https://github.com/Galliver7) | <img width="50" src="https://avatars2.githubusercontent.com/u/64712218?s=96&v=4"/></br>[Hegghammer](https://github.com/Hegghammer) |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/2793530?s=96&v=4"/></br>[CyberXZT](https://github.com/CyberXZT) | <img width="50" src="https://avatars2.githubusercontent.com/u/1307332?s=96&v=4"/></br>[dbrandonjohnson](https://github.com/dbrandonjohnson) | <img width="50" src="https://avatars2.githubusercontent.com/u/14873877?s=96&v=4"/></br>[dchecks](https://github.com/dchecks) | <img width="50" src="https://avatars2.githubusercontent.com/u/56287?s=96&v=4"/></br>[fats](https://github.com/fats) |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/1310474?s=96&v=4"/></br>[jknowles](https://github.com/jknowles) | <img width="50" src="https://avatars2.githubusercontent.com/u/11947658?s=96&v=4"/></br>[KentBrockman](https://github.com/KentBrockman) | <img width="50" src="https://avatars2.githubusercontent.com/u/24908652?s=96&v=4"/></br>[konishi-t](https://github.com/konishi-t) | <img width="50" src="https://avatars2.githubusercontent.com/u/42319182?s=96&v=4"/></br>[marcdw1289](https://github.com/marcdw1289) |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/8030470?s=96&v=4"/></br>[Galliver7](https://github.com/Galliver7) | <img width="50" src="https://avatars2.githubusercontent.com/u/64712218?s=96&v=4"/></br>[Hegghammer](https://github.com/Hegghammer) | <img width="50" src="https://avatars2.githubusercontent.com/u/2583421?s=96&v=4"/></br>[jamesandariese](https://github.com/jamesandariese) | <img width="50" src="https://avatars2.githubusercontent.com/u/1310474?s=96&v=4"/></br>[jknowles](https://github.com/jknowles) |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/126279083?s=96&v=4"/></br>[matmoly](https://github.com/matmoly) | <img width="50" src="https://avatars2.githubusercontent.com/u/1788010?s=96&v=4"/></br>[maxtruxa](https://github.com/maxtruxa) | <img width="50" src="https://avatars2.githubusercontent.com/u/4560672?s=96&v=4"/></br>[mu88](https://github.com/mu88) | <img width="50" src="https://avatars2.githubusercontent.com/u/31054972?s=96&v=4"/></br>[saarantras](https://github.com/saarantras) |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/11947658?s=96&v=4"/></br>[KentBrockman](https://github.com/KentBrockman) | <img width="50" src="https://avatars2.githubusercontent.com/u/24908652?s=96&v=4"/></br>[konishi-t](https://github.com/konishi-t) | <img width="50" src="https://avatars2.githubusercontent.com/u/42319182?s=96&v=4"/></br>[marcdw1289](https://github.com/marcdw1289) | <img width="50" src="https://avatars2.githubusercontent.com/u/126279083?s=96&v=4"/></br>[matmoly](https://github.com/matmoly) |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/327998?s=96&v=4"/></br>[sif](https://github.com/sif) | <img width="50" src="https://avatars2.githubusercontent.com/u/765564?s=96&v=4"/></br>[taskcruncher](https://github.com/taskcruncher) | <img width="50" src="https://avatars2.githubusercontent.com/u/333944?s=96&v=4"/></br>[tateisu](https://github.com/tateisu) |       |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/1788010?s=96&v=4"/></br>[maxtruxa](https://github.com/maxtruxa) | <img width="50" src="https://avatars2.githubusercontent.com/u/4560672?s=96&v=4"/></br>[mu88](https://github.com/mu88) | <img width="50" src="https://avatars2.githubusercontent.com/u/31054972?s=96&v=4"/></br>[saarantras](https://github.com/saarantras) | <img width="50" src="https://avatars2.githubusercontent.com/u/327998?s=96&v=4"/></br>[sif](https://github.com/sif) |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/765564?s=96&v=4"/></br>[taskcruncher](https://github.com/taskcruncher) | <img width="50" src="https://avatars2.githubusercontent.com/u/333944?s=96&v=4"/></br>[tateisu](https://github.com/tateisu) |       |       |
 <!-- SPONSORS-GITHUB -->
 	
 # Community

cspell.json

@@ -1,7 +1,13 @@
 {
 	"version": "0.2",
 	"language": "en_GB",
+	"ignoreRegExpList": [
+		"\\[.*?\\]\\(https:\\/\\/github.com\\/.*?\\)",
+		"by .*?\\)",
+		"\\|  (.*?)  \\|  \\d+%"
+	],
 	"ignorePaths": [
+		"**/*.d.ts",
 		"**/*.min.*",
 		"**/*.svg",
 		"/_mydocs",
@@ -11,7 +17,10 @@
 		"/Assets",
 		"/packages/app-cli/app/fuzzing.js",
 		"/packages/app-cli/build",
+		"/packages/app-cli/tests/enex_to_md/",
+		"/packages/app-cli/tests/html_to_md/",
 		"/packages/app-cli/tests/support",
+		"/packages/app-cli/tests/sync",
 		"/packages/app-cli/tests/test data",
 		"/packages/app-cli/tests/tmp",
 		"/packages/app-clipper/content_scripts/JSDOMParser.js",
@@ -20,14 +29,24 @@
 		"/packages/app-clipper/popup/build/js/0.chunk.js",
 		"/packages/app-clipper/popup/build/js/bundle.js",
 		"/packages/app-clipper/popup/build/js/main.chunk.js",
-		"/packages/app-clipper/popup/build/js/main.chunk.js",
 		"/packages/app-clipper/popup/config",
+		"/packages/app-desktop/build/",
+		"/packages/app-desktop/utils/checkForUpdatesUtilsTestData.ts",
 		"/packages/app-desktop/vendor/",
+		"/packages/app-mobile/ios/Pods/",
+		"/packages/app-mobile/lib/rnInjectedJs",
 		"/packages/app-mobile/pluginAssets",
+		"/packages/app-mobile/utils/fs-driver/runOnDeviceTests.ts",
+		"/packages/default-plugins/plugin-sources/",
+		"/packages/doc-builder/build",
+		"/packages/doc-builder/help/",
+		"/packages/doc-builder/i18n/",
+		"/packages/doc-builder/news/",
 		"/packages/fork-sax/examples",
 		"/packages/fork-sax/lib/sax.js",
 		"/packages/fork-sax/test",
 		"/packages/fork-uslug",
+		"/packages/generator-joplin/generators/app/templates/api/",
 		"/packages/lib/locales",
 		"/packages/lib/mime-utils-types.js",
 		"/packages/lib/parameters.js",
@@ -36,919 +55,39 @@
 		"/packages/lib/services/joplinServer/personalizedUserContentBaseUrl.ts",
 		"/packages/lib/vendor",
 		"/packages/lib/welcomeAssets.js",
+		"/packages/renderer/highlight.ts",
+		"/packages/server/src/utils/testing/randomWords.ts",
 		"/packages/turndown-plugin-gfm/config",
 		"/packages/turndown/config",
+		"/readme/_i18n",
+		"/readme/about/changelog/desktop.md",
+		"/readme/licenses.md",
+		"/readme/i18n",
+		"cspell.json",
 		"node_modules"
 	],
-	"words": [
+	"dictionaryDefinitions": [
-		"aàáâãäåāą",
+        {
-		"AÀÁÂÃÄÅĀĄ",
+            "name": "dictionary1",
-		"abbrev",
+            "path": "packages/tools/cspell/dictionary1.txt"
-		"ABCDEFGHIJ",
+        },
-		"Abhishek",
+        {
-		"Abkhazian",
+            "name": "dictionary2",
-		"accel",
+            "path": "packages/tools/cspell/dictionary2.txt"
-		"accum",
+        },
-		"actualkeyword",
+        {
-		"adata",
+            "name": "dictionary3",
-		"advlist",
+            "path": "packages/tools/cspell/dictionary3.txt"
-		"AGSFE",
+        },
-		"Aland",
+        {
-		"Åland",
+            "name": "dictionary4",
-		"alertbanner",
+            "path": "packages/tools/cspell/dictionary4.txt"
-		"Allaire",
+        }
-		"alse",
+	],
-		"altool",
+	"dictionaries": [
-		"aman",
+        "dictionary1",
-		"ambrt",
+        "dictionary2",
-		"Amharic",
+        "dictionary3",
-		"amothc",
+        "dictionary4"
-		"andrejilderda",
+    ]
-		"anki",
-		"Antarctique",
-		"antarctiques",
-		"Antártico",
-		"anymore",
-		"apidoc",
-		"appiconset",
-		"applewebkit",
-		"approot",
-		"arableague",
-		"Aragonés",
-		"ARITIM",
-		"armeabi",
-		"asterix",
-		"atest",
-		"atestb",
-		"attribname",
-		"attribvalue",
-		"authcode",
-		"autocompleteitem",
-		"autocompleter",
-		"Autocompleter",
-		"AUTOEXEC",
-		"autohide",
-		"Avenir",
-		"Ayiti",
-		"azamah",
-		"Azərbaycan",
-		"backoff",
-		"Bangla",
-		"Bêafrîka",
-		"beforeinput",
-		"België",
-		"Belgien",
-		"Belgique",
-		"Bénin",
-		"Bhutani",
-		"bibtex",
-		"Bihari",
-		"Bislama",
-		"blabla",
-		"blablablabla",
-		"boohay",
-		"Bosna",
-		"Bouvet",
-		"Bouvetøya",
-		"browserslist",
-		"bthqu",
-		"btns",
-		"Bulibiya",
-		"bullist",
-		"bulma",
-		"Byelorussian",
-		"calebjohn",
-		"Calédonie",
-		"Caligraphic",
-		"callsites",
-		"Cameroun",
-		"cantdothat",
-		"Capslock",
-		"cardcontainer",
-		"cardimage",
-		"cardmenuitem",
-		"cardtext",
-		"Caribisch",
-		"CAUTOEXEC",
-		"cçćč",
-		"CÇĆČ",
-		"cdataend",
-		"cdatastart",
-		"cdot",
-		"ceaf",
-		"centrafricaine",
-		"Centrafrican",
-		"Česká",
-		"changedtitle",
-		"charcodes",
-		"checkboxclick",
-		"checkmark",
-		"chemfive",
-		"choiceitem",
-		"chromedriver",
-		"chromeframe",
-		"chromeos",
-		"Città",
-		"Cmds",
-		"codepoint",
-		"colorinput",
-		"colorpicker",
-		"colorswatch",
-		"colspan",
-		"committerdate",
-		"commmmmand",
-		"commonmark",
-		"COMMONMARK",
-		"Comores",
-		"compositionend",
-		"compositionstart",
-		"compositionupdate",
-		"conflicter",
-		"contenteditable",
-		"contextform",
-		"contextformbutton",
-		"contextformtogglebutton",
-		"contextkey",
-		"contexttoolbar",
-		"continuelist",
-		"Contrl",
-		"Conv",
-		"convo",
-		"copytags",
-		"cozic",
-		"Cozic",
-		"createdb",
-		"Creds",
-		"Crna",
-		"cronspec",
-		"cros",
-		"crypted",
-		"Curaçao",
-		"curso",
-		"customeditor",
-		"customkeymap",
-		"cyingfan",
-		"d'Ivoire",
-		"Danmark",
-		"Dansk",
-		"dataimg",
-		"datauri",
-		"Datauri",
-		"datetime",
-		"Datetime",
-		"davris",
-		"dbuuid",
-		"DDTHH",
-		"deflist",
-		"deinit",
-		"Démocratique",
-		"deselector",
-		"deuxième",
-		"dflt",
-		"dialogbox",
-		"dialogs",
-		"Dialogs",
-		"DIALOGS",
-		"Distill",
-		"dists",
-		"docid",
-		"docsize",
-		"doctypes",
-		"doesnotwork",
-		"doesntexist",
-		"doesntlookright",
-		"domelementtype",
-		"domhandler",
-		"Dominicana",
-		"domutils",
-		"DONATELINKS",
-		"downarrow",
-		"dragdrop",
-		"draggesture",
-		"dünn",
-		"dylib",
-		"dynamiclib",
-		"ecuatorial",
-		"eèéêëěēę",
-		"EÈÉÊËĚĒĘ",
-		"Eesti",
-		"effet",
-		"efgh",
-		"égalité",
-		"Éire",
-		"elem",
-		"elementpath",
-		"elems",
-		"ellipsize",
-		"ELOCKED",
-		"encryptable",
-		"endregion",
-		"enex",
-		"Enex",
-		"ENEX",
-		"enumber",
-		"eqeqeq",
-		"équatoriale",
-		"Erro",
-		"errorish",
-		"escapeplus",
-		"eslintignore",
-		"España",
-		"étiquette",
-		"EUNSPECIFIED",
-		"eventname",
-		"evermeet",
-		"evernote",
-		"Evernote",
-		"execa",
-		"expando",
-		"expirable",
-		"Expirable",
-		"expval",
-		"Færøerne",
-		"Fahrräder",
-		"FAILSAFE",
-		"fallbacks",
-		"fancymenuitem",
-		"fancytype",
-		"favorites",
-		"Fiber",
-		"filepicker",
-		"folderid",
-		"foldl",
-		"fontawesome",
-		"fontface",
-		"forall",
-		"forcewake",
-		"Føroyar",
-		"fortawesome",
-		"française",
-		"françaises",
-		"Gabuutih",
-		"gedit",
-		"geoip",
-		"Geoip",
-		"geoloc",
-		"geoplugin",
-		"getlastmodified",
-		"gettext",
-		"githubusercontent",
-		"Gora",
-		"gotchas",
-		"gradlew",
-		"Grønland",
-		"grouptoolbarbutton",
-		"Gruber",
-		"gsoc",
-		"gttest",
-		"Guåhån",
-		"guarentee",
-		"guarentees",
-		"Guiena",
-		"Guiné",
-		"Guinée",
-		"gulpfile",
-		"Guyane",
-		"gvim",
-		"Haïti",
-		"hanlder",
-		"Hausa",
-		"headerless",
-		"Heisenbug",
-		"Hercegovina",
-		"hift",
-		"highjack",
-		"highlited",
-		"historyhas",
-		"HMRKG",
-		"hoge",
-		"homenote",
-		"hotfolder",
-		"Howver",
-		"hpagent",
-		"Hrvatska",
-		"htmlentities",
-		"htmlfile",
-		"htmlpack",
-		"htmlpanel",
-		"ʻĀirani",
-		"icns",
-		"iconset",
-		"iconutil",
-		"Iforgot",
-		"iframes",
-		"ihack",
-		"iife",
-		"iìíîïī",
-		"IÌÍÎÏĪ",
-		"ijkl",
-		"imagelink",
-		"imagetools",
-		"immer",
-		"iname",
-		"Incl",
-		"infint",
-		"inflim",
-		"infty",
-		"inputi",
-		"inserttable",
-		"Interlingue",
-		"Interp",
-		"interupting",
-		"Inteval",
-		"Inuktitut",
-		"Inupiak",
-		"Invididual",
-		"IOERR",
-		"Ionicons",
-		"IPHONEOS",
-		"ipify",
-		"ipwhois",
-		"iscompleted",
-		"Ísland",
-		"Italiano",
-		"Itoophiyaa",
-		"itsgone",
-		"itunes",
-		"Jabuuti",
-		"jackgruber",
-		"joeattardi",
-		"jopext",
-		"joplinapp",
-		"JOPLINAPP",
-		"joplincloud",
-		"joplindev",
-		"JOPLINMOD",
-		"joplintest",
-		"jsbundles",
-		"justtesting",
-		"Kalaallit",
-		"kalba",
-		"kanban",
-		"Kashmiri",
-		"katex",
-		"keychain",
-		"keycodes",
-		"keymaps",
-		"keytar",
-		"Kibris",
-		"Kinyarwanda",
-		"Kirundi",
-		"Ködörösêse",
-		"Komori",
-		"Kpck",
-		"Kūki",
-		"Laothian",
-		"lastmod",
-		"Latvija",
-		"lcov",
-		"leaft",
-		"leftarrow",
-		"leftequilibrium",
-		"leftrightarrow",
-		"Lettish",
-		"Lëtzebuerg",
-		"Levithan",
-		"Liban",
-		"libz",
-		"Lietuva",
-		"Lietuvių",
-		"lineheight",
-		"Lingala",
-		"linkg",
-		"linkurl",
-		"listbox",
-		"listfile",
-		"listpreview",
-		"loglevel",
-		"longclick",
-		"longpress",
-		"longpresscancel",
-		"looooooong",
-		"ltrim",
-		"Luxemburg",
-		"Maarten",
-		"Madagasikara",
-		"Magyarország",
-		"majax",
-		"Mardown",
-		"markdowncalc",
-		"Maroc",
-		"MASTERKEY",
-		"matchinfo",
-		"mathchoice",
-		"mathjax",
-		"Mathjax",
-		"MATHJAX",
-		"mathllap",
-		"mathml",
-		"mathrlap",
-		"mathrm",
-		"Mauritanie",
-		"Maxiumm",
-		"Mayen",
-		"mchem",
-		"mechanim",
-		"mediumtext",
-		"menubutton",
-		"mergeff",
-		"Metadatas",
-		"México",
-		"mhchem",
-		"middlewares",
-		"migth",
-		"mkbook",
-		"MKCOL",
-		"mkdirp",
-		"mknote",
-		"mktodo",
-		"MMYY",
-		"modifié",
-		"monokai",
-		"MONOSPACE",
-		"msgctxt",
-		"msgfmt",
-		"msgmerge",
-		"msgstr",
-		"msleep",
-		"mtext",
-		"mult",
-		"multicursor",
-		"multimarkdown",
-		"multimd",
-		"multistatus",
-		"multitable",
-		"mybucket",
-		"mydir",
-		"myfile",
-		"mynote",
-		"myplugin",
-		"mytag",
-		"mytaga",
-		"mytagb",
-		"mytagc",
-		"mytagd",
-		"mytest",
-		"mytoken",
-		"myvalue",
-		"nanoid",
-		"Neaus",
-		"Nederlands",
-		"nestedmenuitem",
-		"newone",
-		"Nextcloud",
-		"njstrace",
-		"nñňń",
-		"NÑŇŃ",
-		"NOCASE",
-		"nodechange",
-		"nodir",
-		"noexpand",
-		"nojs",
-		"nolongershared",
-		"nonlatin",
-		"NONLATIN",
-		"Noreg",
-		"Norge",
-		"nospecialcharacters",
-		"notanumber",
-		"notarization",
-		"notetags",
-		"Notif",
-		"notindexed",
-		"notthere",
-		"nounce",
-		"Nounce",
-		"Nounces",
-		"npmignore",
-		"numadd",
-		"numbersareok",
-		"numdec",
-		"numdiv",
-		"numlist",
-		"Numlock",
-		"nummult",
-		"numsub",
-		"Nunaat",
-		"obelix",
-		"odata",
-		"ohno",
-		"OHNO",
-		"oldppk",
-		"onattribdata",
-		"onattribend",
-		"onattribname",
-		"onattribute",
-		"oncdata",
-		"oncdataend",
-		"oncdatastart",
-		"onclosetag",
-		"oncomment",
-		"oncommentend",
-		"ondeclaration",
-		"onedrive",
-		"onelink",
-		"onformat",
-		"onmatch",
-		"onopentag",
-		"onopentagend",
-		"onopentagname",
-		"onparserinit",
-		"onprocessinginstruction",
-		"onselfclosingtag",
-		"ontext",
-		"oòóôõöøō",
-		"OÒÓÔÕÖØŌ",
-		"opentag",
-		"opentagname",
-		"Opptionn",
-		"orignal",
-		"Oromo",
-		"Österreich",
-		"otherpackage",
-		"outdented",
-		"overidding",
-		"overriden",
-		"padd",
-		"pandoc",
-		"paperclip",
-		"passthrough",
-		"Päth",
-		"Pbuild",
-		"pbxproj",
-		"pcmag",
-		"pcnalx",
-		"pddv",
-		"Pehr",
-		"Percents",
-		"père",
-		"Perú",
-		"pfff",
-		"PGPASSWORD",
-		"pidfile",
-		"PLUGINLEGACY",
-		"pocount",
-		"Polska",
-		"Polski",
-		"Polynésie",
-		"Português",
-		"Potoczny's",
-		"powerpoint",
-		"Prakash",
-		"precommit",
-		"pred",
-		"preg",
-		"prerelease",
-		"Prerelease",
-		"presigner",
-		"prettycron",
-		"pricetag",
-		"Príncipe",
-		"privkey",
-		"processinginstruction",
-		"programatically",
-		"propfind",
-		"PROPFIND",
-		"propname",
-		"propstat",
-		"protcol",
-		"pseudoclass",
-		"pseudos",
-		"Pushto",
-		"quot",
-		"qwer",
-		"raisebox",
-		"rbga",
-		"readerable",
-		"Readerable",
-		"READERABLE",
-		"Redownload",
-		"reencrypt",
-		"reencrypted",
-		"Reencrypting",
-		"reencrypts",
-		"regexes",
-		"Regexs",
-		"Relavent",
-		"relayouted",
-		"rels",
-		"renamings",
-		"renderered",
-		"Renderered",
-		"República",
-		"republika",
-		"République",
-		"requestheaders",
-		"resourcetype",
-		"resynced",
-		"Rhaeto",
-		"rightarrow",
-		"rightequilibrium",
-		"rightleftarrows",
-		"rightleftharpoons",
-		"rmbook",
-		"rmnote",
-		"rmusin",
-		"rnfs",
-		"RNFS",
-		"robocopy",
-		"Roboto",
-		"România",
-		"roule",
-		"rowid",
-		"ROWID",
-		"ROWIDs",
-		"rowspan",
-		"rseidelsohn",
-		"rtrim",
-		"safeext",
-		"salut",
-		"Sangho",
-		"sasss",
-		"SAVEPOINT",
-		"schtroumpf",
-		"Schweiz",
-		"Scrolllock",
-		"scrollmap",
-		"seafdav",
-		"Seafile",
-		"searchengine",
-		"searchlimit",
-		"SEARCHOVERLAY",
-		"securerandom",
-		"segdir",
-		"selectbox",
-		"Sénégal",
-		"Serializers",
-		"setext",
-		"settingschema",
-		"shantanugoel",
-		"sharee",
-		"Shiftt",
-		"Shoft",
-		"shouldntendwithit",
-		"shouldstartwiththis",
-		"Shqip",
-		"Shqipëria",
-		"Sicen",
-		"simplemath",
-		"Siswati",
-		"sizeinput",
-		"SJCL",
-		"Slovenčina",
-		"Slovenija",
-		"Slovensko",
-		"softbreaks",
-		"Solarised",
-		"SOLARIZED",
-		"someid",
-		"somewhereelse",
-		"sourceurl",
-		"SPACEBAR",
-		"spaceno",
-		"Spacify",
-		"spdfgh",
-		"spellfix",
-		"sphemy",
-		"splitbutton",
-		"sprintf",
-		"sqlts",
-		"srcfolder",
-		"SSSZ",
-		"starttls",
-		"Starttls",
-		"stepsize",
-		"stevenlevithan",
-		"stex",
-		"stilltryingtohack",
-		"strack",
-		"Stringifiable",
-		"subdir",
-		"subl",
-		"Suomi",
-		"Sūriyya",
-		"Svenska",
-		"Sverige",
-		"svgs",
-		"Svizra",
-		"Svizzera",
-		"synclock",
-		"synclog",
-		"syswide",
-		"syswidecas",
-		"taboverride",
-		"tabpanel",
-		"taga",
-		"tagb",
-		"tagc",
-		"Tajik",
-		"takesover",
-		"targetfolder",
-		"Tchad",
-		"Teardown",
-		"termi",
-		"termutils",
-		"Terres",
-		"Tessarek",
-		"tessus",
-		"Testb",
-		"testcreate",
-		"testexportfolder",
-		"testingconnection",
-		"testingkeychain",
-		"testunit",
-		"texify",
-		"Texify",
-		"textareas",
-		"textexportnote",
-		"textstyle",
-		"thaaaaaaan",
-		"thatsok",
-		"thatsreallylongthatsreallylongthatsreallylongthats",
-		"thatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylong",
-		"Thevenard",
-		"thisisfine",
-		"Thmmss",
-		"Tiếng",
-		"Tigrinya",
-		"tiiitlllle",
-		"tinymce",
-		"titi",
-		"titletitle",
-		"tkwidget",
-		"tkwidgets",
-		"Todos",
-		"togglebutton",
-		"togglemenuitem",
-		"toolip",
-		"tooshort",
-		"treymo",
-		"tripledash",
-		"tsmerge",
-		"Tsonga",
-		"tttest",
-		"Tunisie",
-		"Türkçe",
-		"Türkiye",
-		"Türkmenistan",
-		"turndown",
-		"Turndown",
-		"TWCO",
-		"typeahead",
-		"Typora",
-		"tzip",
-		"uastring",
-		"uglifycss",
-		"uglifyjs",
-		"Uighur",
-		"unconflicted",
-		"underbrace",
-		"Undos",
-		"unescaping",
-		"unhighlighted",
-		"unixlike",
-		"unmocked",
-		"unserialize",
-		"unserialized",
-		"unserializes",
-		"unserializing",
-		"unshares",
-		"unsharing",
-		"unusued",
-		"uparrow",
-		"uphy",
-		"urlconverter",
-		"urlinput",
-		"userchrome",
-		"usercontent",
-		"userstyle",
-		"uslug",
-		"Ustd",
-		"utems",
-		"uuidgen",
-		"uuidv",
-		"uùúûüůū",
-		"UÙÚÛÜŮŪ",
-		"valign",
-		"Valign",
-		"vars",
-		"Vars",
-		"Vaticano",
-		"vers",
-		"verylongidverylongidverylongidverylongidverylongidverylongidverylongidverylongidverylongidverylongidverylongidverylongidverylongidverylongidverylongidverylongidverylongidverylongidverylongidverylongidverylongidverylongidverylongidverylongidverylongidverylongidverylongidverylongidverylongid",
-		"veryverylongclientidveryverylongclientidveryverylongclientidveryverylongclientid",
-		"veryverylongtitleveryverylongtitleveryverylongtitleveryverylongtitleveryverylongtitleveryverylongtitleveryverylongtitleveryverylongtitleveryverylongtitleveryverylongtitleveryverylongtitleveryverylongtitleveryverylongtitleveryverylongtitleveryverylongtitleveryverylongtitleveryverylongtitleveryverylongtitle",
-		"Việt",
-		"viewbox",
-		"Volapuk",
-		"Volívia",
-		"votearrow",
-		"webclipper",
-		"webdav",
-		"webfonts",
-		"whitespaces",
-		"widder",
-		"Wifi",
-		"Withflags",
-		"Wolof",
-		"WONTFIX",
-		"wrongclienttype",
-		"wrongpassword",
-		"wrongtype",
-		"Wuliwya",
-		"wxyz",
-		"xcallbackurl",
-		"xcassets",
-		"xcodeproj",
-		"xcrun",
-		"xgettext",
-		"xlink",
-		"xzvf",
-		"yarg",
-		"yosay",
-		"yufzkns",
-		"YYYYMMDDTHH",
-		"zxcvbn",
-		"zžżź",
-		"ZŽŻŹ",
-		"Ελλάδα",
-		"Ελληνικά",
-		"Κύπρος",
-		"Агентство",
-		"Антарктике",
-		"Беларусь",
-		"България",
-		"Гора",
-		"језик",
-		"Казахстан",
-		"Киргизия",
-		"Книги",
-		"Кыргызстан",
-		"Қазақстан",
-		"Македонија",
-		"Молдавия",
-		"Монгол",
-		"номер",
-		"рейтер",
-		"Рейтер",
-		"Россия",
-		"Русский",
-		"Северна",
-		"сообщило",
-		"СООБЩИЛО",
-		"Србија",
-		"српски",
-		"Україна",
-		"Црна",
-		"საქართველო",
-		"Հայաստան",
-		"ישראל",
-		"עיברית",
-		"إرتريا",
-		"اسلامي",
-		"اسلامی",
-		"افغانستان",
-		"الأُرْدُن",
-		"الإمارات",
-		"البحرين",
-		"الجزائر",
-		"السعودية",
-		"السودان",
-		"الصومال",
-		"العراق",
-		"العربيّة",
-		"ﺍﻟﻘﻤﺮي",
-		"الكويت",
-		"المتّحدة",
-		"المغرب",
-		"اليَمَن",
-		"ایران",
-		"پاکستان",
-		"تشاد",
-		"تونس",
-		"جمهوری",
-		"جيبوتي",
-		"دولة",
-		"دولتدولت",
-		"سلطنة",
-		"سوريا",
-		"عُمان",
-		"لبنان",
-		"ليبيا",
-		"موريتانيا",
-		"ⵍⵎⵖⵔⵉⴱ",
-		"ኢትዮጵያ",
-		"ኤርትራ",
-		"भारत",
-		"গণপ্রজাতন্ত্রী",
-		"লাদেশ",
-		"இலங்கை",
-		"ලංකා",
-		"คือค",
-		"คือคนไทย",
-		"ประเทศไทย",
-		"ປະຊາຊົນລາວ",
-		"မြန်မာ",
-		"កម្ពុជា"
-	]
 }

docker-compose.db-dev.yml

@@ -1,24 +1,57 @@
 # For development this compose file starts the database only. The app can then
 # be started using `yarn start-dev`, which is useful for development, because
 # it means the app Docker file doesn't have to be rebuilt on each change.
+#
+# Note that log is setup to give as much information as possible, including
+# whether it's the master or slave database that is being used for a query.
+#
+# To setup and test replication, use the following config in Joplin Server. Note
+# in particular the different port, which means we access the slave and not the
+# master. 
+#
+# DB_USE_SLAVE=true
+# SLAVE_POSTGRES_PASSWORD=joplin
+# SLAVE_POSTGRES_DATABASE=joplin
+# SLAVE_POSTGRES_USER=joplin
+# SLAVE_POSTGRES_PORT=5433
+# SLAVE_POSTGRES_HOST=localhost
 
-version: '3'
+version: '2'
 
 services:
-    db:
+
-        image: postgres:16
+    postgresql-master:
-        command: postgres -c work_mem=100000
+        image: 'bitnami/postgresql:16.3.0'
         ports:
-            - "5432:5432"
+            - '5432:5432'
         environment:
-            - POSTGRES_PASSWORD=joplin
+            - POSTGRESQL_PASSWORD=joplin
-            - POSTGRES_USER=joplin
+            - POSTGRESQL_USERNAME=joplin
-            - POSTGRES_DB=joplin
+            - POSTGRESQL_DATABASE=joplin
-     
+
-        # Use this to specify additional Postgres
+            - POSTGRESQL_REPLICATION_MODE=master
-        # config parameters:
+            - POSTGRESQL_REPLICATION_USER=repl_user
-        #
+            - POSTGRESQL_REPLICATION_PASSWORD=repl_password
-        # command:
+
-        #     - "postgres"
+            - POSTGRESQL_LOG_HOSTNAME=true
-        #     - "-c"
+            - POSTGRESQL_PGAUDIT_LOG=READ,WRITE
-        #     - "log_min_duration_statement=0"
+            - POSTGRESQL_EXTRA_FLAGS=-c work_mem=100000 -c log_statement=all
+
+    postgresql-slave:
+        image: 'bitnami/postgresql:16.3.0'
+        ports:
+            - '5433:5432'
+        depends_on:
+            - postgresql-master
+        environment:
+            - POSTGRESQL_REPLICATION_MODE=slave
+            - POSTGRESQL_REPLICATION_USER=repl_user
+            - POSTGRESQL_REPLICATION_PASSWORD=repl_password
+            - POSTGRESQL_MASTER_HOST=postgresql-master
+            - POSTGRESQL_PASSWORD=joplin
+            - POSTGRESQL_MASTER_PORT_NUMBER=5432
+
+            - POSTGRESQL_LOG_HOSTNAME=true
+            - POSTGRESQL_PGAUDIT_LOG=READ,WRITE
+            - POSTGRESQL_EXTRA_FLAGS=-c work_mem=100000 -c log_statement=all
+      

docker-compose.server.yml

@@ -9,7 +9,7 @@
 #
 # APP_BASE_URL: This is the base public URL where the service will be running.
 #	- If Joplin Server needs to be accessible over the internet, configure APP_BASE_URL as follows: https://example.com/joplin. 
-#	- If Joplin Server does not need to be accessible over the internet, set the the APP_BASE_URL to your server's hostname. 
+#	- If Joplin Server does not need to be accessible over the internet, set the APP_BASE_URL to your server's hostname. 
 #     For Example: http://[hostname]:22300. The base URL can include the port.
 # APP_PORT: The local port on which the Docker container will listen. 
 #	- This would typically be mapped to port to 443 (TLS) with a reverse proxy.

fastlane/metadata/android/en-US/full_description.txt

@@ -1 +1,13 @@
-<strong>Joplin</strong> is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in <a href="https://joplinapp.org/help/apps/markdown">Markdown format</a>.</p><p>Notes exported from Evernote <a href="https://joplinapp.org/help/apps/import_export">can be imported</a> into Joplin, including the formatted content (which is converted to Markdown), resources (images, attachments, etc.) and complete metadata (geolocation, updated time, created time, etc.). Plain Markdown files can also be imported.</p><p>Joplin is "offline first", which means you always have all your data on your phone or computer. This ensures that your notes are always accessible, whether you have an internet connection or not.</p><p>The notes can be securely <a href="https://joplinapp.org/help/apps/sync">synchronised</a> using <a href="https://joplinapp.org/help/apps/sync/e2ee">end-to-end encryption</a> with various cloud services including Nextcloud, Dropbox, OneDrive and <a href="https://joplinapp.org/plans/" target="_blank" rel="noopener noreferrer">Joplin Cloud</a>.</p><p>Full text search is available on all platforms to quickly find the information you need. The app can be customised using plugins and themes, and you can also easily create your own.</p><p>The application is available for Windows, Linux, macOS, Android and iOS. A <a href="https://joplinapp.org/help/apps/clipper">Web Clipper</a>, to save web pages and screenshots from your browser, is also available for <a href="https://addons.mozilla.org/firefox/addon/joplin-web-clipper/" target="_blank" rel="noopener noreferrer">Firefox</a> and <a href="https://chrome.google.com/webstore/detail/joplin-web-clipper/alofnhikmmkdbbbgpnglcpdollgjjfek?hl=en-GB" target="_blank" rel="noopener noreferrer">Chrome</a>.</p><div class="top-screenshot"><img loading="lazy" src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/home-top-img.png" class="img_node_modules-@docusaurus-theme-classic-lib-theme-MDXComponents-Img-styles-module" style="max-width: 100%; max-height: 35em;">
+<strong>Joplin</strong> is a free and open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor.
+
+The notes are in <a href="https://joplinapp.org/help/apps/markdown">Markdown format</a>.
+
+Notes exported from Evernote <a href="https://joplinapp.org/help/apps/import_export">can be imported</a> into Joplin, including the formatted content (which is converted to Markdown), resources (images, attachments, etc.) and complete metadata (geolocation, updated time, created time, etc.). Plain Markdown files can also be imported.
+
+Joplin is "offline first", which means you always have all your data on your phone or computer. This ensures that your notes are always accessible, whether you have an internet connection or not.</p>
+
+The notes can be securely <a href="https://joplinapp.org/help/apps/sync">synchronised</a> using <a href="https://joplinapp.org/help/apps/sync/e2ee">end-to-end encryption</a> with various cloud services including Nextcloud, Dropbox, OneDrive and <a href="https://joplinapp.org/plans/">Joplin Cloud</a>.
+
+Full text search is available on all platforms to quickly find the information you need. The app can be customised using plugins and themes, and you can also easily create your own.
+
+The application is available for Windows, Linux, macOS, Android and iOS. A <a href="https://joplinapp.org/help/apps/clipper">Web Clipper</a>, to save web pages and screenshots from your browser, is also available for <a href="https://addons.mozilla.org/firefox/addon/joplin-web-clipper/">Firefox</a> and <a href="https://chrome.google.com/webstore/detail/joplin-web-clipper/alofnhikmmkdbbbgpnglcpdollgjjfek">Chrome</a>.

fastlane/metadata/android/en-US/short_description.txt

@@ -1 +1 @@
-a note taking and to-do app with sync between Linux, macOS, Windows, and mobile
+A note taking and to-do app with sync between Linux, macOS, Windows, and mobile

fastlane/metadata/android/hu/full_description.txt

@@ -0,0 +1,13 @@
+A <strong>Joplin</strong> egy ingyenes, nyílt forráskódú jegyzetkészítő és teendők készítésére szolgáló alkalmazás, amely számos jegyzetfüzetbe rendezett jegyzet kezelésére képes. A jegyzetek kereshetők, másolhatók, címkézhetők és módosíthatók akár közvetlenül az alkalmazásokból, akár saját szövegszerkesztőből.
+
+A jegyzetek <a href="https://joplinapp.org/help/apps/markdown">Markdown formátumban</a> vannak.
+
+Az Evernote-ból exportált jegyzetek <a href="https://joplinapp.org/help/apps/import_export">importálhatók</a> a Joplinba, beleértve a formázott tartalmat (amelyet Markdown-ba konvertálunk), az erőforrásokat (képeket, mellékletek stb.) és teljes metaadatok (földrajzi hely, frissített idő, létrehozási idő stb.). Sima Markdown fájlok is importálhatók.
+
+A Joplin „offline elszobb”, ami azt jelenti, hogy mindig minden adata a telefonján vagy a számítógépén van. Ez biztosítja, hogy jegyzetei mindig elérhetőek legyenek, akár van internetkapcsolata, akár nem.</p>
+
+A jegyzetek biztonságosan <a href="https://joplinapp.org/help/apps/sync">összehangolhatók</a> a <a href="https://joplinapp.org/help/apps/sync/e2ee">végpontok közötti titkosítás</a> segítségével különféle felhőszolgáltatásokkal, köztük a Nextcloud, a Dropbox, a OneDrive és a <a href="https://joplinapp.org/plans/">Joplin Cloud</a> segítségével.
+
+A teljes szöveges keresés minden platformon elérhető, hogy gyorsan megtalálja a szükséges információkat. Az alkalmazás beépülő modulok és témák segítségével testreszabható, és könnyedén létrehozhatja sajátját is.
+
+Az alkalmazás elérhető Android, iOS, Linux, macOS és Windows rendszeren. Egy <a href="https://joplinapp.org/help/apps/clipper">Web Clipper</a>, amely weboldalakat és képernyőképeket menthet a böngészőből, szintén elérhető a <a href="https://addons.mozilla.org/firefox/addon/joplin-web-clipper/">Firefox</a> és <a href="https://chrome.google.com/webstore/detail/joplin-web-clipper/alofnhikmmkdbbbgpnglcpdollgjjfek">Chrome</a>.

fastlane/metadata/android/hu/short_description.txt

@@ -0,0 +1 @@
+Jegyzetkészítő és teendők alkalmazás Linux, macOS, Windows és mobileszközök közötti összehangolással

fastlane/metadata/android/ru/full_description.txt

@@ -0,0 +1,13 @@
+<strong>Joplin</strong> это бесплатное и свободное приложение для создания заметок и списков задач, которое может обрабатывать большое количество заметок, организованных в блокноты. По заметкам есть поиск, их можно копировать, помечать ярлыками и изменять как непосредственно из приложения, так и из вашего собственного текстового редактора.
+
+Заметки представлены в <a href="https://joplinapp.org/help/apps/markdown">формате Markdown</a>.
+
+Заметки экспортированные из Evernote <a href="https://joplinapp.org/help/apps/import_export">могут быть импортированы</a> в Joplin, включая отформатированный контент (который преобразуется в Markdown), ресурсы (изображения, вложения и т.д.) и полные метаданные (геолокация, время обновления, время создания и т.д.). Обычные файлы Markdown также можно импортировать.
+
+Joplin работает "в первую очередь в автономном режиме", что означает, что у вас всегда есть все ваши данные на телефоне или компьютере. Это гарантирует, что ваши заметки всегда будут доступны, независимо от того есть у вас подключение к Интернету или нет.
+
+Заметки могут быть надежно <a href="https://joplinapp.org/help/apps/sync">синхронизированы</a> с помощью <a href="https://joplinapp.org/help/apps/sync/e2ee">сквозного шифрования</a> на различные облачные сервисы, включая Nextcloud, Dropbox, OneDrive и <a href="https://joplinapp.org/plans/">Joplin Cloud</a>.
+
+Полнотекстовый поиск доступен на всех платформах для быстрого поиска нужной вам информации. Приложение можно настроить с помощью плагинов и тем, а также легко создать свои.
+
+Приложение доступно для Windows, Linux, macOS, Android и iOS. A <a href="https://joplinapp.org/help/apps/clipper">Веб-клипер</a> для сохранения веб-страниц и скриншотов из вашего браузера, также доступен для <a href="https://addons.mozilla.org/firefox/addon/joplin-web-clipper/">Firefox</a> и <a href="https://chrome.google.com/webstore/detail/joplin-web-clipper/alofnhikmmkdbbbgpnglcpdollgjjfek">Chrome</a>.

fastlane/metadata/android/ru/short_description.txt

@@ -0,0 +1 @@
+Заметки и списки дел с синхронизацией с Linux, macOS, Windows и мобильным

jest.base-setup.js

@@ -14,3 +14,22 @@ module.exports = () => {
 		global.console = jestConsole;
 	});
 };
+
+// jsdom extensions
+if (typeof document !== 'undefined') {
+	// Prevents the CodeMirror error "getClientRects is undefined".
+	// See https://github.com/jsdom/jsdom/issues/3002#issue-652790925
+	document.createRange = () => {
+		const range = new Range();
+		range.getBoundingClientRect = jest.fn();
+		range.getClientRects = () => {
+			return {
+				length: 0,
+				item: () => null,
+				[Symbol.iterator]: jest.fn(),
+			};
+		};
+
+		return range;
+	};
+}

joplin.code-workspace

@@ -5,6 +5,9 @@
 		},
 	],
 	"settings": {
+		"rust-analyzer.linkedProjects": [
+			"./packages/onenote-converter/Cargo.toml",
+		],
 		"files.exclude": {
 			"_mydocs/mdtest/": true,
 			"_releases/": true,
@@ -106,7 +109,6 @@
 			"./packages/renderer/**/node_modules/": true,
 			".eslintignore": true,
 			".gitignore": true,
-			".vscode/*": true,
 			".yarn/cache": true,
 			".yarn/install-state.gz": true,
 			".yarn/plugins": true,
@@ -186,6 +188,8 @@
 			"packages/doc-builder/help": true,
 			"packages/doc-builder/news": true,
 			"packages/doc-builder/i18n": true,
+			"packages/doc-builder/.docusaurus": true,
+			"packages/doc-builder/static/images": true,
 			"readme/i18n": true,
 			"packages/app-cli/**/*.*~": true,
 			"packages/app-cli/**/*.mo": true,

lint-staged.config.js

@@ -1,19 +1,28 @@
 module.exports = {
-	// Don't compile when committing as it will process all TS files in the
+	// # About TypeScript compilation
-	// monorepo, which is too slow. Errors should be checked during development
+	//
-	// using `npm run watch`.
+	// Don't compile when committing as it will process all TS files in the monorepo, which is too
+	// slow. Errors should be checked during development using `yarn watch`.
 	//
 	// Or if we add this back, we could do something like this:
 	// https://stackoverflow.com/a/44748041/561309
 	//
-	// The script would check where the TS file is located, then use the right
+	// The script would check where the TS file is located, then use the right tsconfig.json file
-	// tsconfig.json file along with the tsconfig override.
+	// along with the tsconfig override.
 	//
-	// '**/*.ts?(x)': () => 'npm run tsc',
+	// # Running tasks in parallel
-	'*.{js,jsx,ts,tsx}': [
+	//
-		'yarn checkIgnoredFiles',
+	// lint-staged does not allow running concurrent tasks for the same extension, because multiple
-		// 'yarn checkLibPaths',
+	// tasks might modify the same files. This doesn't apply to us because only one task modifies
-		'yarn packageJsonLint',
+	// files (the linter task) while others only notify about errors. So to go around this we add
-		'yarn linter-precommit',
+	// this fake extension "task?" to make lint-staged think those are different extension tasks
-	],
+	// that can run in parallel.
+	//
+	// See https://github.com/lint-staged/lint-staged/issues/934#issuecomment-743299357
+	'*.{js,jsx,ts,tsx,task1}': 'yarn checkIgnoredFiles',
+	'*.{js,jsx,ts,tsx,task2}': 'yarn spellcheck',
+	'*.{js,jsx,ts,tsx,task3}': 'yarn linter-precommit',
+	'*.{json,task4}': 'yarn packageJsonLint',
+	'*.{md,mdx,task5}': 'yarn spellcheck',
+	'*.{md,mdx,task6}': 'yarn validateFilenames',
 };

package.json

@@ -9,7 +9,7 @@
     "url": "git+https://github.com/laurent22/joplin.git"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "scripts": {
     "buildApiDoc": "yarn workspace joplin start apidoc ../../readme/api/references/rest_api.md",
@@ -29,7 +29,6 @@
     "crowdin": "crowdin",
     "crowdinDownload": "crowdin download",
     "crowdinUpload": "crowdin upload",
-    "cspell": "cspell",
     "dependencyTree": "madge",
     "generateTypes": "node packages/tools/generate-database-types",
     "linkChecker": "linkchecker https://joplinapp.org/ && linkchecker --check-extern https://joplinapp.org/api/references/plugin_api/classes/joplin.html",
@@ -41,7 +40,7 @@
     "postinstall": "gulp build",
     "postPreReleasesToForum": "node ./packages/tools/postPreReleasesToForum",
     "publishAll": "git pull && yarn buildParallel && lerna version --yes --no-private --no-git-tag-version && gulp completePublishAll",
-    "releaseAndroid": "PATH=\"/usr/local/opt/openjdk@11/bin:$PATH\" node packages/tools/release-android.js",
+    "releaseAndroid": "PATH=\"/usr/local/opt/openjdk@17/bin:$PATH\" node packages/tools/release-android.js",
     "releaseAndroidClean": "node packages/tools/release-android.js",
     "releaseCli": "node packages/tools/release-cli.js",
     "releaseClipper": "node packages/tools/release-clipper.js",
@@ -60,54 +59,58 @@
     "updateMarkdownDoc": "node ./packages/tools/updateMarkdownDoc",
     "updateNews": "node ./packages/tools/website/updateNews",
     "updatePluginTypes": "./packages/generator-joplin/updateTypes.sh",
+    "validateFilenames": "node ./packages/tools/validateFilenames.js",
     "watch": "yarn workspaces foreach --parallel --verbose --interlaced --jobs 999 run watch",
     "watchWebsite": "nodemon --delay 1 --watch Assets/WebsiteAssets --watch packages/tools/website --watch packages/tools/website/utils --watch packages/doc-builder/build --ext md,ts,js,mustache,css,tsx,gif,png,svg --exec \"node packages/tools/website/build.js && http-server --port 8077 ../joplin-website/docs -a localhost\""
   },
   "husky": {
     "hooks": {
-      "pre-commit": "lint-staged"
+      "pre-commit": "yarn lint-staged"
     }
   },
   "devDependencies": {
     "@crowdin/cli": "3",
     "@joplin/utils": "~2.12",
     "@seiyab/eslint-plugin-react-hooks": "4.5.1-beta.0",
-    "@typescript-eslint/eslint-plugin": "6.8.0",
+    "@typescript-eslint/eslint-plugin": "6.21.0",
-    "@typescript-eslint/parser": "6.8.0",
+    "@typescript-eslint/parser": "6.21.0",
     "cspell": "5.21.2",
-    "eslint": "8.52.0",
+    "eslint": "8.57.0",
     "eslint-interactive": "10.8.0",
-    "eslint-plugin-import": "2.28.1",
+    "eslint-plugin-import": "2.29.1",
-    "eslint-plugin-jest": "27.4.3",
+    "eslint-plugin-jest": "27.9.0",
-    "eslint-plugin-promise": "6.1.1",
+    "eslint-plugin-promise": "6.2.0",
-    "eslint-plugin-react": "7.33.2",
+    "eslint-plugin-react": "7.34.3",
     "execa": "5.1.1",
     "fs-extra": "11.2.0",
-    "glob": "10.3.10",
+    "glob": "10.4.5",
     "gulp": "4.0.2",
     "husky": "3.1.0",
     "lerna": "3.22.1",
-    "lint-staged": "15.2.0",
+    "lint-staged": "15.2.8",
-    "madge": "6.1.0",
+    "madge": "7.0.0",
     "npm-package-json-lint": "7.1.0",
-    "typescript": "5.2.2"
+    "typescript": "5.4.5"
   },
   "dependencies": {
     "@types/fs-extra": "11.0.4",
-    "eslint-plugin-github": "4.10.1",
+    "eslint-plugin-github": "4.10.2",
     "http-server": "14.1.1",
     "node-gyp": "9.4.1",
-    "nodemon": "3.0.3"
+    "nodemon": "3.1.7"
   },
-  "packageManager": "yarn@3.6.4",
+  "packageManager": "yarn@3.8.3",
   "resolutions": {
     "react-native-camera@4.2.1": "patch:react-native-camera@npm%3A4.2.1#./.yarn/patches/react-native-camera-npm-4.2.1-24b2600a7e.patch",
     "react-native-vosk@0.1.12": "patch:react-native-vosk@npm%3A0.1.12#./.yarn/patches/react-native-vosk-npm-0.1.12-76b1caaae8.patch",
-    "eslint": "patch:eslint@8.52.0#./.yarn/patches/eslint-npm-8.39.0-d92bace04d.patch",
+    "eslint": "patch:eslint@8.57.0#./.yarn/patches/eslint-npm-8.39.0-d92bace04d.patch",
     "app-builder-lib@24.4.0": "patch:app-builder-lib@npm%3A24.4.0#./.yarn/patches/app-builder-lib-npm-24.4.0-05322ff057.patch",
-    "react-native@0.71.10": "patch:react-native@npm%3A0.71.10#./.yarn/patches/react-native-animation-fix/react-native-npm-0.71.10-f9c32562d8.patch",
     "nanoid": "patch:nanoid@npm%3A3.3.7#./.yarn/patches/nanoid-npm-3.3.7-98824ba130.patch",
     "pdfjs-dist": "patch:pdfjs-dist@npm%3A3.11.174#./.yarn/patches/pdfjs-dist-npm-3.11.174-67f2fee6d6.patch",
-    "@react-native-community/slider": "patch:@react-native-community/slider@npm%3A4.4.4#./.yarn/patches/@react-native-community-slider-npm-4.4.4-d78e472f48.patch"
+    "@react-native-community/slider": "patch:@react-native-community/slider@npm%3A4.4.4#./.yarn/patches/@react-native-community-slider-npm-4.4.4-d78e472f48.patch",
+    "husky": "patch:husky@npm%3A3.1.0#./.yarn/patches/husky-npm-3.1.0-5cc13e4e34.patch",
+    "chokidar@^2.0.0": "3.5.3",
+    "react-native@0.74.1": "patch:react-native@npm%3A0.74.1#./.yarn/patches/react-native-npm-0.74.1-754c02ae9e.patch",
+    "rn-fetch-blob@0.12.0": "patch:rn-fetch-blob@npm%3A0.12.0#./.yarn/patches/rn-fetch-blob-npm-0.12.0-cf02e3c544.patch"
   }
 }

packages/app-cli/app/LinkSelector.ts

@@ -41,6 +41,7 @@ class LinkSelector {
 		const newLinkStore: LinkStoreEntry[] = [];
 		const lines: string[] = renderedText.split('\n');
 		for (let i = 0; i < lines.length; i++) {
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 			const r = (lines[i] as any).matchAll(this.linkRegex_);
 			const matches = [...r];
 			// eslint-disable-next-line github/array-foreach -- Old code before rule was applied
@@ -63,12 +64,14 @@ class LinkSelector {
 		this.linkStore_ = this.findLinks(this.renderedText_);
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public updateNote(textWidget: any): void {
 		this.noteId_ = textWidget.noteId;
 		this.scrollTop_ = textWidget.scrollTop_;
 		this.updateText(textWidget.renderedText_);
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public scrollWidget(textWidget: any): void {
 		if (this.currentLinkIndex_ === null) return;
 
@@ -94,6 +97,7 @@ class LinkSelector {
 		return;
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public changeLink(textWidget: any, offset: number): void | null {
 		if (textWidget.noteId !== this.noteId_) {
 			this.updateNote(textWidget);
@@ -124,6 +128,7 @@ class LinkSelector {
 		return;
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public openLink(textWidget: any): void {
 		if (textWidget.noteId !== this.noteId_) return;
 		if (textWidget.renderedText_ !== this.renderedText_) return;

packages/app-cli/app/app-gui.js

@@ -31,7 +31,7 @@ const WindowWidget = require('tkwidgets/WindowWidget.js');
 const NoteWidget = require('./gui/NoteWidget.js');
 const ResourceServer = require('./ResourceServer.js');
 const NoteMetadataWidget = require('./gui/NoteMetadataWidget.js');
-const FolderListWidget = require('./gui/FolderListWidget.js');
+const FolderListWidget = require('./gui/FolderListWidget').default;
 const NoteListWidget = require('./gui/NoteListWidget.js');
 const StatusBarWidget = require('./gui/StatusBarWidget').default;
 const ConsoleWidget = require('./gui/ConsoleWidget.js');
@@ -441,6 +441,7 @@ class AppGui {
 		if (cmd === 'activate') {
 			const w = this.widget('mainWindow').focusedWidget;
 			if (w.name === 'folderList') {
+				// eslint-disable-next-line no-restricted-properties
 				this.widget('noteList').focus();
 			} else if (w.name === 'noteList' || w.name === 'noteText') {
 				this.processPromptCommand('edit $n');

packages/app-cli/app/app.js

@@ -1,461 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const BaseApplication_1 = require("@joplin/lib/BaseApplication");
-const folders_screen_utils_js_1 = require("@joplin/lib/folders-screen-utils.js");
-const ResourceService_1 = require("@joplin/lib/services/ResourceService");
-const BaseModel_1 = require("@joplin/lib/BaseModel");
-const Folder_1 = require("@joplin/lib/models/Folder");
-const BaseItem_1 = require("@joplin/lib/models/BaseItem");
-const Note_1 = require("@joplin/lib/models/Note");
-const Tag_1 = require("@joplin/lib/models/Tag");
-const Setting_1 = require("@joplin/lib/models/Setting");
-const registry_js_1 = require("@joplin/lib/registry.js");
-const path_utils_1 = require("@joplin/lib/path-utils");
-const utils_1 = require("@joplin/utils");
-const locale_1 = require("@joplin/lib/locale");
-const fs_extra_1 = require("fs-extra");
-const RevisionService_1 = require("@joplin/lib/services/RevisionService");
-const shim_1 = require("@joplin/lib/shim");
-const setupCommand_1 = require("./setupCommand");
-const { cliUtils } = require('./cli-utils.js');
-const Cache = require('@joplin/lib/Cache');
-const { splitCommandBatch } = require('@joplin/lib/string-utils');
-class Application extends BaseApplication_1.default {
-    constructor() {
-        super(...arguments);
-        this.commands_ = {};
-        this.commandMetadata_ = null;
-        this.activeCommand_ = null;
-        this.allCommandsLoaded_ = false;
-        this.gui_ = null;
-        this.cache_ = new Cache();
-    }
-    gui() {
-        return this.gui_;
-    }
-    commandStdoutMaxWidth() {
-        return this.gui().stdoutMaxWidth();
-    }
-    guessTypeAndLoadItem(pattern, options = null) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let type = BaseModel_1.default.TYPE_NOTE;
-            if (pattern.indexOf('/') === 0) {
-                type = BaseModel_1.default.TYPE_FOLDER;
-                pattern = pattern.substr(1);
-            }
-            return this.loadItem(type, pattern, options);
-        });
-    }
-    loadItem(type, pattern, options = null) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const output = yield this.loadItems(type, pattern, options);
-            if (output.length > 1) {
-                // output.sort((a, b) => { return a.user_updated_time < b.user_updated_time ? +1 : -1; });
-                // let answers = { 0: _('[Cancel]') };
-                // for (let i = 0; i < output.length; i++) {
-                // 	answers[i + 1] = output[i].title;
-                // }
-                // Not really useful with new UI?
-                throw new Error((0, locale_1._)('More than one item match "%s". Please narrow down your query.', pattern));
-                // let msg = _('More than one item match "%s". Please select one:', pattern);
-                // const response = await cliUtils.promptMcq(msg, answers);
-                // if (!response) return null;
-                // return output[response - 1];
-            }
-            else {
-                return output.length ? output[0] : null;
-            }
-        });
-    }
-    loadItems(type, pattern, options = null) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (type === 'folderOrNote') {
-                const folders = yield this.loadItems(BaseModel_1.default.TYPE_FOLDER, pattern, options);
-                if (folders.length)
-                    return folders;
-                return yield this.loadItems(BaseModel_1.default.TYPE_NOTE, pattern, options);
-            }
-            pattern = pattern ? pattern.toString() : '';
-            if (type === BaseModel_1.default.TYPE_FOLDER && (pattern === Folder_1.default.conflictFolderTitle() || pattern === Folder_1.default.conflictFolderId()))
-                return [Folder_1.default.conflictFolder()];
-            if (!options)
-                options = {};
-            const parent = options.parent ? options.parent : app().currentFolder();
-            const ItemClass = BaseItem_1.default.itemClass(type);
-            if (type === BaseModel_1.default.TYPE_NOTE && pattern.indexOf('*') >= 0) {
-                // Handle it as pattern
-                if (!parent)
-                    throw new Error((0, locale_1._)('No notebook selected.'));
-                return yield Note_1.default.previews(parent.id, { titlePattern: pattern });
-            }
-            else {
-                // Single item
-                let item = null;
-                if (type === BaseModel_1.default.TYPE_NOTE) {
-                    if (!parent)
-                        throw new Error((0, locale_1._)('No notebook has been specified.'));
-                    item = yield ItemClass.loadFolderNoteByField(parent.id, 'title', pattern);
-                }
-                else {
-                    item = yield ItemClass.loadByTitle(pattern);
-                }
-                if (item)
-                    return [item];
-                item = yield ItemClass.load(pattern); // Load by id
-                if (item)
-                    return [item];
-                if (pattern.length >= 2) {
-                    return yield ItemClass.loadByPartialId(pattern);
-                }
-            }
-            return [];
-        });
-    }
-    setupCommand(cmd) {
-        return (0, setupCommand_1.default)(cmd, (t) => this.stdout(t), () => this.store(), () => this.gui());
-    }
-    stdout(text) {
-        return this.gui().stdout(text);
-    }
-    exit(code = 0) {
-        const _super = Object.create(null, {
-            exit: { get: () => super.exit }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            const doExit = () => __awaiter(this, void 0, void 0, function* () {
-                this.gui().exit();
-                yield _super.exit.call(this, code);
-            });
-            // Give it a few seconds to cancel otherwise exit anyway
-            shim_1.default.setTimeout(() => __awaiter(this, void 0, void 0, function* () {
-                yield doExit();
-            }), 5000);
-            if (yield registry_js_1.reg.syncTarget().syncStarted()) {
-                this.stdout((0, locale_1._)('Cancelling background synchronisation... Please wait.'));
-                const sync = yield registry_js_1.reg.syncTarget().synchronizer();
-                yield sync.cancel();
-            }
-            yield doExit();
-        });
-    }
-    commands(uiType = null) {
-        if (!this.allCommandsLoaded_) {
-            // eslint-disable-next-line github/array-foreach -- Old code before rule was applied
-            (0, fs_extra_1.readdirSync)(__dirname).forEach(path => {
-                if (path.indexOf('command-') !== 0)
-                    return;
-                if (path.endsWith('.test.js'))
-                    return;
-                const ext = (0, path_utils_1.fileExtension)(path);
-                if (ext !== 'js')
-                    return;
-                const CommandClass = require(`./${path}`);
-                let cmd = new CommandClass();
-                if (!cmd.enabled())
-                    return;
-                cmd = this.setupCommand(cmd);
-                this.commands_[cmd.name()] = cmd;
-            });
-            this.allCommandsLoaded_ = true;
-        }
-        if (uiType !== null) {
-            const temp = {};
-            for (const n in this.commands_) {
-                if (!this.commands_.hasOwnProperty(n))
-                    continue;
-                const c = this.commands_[n];
-                if (!c.supportsUi(uiType))
-                    continue;
-                temp[n] = c;
-            }
-            return temp;
-        }
-        return this.commands_;
-    }
-    commandNames() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const metadata = yield this.commandMetadata();
-            const output = [];
-            for (const n in metadata) {
-                if (!metadata.hasOwnProperty(n))
-                    continue;
-                output.push(n);
-            }
-            return output;
-        });
-    }
-    commandMetadata() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.commandMetadata_)
-                return this.commandMetadata_;
-            let output = yield this.cache_.getItem('metadata');
-            if (output) {
-                this.commandMetadata_ = output;
-                return Object.assign({}, this.commandMetadata_);
-            }
-            const commands = this.commands();
-            output = {};
-            for (const n in commands) {
-                if (!commands.hasOwnProperty(n))
-                    continue;
-                const cmd = commands[n];
-                output[n] = cmd.metadata();
-            }
-            yield this.cache_.setItem('metadata', output, 1000 * 60 * 60 * 24);
-            this.commandMetadata_ = output;
-            return Object.assign({}, this.commandMetadata_);
-        });
-    }
-    hasGui() {
-        return this.gui() && !this.gui().isDummy();
-    }
-    findCommandByName(name) {
-        if (this.commands_[name])
-            return this.commands_[name];
-        let CommandClass = null;
-        try {
-            CommandClass = require(`${__dirname}/command-${name}.js`);
-        }
-        catch (error) {
-            if (error.message && error.message.indexOf('Cannot find module') >= 0) {
-                const e = new Error((0, locale_1._)('No such command: %s', name));
-                e.type = 'notFound';
-                throw e;
-            }
-            else {
-                throw error;
-            }
-        }
-        let cmd = new CommandClass();
-        cmd = this.setupCommand(cmd);
-        this.commands_[name] = cmd;
-        return this.commands_[name];
-    }
-    dummyGui() {
-        return {
-            isDummy: () => {
-                return true;
-            },
-            prompt: (initialText = '', promptString = '', options = null) => {
-                return cliUtils.prompt(initialText, promptString, options);
-            },
-            showConsole: () => { },
-            maximizeConsole: () => { },
-            stdout: (text) => {
-                // eslint-disable-next-line no-console
-                console.info(text);
-            },
-            fullScreen: () => { },
-            exit: () => { },
-            showModalOverlay: () => { },
-            hideModalOverlay: () => { },
-            stdoutMaxWidth: () => {
-                return 100;
-            },
-            forceRender: () => { },
-            termSaveState: () => { },
-            termRestoreState: () => { },
-        };
-    }
-    execCommand(argv) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!argv.length)
-                return this.execCommand(['help']);
-            // reg.logger().debug('execCommand()', argv);
-            const commandName = argv[0];
-            this.activeCommand_ = this.findCommandByName(commandName);
-            let outException = null;
-            try {
-                if (this.gui().isDummy() && !this.activeCommand_.supportsUi('cli'))
-                    throw new Error((0, locale_1._)('The command "%s" is only available in GUI mode', this.activeCommand_.name()));
-                const cmdArgs = cliUtils.makeCommandArgs(this.activeCommand_, argv);
-                yield this.activeCommand_.action(cmdArgs);
-            }
-            catch (error) {
-                outException = error;
-            }
-            this.activeCommand_ = null;
-            if (outException)
-                throw outException;
-        });
-    }
-    currentCommand() {
-        return this.activeCommand_;
-    }
-    loadKeymaps() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const defaultKeyMap = [
-                { keys: [':'], type: 'function', command: 'enter_command_line_mode' },
-                { keys: ['TAB'], type: 'function', command: 'focus_next' },
-                { keys: ['SHIFT_TAB'], type: 'function', command: 'focus_previous' },
-                { keys: ['UP'], type: 'function', command: 'move_up' },
-                { keys: ['DOWN'], type: 'function', command: 'move_down' },
-                { keys: ['PAGE_UP'], type: 'function', command: 'page_up' },
-                { keys: ['PAGE_DOWN'], type: 'function', command: 'page_down' },
-                { keys: ['ENTER'], type: 'function', command: 'activate' },
-                { keys: ['DELETE', 'BACKSPACE'], type: 'function', command: 'delete' },
-                { keys: ['n'], type: 'function', command: 'next_link' },
-                { keys: ['b'], type: 'function', command: 'previous_link' },
-                { keys: ['o'], type: 'function', command: 'open_link' },
-                { keys: [' '], type: 'prompt', command: 'todo toggle $n' },
-                { keys: ['tc'], type: 'function', command: 'toggle_console' },
-                { keys: ['tm'], type: 'function', command: 'toggle_metadata' },
-                { keys: ['ti'], type: 'function', command: 'toggle_ids' },
-                { keys: ['/'], type: 'prompt', command: 'search ""', cursorPosition: -2 },
-                { keys: ['mn'], type: 'prompt', command: 'mknote ""', cursorPosition: -2 },
-                { keys: ['mt'], type: 'prompt', command: 'mktodo ""', cursorPosition: -2 },
-                { keys: ['mb'], type: 'prompt', command: 'mkbook ""', cursorPosition: -2 },
-                { keys: ['yn'], type: 'prompt', command: 'cp $n ""', cursorPosition: -2 },
-                { keys: ['dn'], type: 'prompt', command: 'mv $n ""', cursorPosition: -2 },
-            ];
-            // Filter the keymap item by command so that items in keymap.json can override
-            // the default ones.
-            const itemsByCommand = {};
-            for (let i = 0; i < defaultKeyMap.length; i++) {
-                itemsByCommand[defaultKeyMap[i].command] = defaultKeyMap[i];
-            }
-            const filePath = `${Setting_1.default.value('profileDir')}/keymap.json`;
-            if (yield (0, fs_extra_1.pathExists)(filePath)) {
-                try {
-                    let configString = yield (0, fs_extra_1.readFile)(filePath, 'utf-8');
-                    configString = configString.replace(/^\s*\/\/.*/, ''); // Strip off comments
-                    const keymap = JSON.parse(configString);
-                    for (let keymapIndex = 0; keymapIndex < keymap.length; keymapIndex++) {
-                        const item = keymap[keymapIndex];
-                        itemsByCommand[item.command] = item;
-                    }
-                }
-                catch (error) {
-                    let msg = error.message ? error.message : '';
-                    msg = `Could not load keymap ${filePath}\n${msg}`;
-                    error.message = msg;
-                    throw error;
-                }
-            }
-            const output = [];
-            for (const n in itemsByCommand) {
-                if (!itemsByCommand.hasOwnProperty(n))
-                    continue;
-                output.push(itemsByCommand[n]);
-            }
-            // Map reserved shortcuts to their equivalent key
-            // https://github.com/cronvel/terminal-kit/issues/101
-            for (let i = 0; i < output.length; i++) {
-                const newKeys = output[i].keys.map(k => {
-                    k = k.replace(/CTRL_H/g, 'BACKSPACE');
-                    k = k.replace(/CTRL_I/g, 'TAB');
-                    k = k.replace(/CTRL_M/g, 'ENTER');
-                    return k;
-                });
-                output[i].keys = newKeys;
-            }
-            return output;
-        });
-    }
-    commandList(argv) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (argv.length && argv[0] === 'batch') {
-                const commands = [];
-                const commandLines = splitCommandBatch(yield (0, fs_extra_1.readFile)(argv[1], 'utf-8'));
-                for (const commandLine of commandLines) {
-                    if (!commandLine.trim())
-                        continue;
-                    const splitted = (0, utils_1.splitCommandString)(commandLine.trim());
-                    commands.push(splitted);
-                }
-                return commands;
-            }
-            else {
-                return [argv];
-            }
-        });
-    }
-    // We need this special case here because by the time the `version` command
-    // runs, the keychain has already been setup.
-    checkIfKeychainEnabled(argv) {
-        return argv.indexOf('version') < 0;
-    }
-    start(argv) {
-        const _super = Object.create(null, {
-            start: { get: () => super.start }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            const keychainEnabled = this.checkIfKeychainEnabled(argv);
-            argv = yield _super.start.call(this, argv, { keychainEnabled });
-            cliUtils.setStdout((object) => {
-                return this.stdout(object);
-            });
-            this.initRedux();
-            // If we have some arguments left at this point, it's a command
-            // so execute it.
-            if (argv.length) {
-                this.gui_ = this.dummyGui();
-                this.currentFolder_ = yield Folder_1.default.load(Setting_1.default.value('activeFolderId'));
-                yield this.applySettingsSideEffects();
-                try {
-                    const commands = yield this.commandList(argv);
-                    for (const command of commands) {
-                        yield this.execCommand(command);
-                    }
-                }
-                catch (error) {
-                    if (this.showStackTraces_) {
-                        console.error(error);
-                    }
-                    else {
-                        // eslint-disable-next-line no-console
-                        console.info(error.message);
-                    }
-                    process.exit(1);
-                }
-                yield Setting_1.default.saveAll();
-                // Need to call exit() explicitly, otherwise Node wait for any timeout to complete
-                // https://stackoverflow.com/questions/18050095
-                process.exit(0);
-            }
-            else {
-                // Otherwise open the GUI
-                const keymap = yield this.loadKeymaps();
-                const AppGui = require('./app-gui.js');
-                this.gui_ = new AppGui(this, this.store(), keymap);
-                this.gui_.setLogger(this.logger());
-                yield this.gui_.start();
-                // Since the settings need to be loaded before the store is created, it will never
-                // receive the SETTING_UPDATE_ALL even, which mean state.settings will not be
-                // initialised. So we manually call dispatchUpdateAll() to force an update.
-                Setting_1.default.dispatchUpdateAll();
-                yield (0, folders_screen_utils_js_1.refreshFolders)((action) => this.store().dispatch(action));
-                const tags = yield Tag_1.default.allWithNotes();
-                ResourceService_1.default.runInBackground();
-                RevisionService_1.default.instance().runInBackground();
-                this.dispatch({
-                    type: 'TAG_UPDATE_ALL',
-                    items: tags,
-                });
-                this.store().dispatch({
-                    type: 'FOLDER_SELECT',
-                    id: Setting_1.default.value('activeFolderId'),
-                });
-                this.startRotatingLogMaintenance(Setting_1.default.value('profileDir'));
-            }
-        });
-    }
-}
-let application_ = null;
-function app() {
-    if (application_)
-        return application_;
-    application_ = new Application();
-    return application_;
-}
-exports.default = app;
-//# sourceMappingURL=app.js.map

packages/app-cli/app/app.ts

@@ -22,10 +22,14 @@ const { splitCommandBatch } = require('@joplin/lib/string-utils');
 
 class Application extends BaseApplication {
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	private commands_: Record<string, any> = {};
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	private commandMetadata_: any = null;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	private activeCommand_: any = null;
 	private allCommandsLoaded_ = false;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	private gui_: any = null;
 	private cache_ = new Cache();
 
@@ -37,6 +41,7 @@ class Application extends BaseApplication {
 		return this.gui().stdoutMaxWidth();
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public async guessTypeAndLoadItem(pattern: string, options: any = null) {
 		let type = BaseModel.TYPE_NOTE;
 		if (pattern.indexOf('/') === 0) {
@@ -46,6 +51,7 @@ class Application extends BaseApplication {
 		return this.loadItem(type, pattern, options);
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public async loadItem(type: ModelType | 'folderOrNote', pattern: string, options: any = null) {
 		const output = await this.loadItems(type, pattern, options);
 
@@ -70,6 +76,7 @@ class Application extends BaseApplication {
 		}
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public async loadItems(type: ModelType | 'folderOrNote', pattern: string, options: any = null): Promise<(FolderEntity | NoteEntity)[]> {
 		if (type === 'folderOrNote') {
 			const folders: FolderEntity[] = await this.loadItems(BaseModel.TYPE_FOLDER, pattern, options);
@@ -95,7 +102,7 @@ class Application extends BaseApplication {
 			let item = null;
 			if (type === BaseModel.TYPE_NOTE) {
 				if (!parent) throw new Error(_('No notebook has been specified.'));
-				item = await ItemClass.loadFolderNoteByField(parent.id, 'title', pattern);
+				item = await (ItemClass as typeof Note).loadFolderNoteByField(parent.id, 'title', pattern);
 			} else {
 				item = await ItemClass.loadByTitle(pattern);
 			}
@@ -160,6 +167,7 @@ class Application extends BaseApplication {
 		}
 
 		if (uiType !== null) {
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 			const temp: Record<string, any> = {};
 			for (const n in this.commands_) {
 				if (!this.commands_.hasOwnProperty(n)) continue;
@@ -219,6 +227,7 @@ class Application extends BaseApplication {
 			CommandClass = require(`${__dirname}/command-${name}.js`);
 		} catch (error) {
 			if (error.message && error.message.indexOf('Cannot find module') >= 0) {
+				// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 				const e: any = new Error(_('No such command: %s', name));
 				e.type = 'notFound';
 				throw e;
@@ -238,6 +247,7 @@ class Application extends BaseApplication {
 			isDummy: () => {
 				return true;
 			},
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 			prompt: (initialText = '', promptString = '', options: any = null) => {
 				return cliUtils.prompt(initialText, promptString, options);
 			},
@@ -260,6 +270,7 @@ class Application extends BaseApplication {
 		};
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public async execCommand(argv: string[]): Promise<any> {
 		if (!argv.length) return this.execCommand(['help']);
 		// reg.logger().debug('execCommand()', argv);
@@ -307,6 +318,7 @@ class Application extends BaseApplication {
 			{ keys: ['tc'], type: 'function', command: 'toggle_console' },
 			{ keys: ['tm'], type: 'function', command: 'toggle_metadata' },
 			{ keys: ['ti'], type: 'function', command: 'toggle_ids' },
+			{ keys: ['r'], type: 'prompt', command: 'restore $n' },
 			{ keys: ['/'], type: 'prompt', command: 'search ""', cursorPosition: -2 },
 			{ keys: ['mn'], type: 'prompt', command: 'mknote ""', cursorPosition: -2 },
 			{ keys: ['mt'], type: 'prompt', command: 'mktodo ""', cursorPosition: -2 },
@@ -389,6 +401,7 @@ class Application extends BaseApplication {
 
 		argv = await super.start(argv, { keychainEnabled });
 
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 		cliUtils.setStdout((object: any) => {
 			return this.stdout(object);
 		});
@@ -438,7 +451,8 @@ class Application extends BaseApplication {
 			// initialised. So we manually call dispatchUpdateAll() to force an update.
 			Setting.dispatchUpdateAll();
 
-			await refreshFolders((action: any) => this.store().dispatch(action));
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
+			await refreshFolders((action: any) => this.store().dispatch(action), '');
 
 			const tags = await Tag.allWithNotes();
 

packages/app-cli/app/base-command.ts

@@ -3,14 +3,18 @@ import { reg } from '@joplin/lib/registry.js';
 
 export default class BaseCommand {
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	protected stdout_: any = null;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	protected prompt_: any = null;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	protected dispatcher_: any;
 
 	public usage(): string {
 		throw new Error('Usage not defined');
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public encryptionCheck(item: any) {
 		if (item && item.encryption_applied) throw new Error(_('Cannot change encrypted item'));
 	}
@@ -19,6 +23,7 @@ export default class BaseCommand {
 		throw new Error('Description not defined');
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public async action(_args: any) {
 		throw new Error('Action not defined');
 	}
@@ -31,6 +36,7 @@ export default class BaseCommand {
 		return this.compatibleUis().indexOf(ui) >= 0;
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public options(): any[] {
 		return [];
 	}
@@ -59,6 +65,7 @@ export default class BaseCommand {
 		this.dispatcher_ = fn;
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public dispatch(action: any) {
 		if (!this.dispatcher_) throw new Error('Dispatcher not defined');
 		return this.dispatcher_(action);
@@ -78,6 +85,7 @@ export default class BaseCommand {
 		this.prompt_ = fn;
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public async prompt(message: string, options: any = null) {
 		if (!this.prompt_) throw new Error('Prompt is undefined');
 		return await this.prompt_(message, options);

packages/app-cli/app/command-apidoc.ts

@@ -37,6 +37,7 @@ class Command extends BaseCommand {
 		return markdownUtils.createMarkdownTable(headers, tableFields);
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public override async action(args: any) {
 		const models = [
 			{
@@ -82,7 +83,7 @@ class Command extends BaseCommand {
 
 		lines.push('## Authorisation');
 		lines.push('');
-		lines.push('To prevent unauthorised applications from accessing the API, the calls must be authentified. To do so, you must provide a token as a query parameter for each API call. You can get this token from the Joplin desktop application, on the Web Clipper Options screen.');
+		lines.push('To prevent unauthorised applications from accessing the API, the calls must be authenticated. To do so, you must provide a token as a query parameter for each API call. You can get this token from the Joplin desktop application, on the Web Clipper Options screen.');
 		lines.push('');
 		lines.push('This would be an example of valid cURL call using a token:');
 		lines.push('');
@@ -149,7 +150,7 @@ class Command extends BaseCommand {
 		lines.push('');
 		lines.push('```shell\ncurl http://localhost:41184/notes?order_by=updated_time&order_dir=ASC&limit=10&page=2\n```');
 		lines.push('');
-		lines.push('Eventually you will get some results that do not contain an "has_more" paramater, at which point you will have retrieved all the results');
+		lines.push('Eventually you will get some results that do not contain an "has_more" parameter, at which point you will have retrieved all the results');
 		lines.push('');
 		lines.push('As an example the pseudo-code below could be used to fetch all the notes:');
 		lines.push('');
@@ -199,7 +200,7 @@ async function fetchAllNotes() {
 
 		lines.push('## Item type IDs');
 		lines.push('');
-		lines.push('Item type IDs might be refered to in certain object you will retrieve from the API. This is the correspondance between name and ID:');
+		lines.push('Item type IDs might be referred to in certain objects you will retrieve from the API. This is the correspondence between name and ID:');
 		lines.push('');
 		lines.push('Name | Value');
 		lines.push('---- | -----');
@@ -238,11 +239,6 @@ async function fetchAllNotes() {
 					type: Database.enumId('fieldType', 'text'),
 					description: 'If an image is provided, you can also specify an optional rectangle that will be used to crop the image. In format `{ x: x, y: y, width: width, height: height }`',
 				});
-				// tableFields.push({
-				// 	name: 'tags',
-				// 	type: Database.enumId('fieldType', 'text'),
-				// 	description: 'Comma-separated list of tags. eg. `tag1,tag2`.',
-				// });
 			}
 
 			lines.push(`## ${toTitleCase(tableName)}`);
@@ -268,6 +264,11 @@ async function fetchAllNotes() {
 				lines.push('');
 			}
 
+			if (model.type === BaseModel.TYPE_NOTE) {
+				lines.push('By default, this call will return the all notes **except** the notes in the trash folder and any conflict note. To include these too, you can specify `include_deleted=1` and `include_conflicts=1` as query parameters.');
+				lines.push('');
+			}
+
 			lines.push(`### GET /${tableName}/:id`);
 			lines.push('');
 			lines.push(`Gets ${singular} with ID :id`);
@@ -400,6 +401,11 @@ async function fetchAllNotes() {
 				lines.push('Remove the tag from the note.');
 				lines.push('');
 			}
+
+			if (model.type === BaseModel.TYPE_NOTE || model.type === BaseModel.TYPE_FOLDER) {
+				lines.push(`By default, the ${singular} will be moved **to the trash**. To permanently delete it, add the query parameter \`permanent=1\``);
+				lines.push('');
+			}
 		}
 
 		{

packages/app-cli/app/command-attach.ts

@@ -13,6 +13,7 @@ class Command extends BaseCommand {
 		return _('Attaches the given file to the note.');
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public override async action(args: any) {
 		const title = args['note'];
 

packages/app-cli/app/command-cat.ts

@@ -18,6 +18,7 @@ class Command extends BaseCommand {
 		return [['-v, --verbose', _('Displays the complete information about note.')]];
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public override async action(args: any) {
 		const title = args['note'];
 

packages/app-cli/app/command-config.ts

@@ -27,6 +27,7 @@ class Command extends BaseCommand {
 		return new Promise<void>((resolve, reject) => {
 			// being defensive and not attempting to settle twice
 			let isSettled = false;
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 			const chunks: any = [];
 
 			inputStream.on('readable', () => {
@@ -67,6 +68,7 @@ class Command extends BaseCommand {
 		});
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public override async action(args: any) {
 		const verbose = args.options.verbose;
 		const isExport = args.options.export;
@@ -91,6 +93,7 @@ class Command extends BaseCommand {
 			keys.sort();
 
 			if (isExport) {
+				// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 				const resultObj = keys.reduce<Record<string, any>>((acc, key) => {
 					const value = Setting.value(key);
 					if (!verbose && !value) return acc;

packages/app-cli/app/command-cp.ts

@@ -13,6 +13,7 @@ class Command extends BaseCommand {
 		return _('Duplicates the notes matching <note> to [notebook]. If no notebook is specified the note is duplicated in the current notebook.');
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public override async action(args: any) {
 		let folder = null;
 		if (args['notebook']) {

packages/app-cli/app/command-done.ts

@@ -15,6 +15,7 @@ class Command extends BaseCommand {
 		return _('Marks a to-do as done.');
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public static async handleAction(commandInstance: BaseCommand, args: any, isCompleted: boolean) {
 		const note: NoteEntity = await app().loadItem(BaseModel.TYPE_NOTE, args.note);
 		commandInstance.encryptionCheck(note);
@@ -31,6 +32,7 @@ class Command extends BaseCommand {
 		});
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public override async action(args: any) {
 		await Command.handleAction(this, args, true);
 	}

packages/app-cli/app/command-dump.ts

@@ -2,6 +2,7 @@ import BaseCommand from './base-command';
 import Folder from '@joplin/lib/models/Folder';
 import Note from '@joplin/lib/models/Note';
 import Tag from '@joplin/lib/models/Tag';
+import { FolderEntity, NoteEntity } from '@joplin/lib/services/database/types';
 
 class Command extends BaseCommand {
 	public override usage() {
@@ -17,7 +18,7 @@ class Command extends BaseCommand {
 	}
 
 	public override async action() {
-		let items = [];
+		let items: (NoteEntity | FolderEntity)[] = [];
 		const folders = await Folder.all();
 		for (let i = 0; i < folders.length; i++) {
 			const folder = folders[i];

packages/app-cli/app/command-e2ee.ts

@@ -8,8 +8,7 @@ import shim from '@joplin/lib/shim';
 import * as pathUtils from '@joplin/lib/path-utils';
 import { getEncryptionEnabled, localSyncInfo } from '@joplin/lib/services/synchronizer/syncInfoUtils';
 import { generateMasterKeyAndEnableEncryption, loadMasterKeysFromSettings, masterPasswordIsValid, setupAndDisableEncryption } from '@joplin/lib/services/e2ee/utils';
-const imageType = require('image-type');
+import { fromFile as fileTypeFromFile } from 'file-type';
-const readChunk = require('read-chunk');
 
 class Command extends BaseCommand {
 	public usage() {
@@ -30,9 +29,11 @@ class Command extends BaseCommand {
 		];
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public async action(args: any) {
 		const options = args.options;
 
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 		const askForMasterKey = async (error: any) => {
 			const masterKeyId = error.masterKeyId;
 			const password = await this.prompt(_('Enter master password:'), { type: 'string', secure: true });
@@ -134,8 +135,7 @@ class Command extends BaseCommand {
 					const outputDir = options.output ? options.output : require('os').tmpdir();
 					let outFile = `${outputDir}/${pathUtils.filename(args.path)}.${Date.now()}.bin`;
 					await EncryptionService.instance().decryptFile(args.path, outFile);
-					const buffer = await readChunk(outFile, 0, 64);
+					const detectedType = await fileTypeFromFile(outFile);
-					const detectedType = imageType(buffer);
 
 					if (detectedType) {
 						const newOutFile = `${outFile}.${detectedType.ext}`;

packages/app-cli/app/command-edit.ts

@@ -17,6 +17,7 @@ class Command extends BaseCommand {
 		return _('Edit note.');
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public override async action(args: any) {
 		let tempFilePath: string|null = null;
 

packages/app-cli/app/command-export.ts

@@ -24,6 +24,7 @@ class Command extends BaseCommand {
 		return [['--format <format>', _('Destination format: %s', formats.join(', '))], ['--note <note>', _('Exports only the given note.')], ['--notebook <notebook>', _('Exports only the given notebook.')]];
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public override async action(args: any) {
 		const exportOptions: ExportOptions = {};
 		exportOptions.path = args.path;
@@ -35,10 +36,12 @@ class Command extends BaseCommand {
 		if (args.options.note) {
 			const notes = await app().loadItems(BaseModel.TYPE_NOTE, args.options.note, { parent: app().currentFolder() });
 			if (!notes.length) throw new Error(_('Cannot find "%s".', args.options.note));
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 			exportOptions.sourceNoteIds = notes.map((n: any) => n.id);
 		} else if (args.options.notebook) {
 			const folders = await app().loadItems(BaseModel.TYPE_FOLDER, args.options.notebook);
 			if (!folders.length) throw new Error(_('Cannot find "%s".', args.options.notebook));
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 			exportOptions.sourceFolderIds = folders.map((n: any) => n.id);
 		}
 

packages/app-cli/app/command-geoloc.ts

@@ -13,6 +13,7 @@ class Command extends BaseCommand {
 		return _('Displays a geolocation URL for the note.');
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public override async action(args: any) {
 		const title = args['note'];
 

packages/app-cli/app/command-help.ts

@@ -29,6 +29,7 @@ class Command extends BaseCommand {
 		return output;
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public override async action(args: any) {
 		const stdoutWidth = app().commandStdoutMaxWidth();
 

packages/app-cli/app/command-import.ts

@@ -30,6 +30,7 @@ class Command extends BaseCommand {
 		];
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public override async action(args: any) {
 		const folder = await app().loadItem(BaseModel.TYPE_FOLDER, args.notebook);
 

packages/app-cli/app/command-ls.ts

@@ -7,6 +7,7 @@ import Setting from '@joplin/lib/models/Setting';
 import Note from '@joplin/lib/models/Note';
 const { sprintf } = require('sprintf-js');
 import time from '@joplin/lib/time';
+import { NoteEntity } from '@joplin/lib/services/database/types';
 const { cliUtils } = require('./cli-utils.js');
 
 class Command extends BaseCommand {
@@ -33,11 +34,13 @@ class Command extends BaseCommand {
 		];
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public override async action(args: any) {
 		const pattern = args['note-pattern'];
 		let items = [];
 		const options = args.options;
 
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 		const queryOptions: any = {};
 		if (options.limit) queryOptions.limit = options.limit;
 		if (options.sort) {
@@ -71,7 +74,7 @@ class Command extends BaseCommand {
 			let hasTodos = false;
 			for (let i = 0; i < items.length; i++) {
 				const item = items[i];
-				if (item.is_todo) {
+				if ((item as NoteEntity).is_todo) {
 					hasTodos = true;
 					break;
 				}
@@ -103,8 +106,8 @@ class Command extends BaseCommand {
 				}
 
 				if (hasTodos) {
-					if (item.is_todo) {
+					if ((item as NoteEntity).is_todo) {
-						row.push(sprintf('[%s]', item.todo_completed ? 'X' : ' '));
+						row.push(sprintf('[%s]', (item as NoteEntity).todo_completed ? 'X' : ' '));
 					} else {
 						row.push('   ');
 					}

packages/app-cli/app/command-mkbook.ts

@@ -43,6 +43,7 @@ class Command extends BaseCommand {
 
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public async action(args: any) {
 		const targetFolder = args.options.parent;
 

packages/app-cli/app/command-mv.ts

@@ -14,6 +14,7 @@ class Command extends BaseCommand {
 		return _('Moves the given <item> to [notebook]');
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public override async action(args: any) {
 		const pattern = args['item'];
 		const destination = args['notebook'];

packages/app-cli/app/command-ren.ts

@@ -14,6 +14,7 @@ class Command extends BaseCommand {
 		return _('Renames the given <item> (note or notebook) to <name>.');
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public override async action(args: any) {
 		const pattern = args['item'];
 		const name = args['name'];

packages/app-cli/app/command-restore.ts

@@ -0,0 +1,27 @@
+import BaseCommand from './base-command';
+import app from './app';
+import { _ } from '@joplin/lib/locale';
+import restoreItems from '@joplin/lib/services/trash/restoreItems';
+
+class Command extends BaseCommand {
+	public override usage() {
+		return 'restore <pattern>';
+	}
+
+	public override description() {
+		return _('Restore the items matching <pattern> from the trash.');
+	}
+
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
+	public override async action(args: any) {
+		const pattern = args['pattern'];
+
+		const items = await app().loadItems('folderOrNote', pattern);
+		if (!items.length) throw new Error(_('Cannot find "%s".', pattern));
+
+		const ids = items.map(n => n.id);
+		await restoreItems(items[0].type_, ids, { useRestoreFolder: true });
+	}
+}
+
+module.exports = Command;

packages/app-cli/app/command-rmbook.test.ts

@@ -0,0 +1,81 @@
+import { setupDatabaseAndSynchronizer, switchClient } from '@joplin/lib/testing/test-utils';
+import { setupCommandForTesting, setupApplication } from './utils/testUtils';
+import Folder from '@joplin/lib/models/Folder';
+import Note from '@joplin/lib/models/Note';
+const Command = require('./command-rmbook');
+
+const setUpCommand = () => {
+	const command = setupCommandForTesting(Command);
+	const promptMock = jest.fn(() => true);
+	command.setPrompt(promptMock);
+
+	return { command, promptMock };
+};
+
+
+describe('command-rmbook', () => {
+	beforeEach(async () => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+		await setupApplication();
+	});
+
+	it('should ask before moving to the trash', async () => {
+		await Folder.save({ title: 'folder1' });
+
+		const { command, promptMock } = setUpCommand();
+
+		await command.action({ 'notebook': 'folder1', options: {} });
+
+		expect(promptMock).toHaveBeenCalledTimes(1);
+
+		const folder1 = await Folder.loadByTitle('folder1');
+		expect(folder1.deleted_time).not.toBeFalsy();
+		expect((await Note.allItemsInTrash()).folderIds).toHaveLength(1);
+	});
+
+	it('cancelling a prompt should prevent deletion', async () => {
+		await Folder.save({ title: 'folder1' });
+
+		const { command, promptMock } = setUpCommand();
+		promptMock.mockImplementation(() => false);
+		await command.action({ 'notebook': 'folder1', options: {} });
+
+		expect((await Note.allItemsInTrash()).folderIds).toHaveLength(0);
+	});
+
+	it('should not prompt when the force flag is given', async () => {
+		const { id: folder1Id } = await Folder.save({ title: 'folder1' });
+		const { id: folder2Id } = await Folder.save({ title: 'folder2', parent_id: folder1Id });
+
+		const { command, promptMock } = setUpCommand();
+		await command.action({ 'notebook': 'folder1', options: { force: true } });
+
+		expect(promptMock).toHaveBeenCalledTimes(0);
+
+		expect((await Note.allItemsInTrash()).folderIds.includes(folder1Id)).toBe(true);
+		expect((await Note.allItemsInTrash()).folderIds.includes(folder2Id)).toBe(true);
+	});
+
+	it('should support permanent deletion', async () => {
+		const { id: folder1Id } = await Folder.save({ title: 'folder1' });
+		const { id: folder2Id } = await Folder.save({ title: 'folder2' });
+
+		const { command, promptMock } = setUpCommand();
+		await command.action({ 'notebook': 'folder1', options: { permanent: true, force: true } });
+		expect(promptMock).not.toHaveBeenCalled();
+
+		// Should be permanently deleted.
+		expect((await Note.allItemsInTrash()).folderIds.includes(folder1Id)).toBe(false);
+		expect(await Folder.load(folder1Id, { includeDeleted: true })).toBe(undefined);
+
+		// folder2 should not be deleted
+		expect(await Folder.load(folder2Id, { includeDeleted: false })).toBeTruthy();
+
+		// Should prompt before deleting
+		await command.action({ 'notebook': 'folder2', options: { permanent: true } });
+		expect(promptMock).toHaveBeenCalled();
+		expect(await Folder.load(folder2Id, { includeDeleted: false })).toBeUndefined();
+	});
+});
+

packages/app-cli/app/command-rmbook.ts

@@ -3,6 +3,7 @@ import app from './app';
 import { _ } from '@joplin/lib/locale';
 import Folder from '@joplin/lib/models/Folder';
 import BaseModel from '@joplin/lib/BaseModel';
+import { substrWithEllipsis } from '@joplin/lib/string-utils';
 
 class Command extends BaseCommand {
 	public override usage() {
@@ -14,19 +15,32 @@ class Command extends BaseCommand {
 	}
 
 	public override options() {
-		return [['-f, --force', _('Deletes the notebook without asking for confirmation.')]];
+		return [
+			['-f, --force', _('Deletes the notebook without asking for confirmation.')],
+			['-p, --permanent', _('Permanently deletes the notebook, skipping the trash.')],
+		];
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public override async action(args: any) {
 		const pattern = args['notebook'];
 		const force = args.options && args.options.force === true;
 
 		const folder = await app().loadItem(BaseModel.TYPE_FOLDER, pattern);
 		if (!folder) throw new Error(_('Cannot find "%s".', pattern));
-		const ok = force ? true : await this.prompt(_('Delete notebook? All notes and sub-notebooks within this notebook will also be deleted.'), { booleanAnswerDefault: 'n' });
+
+		const permanent = args.options?.permanent === true || !!folder.deleted_time;
+		const ellipsizedFolderTitle = substrWithEllipsis(folder.title, 0, 32);
+		let msg;
+		if (permanent) {
+			msg = _('Permanently delete notebook "%s"?\n\nAll notes and sub-notebooks within this notebook will be permanently deleted.', ellipsizedFolderTitle);
+		} else {
+			msg = _('Move notebook "%s" to the trash?\n\nAll notes and sub-notebooks within this notebook will also be moved to the trash.', ellipsizedFolderTitle);
+		}
+		const ok = force ? true : await this.prompt(msg, { booleanAnswerDefault: 'n' });
 		if (!ok) return;
 
-		await Folder.delete(folder.id);
+		await Folder.delete(folder.id, { toTrash: !permanent, sourceDescription: 'rmbook command' });
 	}
 }
 

packages/app-cli/app/command-rmnote.test.ts

@@ -0,0 +1,57 @@
+import { setupDatabaseAndSynchronizer, switchClient } from '@joplin/lib/testing/test-utils';
+import { setupCommandForTesting, setupApplication } from './utils/testUtils';
+import Note from '@joplin/lib/models/Note';
+import Folder from '@joplin/lib/models/Folder';
+import app from './app';
+import { getTrashFolderId } from '@joplin/lib/services/trash';
+const Command = require('./command-rmnote');
+
+const setUpCommand = () => {
+	const command = setupCommandForTesting(Command);
+	const promptMock = jest.fn(() => true);
+	command.setPrompt(promptMock);
+
+	return { command, promptMock };
+};
+
+const createTestNote = async () => {
+	const folder = await Folder.save({ title: 'folder' });
+	app().switchCurrentFolder(folder);
+	return await Note.save({ title: 'note1', parent_id: folder.id });
+};
+
+
+describe('command-rmnote', () => {
+	beforeEach(async () => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+		await setupApplication();
+	});
+
+	it('should move to the trash by default, without prompting', async () => {
+		const { id: noteId } = await createTestNote();
+
+		const { command, promptMock } = setUpCommand();
+		await command.action({ 'note-pattern': 'note1', options: {} });
+		expect(promptMock).not.toHaveBeenCalled();
+
+		expect((await Note.allItemsInTrash()).noteIds.includes(noteId)).toBe(true);
+	});
+
+	it('should permanently delete trashed items by default, with prompting', async () => {
+		const { id: noteId } = await createTestNote();
+		const { command, promptMock } = setUpCommand();
+
+		// Should not prompt when deleting from a folder
+		await command.action({ 'note-pattern': 'note1', options: {} });
+		expect(promptMock).toHaveBeenCalledTimes(0);
+
+		// Should prompt when deleting from trash
+		app().switchCurrentFolder(await Folder.load(getTrashFolderId()));
+		await command.action({ 'note-pattern': 'note1', options: {} });
+		expect(promptMock).toHaveBeenCalledTimes(1);
+
+		expect(await Note.load(noteId, { includeDeleted: true })).toBe(undefined);
+	});
+});
+

packages/app-cli/app/command-rmnote.ts

@@ -2,7 +2,8 @@ import BaseCommand from './base-command';
 import app from './app';
 import { _ } from '@joplin/lib/locale';
 import Note from '@joplin/lib/models/Note';
-import BaseModel from '@joplin/lib/BaseModel';
+import BaseModel, { DeleteOptions } from '@joplin/lib/BaseModel';
+import { NoteEntity } from '@joplin/lib/services/database/types';
 
 class Command extends BaseCommand {
 	public override usage() {
@@ -14,20 +15,41 @@ class Command extends BaseCommand {
 	}
 
 	public override options() {
-		return [['-f, --force', _('Deletes the notes without asking for confirmation.')]];
+		return [
+			['-f, --force', _('Deletes the notes without asking for confirmation.')],
+			['-p, --permanent', _('Deletes notes permanently, skipping the trash.')],
+		];
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public override async action(args: any) {
 		const pattern = args['note-pattern'];
 		const force = args.options && args.options.force === true;
 
-		const notes = await app().loadItems(BaseModel.TYPE_NOTE, pattern);
+		const notes: NoteEntity[] = await app().loadItems(BaseModel.TYPE_NOTE, pattern);
 		if (!notes.length) throw new Error(_('Cannot find "%s".', pattern));
 
-		const ok = force ? true : await this.prompt(notes.length > 1 ? _('%d notes match this pattern. Delete them?', notes.length) : _('Delete note?'), { booleanAnswerDefault: 'n' });
+		let ok = true;
+		if (!force && notes.length > 1) {
+			ok = await this.prompt(_('%d notes match this pattern. Delete them?', notes.length), { booleanAnswerDefault: 'n' });
+		}
+
+		const permanent = (args.options?.permanent === true) || notes.every(n => !!n.deleted_time);
+		if (!force && permanent) {
+			const message = (
+				notes.length === 1 ? _('This will permanently delete the note "%s". Continue?', notes[0].title) : _('%d notes will be permanently deleted. Continue?', notes.length)
+			);
+			ok = await this.prompt(message, { booleanAnswerDefault: 'n' });
+		}
+
 		if (!ok) return;
-		const ids = notes.map((n: any) => n.id);
+
-		await Note.batchDelete(ids);
+		const ids = notes.map(n => n.id);
+		const options: DeleteOptions = {
+			toTrash: !permanent,
+			sourceDescription: 'rmnote',
+		};
+		await Note.batchDelete(ids, options);
 	}
 }
 

packages/app-cli/app/command-set.ts

@@ -22,6 +22,7 @@ class Command extends BaseCommand {
 		return _('Sets the property <name> of the given <note> to the given [value]. Possible properties are:\n\n%s', s.join(', '));
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public override async action(args: any) {
 		const title = args['note'];
 		const propName = args['name'];
@@ -36,6 +37,7 @@ class Command extends BaseCommand {
 
 			const timestamp = Date.now();
 
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 			const newNote: any = {
 				id: notes[i].id,
 				type_: notes[i].type_,

packages/app-cli/app/command-settingschema.ts

@@ -1,4 +1,4 @@
-import Setting, { SettingStorage } from '@joplin/lib/models/Setting';
+import Setting, { AppType, SettingStorage } from '@joplin/lib/models/Setting';
 import { SettingItemType } from '@joplin/lib/services/plugins/api/types';
 import shim from '@joplin/lib/shim';
 
@@ -35,7 +35,9 @@ class Command extends BaseCommand {
 		return false;
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public async action(args: any) {
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 		const schema: Record<string, any> = {
 			title: 'JSON schema for Joplin setting files',
 			'$id': Setting.schemaUrl,
@@ -52,15 +54,17 @@ class Command extends BaseCommand {
 			const type = settingTypeToSchemaType(md.type);
 			if (!type) continue;
 
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 			const props: Record<string, any> = {};
 			props.type = type;
 			props.default = md.value;
 
 			const description: string[] = [];
 			if (md.label && md.label()) description.push(md.label());
-			if (md.description && md.description('desktop')) description.push(md.description('desktop'));
+			if (md.description && md.description(AppType.Desktop)) description.push(md.description(AppType.Desktop));
 
 			if (description.length) props.description = description.join('. ');
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 			if (md.isEnum) props.enum = Object.keys(md.options()).map((v: any) => Setting.formatValue(key, v));
 			if ('minimum' in md) props.minimum = md.minimum;
 			if ('maximum' in md) props.maximum = md.maximum;

packages/app-cli/app/command-sync.ts

@@ -14,12 +14,18 @@ const { cliUtils } = require('./cli-utils.js');
 const md5 = require('md5');
 import * as locker from 'proper-lockfile';
 import { pathExists, writeFile } from 'fs-extra';
+import { checkIfLoginWasSuccessful, generateApplicationConfirmUrl } from '@joplin/lib/services/joplinCloudUtils';
+import Logger from '@joplin/utils/Logger';
+import { uuidgen } from '@joplin/lib/uuid';
+
+const logger = Logger.create('command-sync');
 
 class Command extends BaseCommand {
 
 	private syncTargetId_: number = null;
 	// eslint-disable-next-line @typescript-eslint/ban-types -- Old code before rule was applied
 	private releaseLockFn_: Function = null;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	private oneDriveApiUtils_: any = null;
 
 	public usage() {
@@ -54,6 +60,7 @@ class Command extends BaseCommand {
 			// OneDrive
 			this.oneDriveApiUtils_ = new OneDriveApiNodeUtils(syncTarget.api());
 			const auth = await this.oneDriveApiUtils_.oauthDance({
+				// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 				log: (...s: any[]) => {
 					return this.stdout(...s);
 				},
@@ -84,9 +91,36 @@ class Command extends BaseCommand {
 			Setting.setValue(`sync.${this.syncTargetId_}.auth`, response.access_token);
 			api.setAuthToken(response.access_token);
 			return true;
+		} else if (syncTargetMd.name === 'joplinCloud') {
+			const applicationAuthId = uuidgen();
+			const checkForCredentials = async () => {
+				try {
+					const applicationAuthUrl = `${Setting.value('sync.10.path')}/api/application_auth/${applicationAuthId}`;
+					const response = await checkIfLoginWasSuccessful(applicationAuthUrl);
+					if (response && response.success) {
+						return response;
+					}
+					return null;
+				} catch (error) {
+					logger.error(error);
+					throw error;
+				}
+			};
+
+			this.stdout(_('To allow Joplin to synchronise with Joplin Cloud, please login using this URL:'));
+
+			const confirmUrl = `${Setting.value('sync.10.website')}/applications/${applicationAuthId}/confirm`;
+			const urlWithClient = await generateApplicationConfirmUrl(confirmUrl);
+			this.stdout(urlWithClient);
+
+			const authorized = await this.prompt(_('Have you authorised the application login in the above URL?'), { booleanAnswerDefault: 'y' });
+			if (!authorized) return false;
+			const result = await checkForCredentials();
+			if (!result) return false;
+			return true;
 		}
 
-		this.stdout(_('Not authentified with %s. Please provide any missing credentials.', syncTargetMd.label));
+		this.stdout(_('Not authenticated with %s. Please provide any missing credentials.', syncTargetMd.label));
 		return false;
 	}
 
@@ -101,6 +135,7 @@ class Command extends BaseCommand {
 		return !!this.oneDriveApiUtils_;
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public async action(args: any) {
 		this.releaseLockFn_ = null;
 
@@ -149,7 +184,9 @@ class Command extends BaseCommand {
 
 			const sync = await syncTarget.synchronizer();
 
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 			const options: any = {
+				// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 				onProgress: (report: any) => {
 					const lines = Synchronizer.reportToLines(report);
 					if (lines.length) cliUtils.redraw(lines.join(' '));

packages/app-cli/app/command-testing.ts

@@ -6,11 +6,13 @@ import populateDatabase from '@joplin/lib/services/debug/populateDatabase';
 import { readCredentialFile } from '@joplin/lib/utils/credentialFiles';
 import JoplinServerApi from '@joplin/lib/JoplinServerApi';
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 function randomElement(array: any[]): any {
 	if (!array.length) return null;
 	return array[Math.floor(Math.random() * array.length)];
 }
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 function itemCount(args: any) {
 	const count = Number(args.arg0);
 	if (!count || isNaN(count)) throw new Error('Note count must be specified');
@@ -30,6 +32,7 @@ class Command extends BaseCommand {
 		return false;
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public options(): any[] {
 		return [
 			['--folder-count <count>', 'Folders to create'],
@@ -40,6 +43,7 @@ class Command extends BaseCommand {
 		];
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public async action(args: any) {
 		const { command, options } = args;
 
@@ -53,6 +57,7 @@ class Command extends BaseCommand {
 			});
 		}
 
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 		const promises: any[] = [];
 
 		if (command === 'createRandomNotes') {
@@ -85,7 +90,7 @@ class Command extends BaseCommand {
 
 			for (let i = 0; i < noteCount; i++) {
 				const noteId = randomElement(noteIds);
-				promises.push(Note.delete(noteId));
+				promises.push(Note.delete(noteId, { sourceDescription: 'command-testing' }));
 			}
 		}
 

packages/app-cli/app/command-use.ts

@@ -16,6 +16,7 @@ class Command extends BaseCommand {
 		return ['cli'];
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public override async action(args: any) {
 		const folder = await app().loadItem(BaseModel.TYPE_FOLDER, args['notebook']);
 		if (!folder) throw new Error(_('Cannot find "%s".', args['notebook']));

packages/app-cli/app/gui/FolderListWidget.ts

@@ -1,16 +1,20 @@
-const Folder = require('@joplin/lib/models/Folder').default;
+import Folder from '@joplin/lib/models/Folder';
-const Tag = require('@joplin/lib/models/Tag').default;
+import Tag from '@joplin/lib/models/Tag';
-const BaseModel = require('@joplin/lib/BaseModel').default;
+import BaseModel from '@joplin/lib/BaseModel';
+import Setting from '@joplin/lib/models/Setting';
+import { _ } from '@joplin/lib/locale';
+import { FolderEntity } from '@joplin/lib/services/database/types';
+import { getDisplayParentId, getTrashFolderId } from '@joplin/lib/services/trash';
 const ListWidget = require('tkwidgets/ListWidget.js');
-const Setting = require('@joplin/lib/models/Setting').default;
-const _ = require('@joplin/lib/locale')._;
 
-class FolderListWidget extends ListWidget {
+export default class FolderListWidget extends ListWidget {
-	constructor() {
+
+	private folders_: FolderEntity[] = [];
+
+	public constructor() {
 		super();
 
 		this.tags_ = [];
-		this.folders_ = [];
 		this.searches_ = [];
 		this.selectedFolderId_ = null;
 		this.selectedTagId_ = null;
@@ -21,7 +25,8 @@ class FolderListWidget extends ListWidget {
 		this.trimItemTitle = false;
 		this.showIds = false;
 
-		this.itemRenderer = item => {
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
+		this.itemRenderer = (item: any) => {
 			const output = [];
 			if (item === '-') {
 				output.push('-'.repeat(this.innerWidth));
@@ -33,13 +38,13 @@ class FolderListWidget extends ListWidget {
 				}
 				output.push(Folder.displayTitle(item));
 
-				if (Setting.value('showNoteCounts')) {
+				if (Setting.value('showNoteCounts') && !item.deleted_time && item.id !== getTrashFolderId()) {
 					let noteCount = item.note_count;
-					// Subtract children note_count from parent folder.
 					if (this.folderHasChildren_(this.folders, item.id)) {
 						for (let i = 0; i < this.folders.length; i++) {
 							if (this.folders[i].parent_id === item.id) {
-								noteCount -= this.folders[i].note_count;
+								// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
+								noteCount -= (this.folders[i] as any).note_count;
 							}
 						}
 					}
@@ -56,113 +61,122 @@ class FolderListWidget extends ListWidget {
 		};
 	}
 
-	folderDepth(folders, folderId) {
+	public folderDepth(folders: FolderEntity[], folderId: string) {
 		let output = 0;
 		while (true) {
 			const folder = BaseModel.byId(folders, folderId);
-			if (!folder || !folder.parent_id) return output;
+			const folderParentId = getDisplayParentId(folder, folders.find(f => f.id === folder.parent_id));
+			if (!folder || !folderParentId) return output;
 			output++;
-			folderId = folder.parent_id;
+			folderId = folderParentId;
 		}
 	}
 
-	get selectedFolderId() {
+	public get selectedFolderId() {
 		return this.selectedFolderId_;
 	}
 
-	set selectedFolderId(v) {
+	public set selectedFolderId(v) {
 		this.selectedFolderId_ = v;
 		this.updateIndexFromSelectedItemId();
 		this.invalidate();
 	}
 
-	get selectedSearchId() {
+	public get selectedSearchId() {
 		return this.selectedSearchId_;
 	}
 
-	set selectedSearchId(v) {
+	public set selectedSearchId(v) {
 		this.selectedSearchId_ = v;
 		this.updateIndexFromSelectedItemId();
 		this.invalidate();
 	}
 
-	get selectedTagId() {
+	public get selectedTagId() {
 		return this.selectedTagId_;
 	}
 
-	set selectedTagId(v) {
+	public set selectedTagId(v) {
 		this.selectedTagId_ = v;
 		this.updateIndexFromSelectedItemId();
 		this.invalidate();
 	}
 
-	get notesParentType() {
+	public get notesParentType() {
 		return this.notesParentType_;
 	}
 
-	set notesParentType(v) {
+	public set notesParentType(v) {
 		this.notesParentType_ = v;
 		this.updateIndexFromSelectedItemId();
 		this.invalidate();
 	}
 
-	get searches() {
+	public get searches() {
 		return this.searches_;
 	}
 
-	set searches(v) {
+	public set searches(v) {
 		this.searches_ = v;
 		this.updateItems_ = true;
 		this.updateIndexFromSelectedItemId();
 		this.invalidate();
 	}
 
-	get tags() {
+	public get tags() {
 		return this.tags_;
 	}
 
-	set tags(v) {
+	public set tags(v) {
 		this.tags_ = v;
 		this.updateItems_ = true;
 		this.updateIndexFromSelectedItemId();
 		this.invalidate();
 	}
 
-	get folders() {
+	public get folders() {
 		return this.folders_;
 	}
 
-	set folders(v) {
+	public set folders(v) {
 		this.folders_ = v;
 		this.updateItems_ = true;
 		this.updateIndexFromSelectedItemId();
 		this.invalidate();
 	}
 
-	toggleShowIds() {
+	public toggleShowIds() {
 		this.showIds = !this.showIds;
 		this.invalidate();
 	}
 
-	folderHasChildren_(folders, folderId) {
+	public folderHasChildren_(folders: FolderEntity[], folderId: string) {
 		for (let i = 0; i < folders.length; i++) {
 			const folder = folders[i];
-			if (folder.parent_id === folderId) return true;
+			const folderParentId = getDisplayParentId(folder, folders.find(f => f.id === folder.parent_id));
+			if (folderParentId === folderId) return true;
 		}
 		return false;
 	}
 
-	render() {
+	public render() {
 		if (this.updateItems_) {
 			this.logger().debug('Rebuilding items...', this.notesParentType, this.selectedJoplinItemId, this.selectedSearchId);
 			const wasSelectedItemId = this.selectedJoplinItemId;
 			const previousParentType = this.notesParentType;
 
-			let newItems = [];
+			this.logger().info('FFFFFFFFFFFFF', JSON.stringify(this.folders, null, 4));
-			const orderFolders = parentId => {
+
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
+			let newItems: any[] = [];
+			const orderFolders = (parentId: string) => {
+				this.logger().info('PARENT', parentId);
 				for (let i = 0; i < this.folders.length; i++) {
 					const f = this.folders[i];
-					const folderParentId = f.parent_id ? f.parent_id : '';
+					const originalParent = this.folders_.find(f => f.id === f.parent_id);
+
+					const folderParentId = getDisplayParentId(f, originalParent); // f.parent_id ? f.parent_id : '';
+					this.logger().info('FFF', f.title, folderParentId);
 					if (folderParentId === parentId) {
 						newItems.push(f);
 						if (this.folderHasChildren_(this.folders, f.id)) orderFolders(f.id);
@@ -192,7 +206,7 @@ class FolderListWidget extends ListWidget {
 		super.render();
 	}
 
-	get selectedJoplinItemId() {
+	public get selectedJoplinItemId() {
 		if (!this.notesParentType) return '';
 		if (this.notesParentType === 'Folder') return this.selectedFolderId;
 		if (this.notesParentType === 'Tag') return this.selectedTagId;
@@ -200,17 +214,15 @@ class FolderListWidget extends ListWidget {
 		throw new Error(`Unknown parent type: ${this.notesParentType}`);
 	}
 
-	get selectedJoplinItem() {
+	public get selectedJoplinItem() {
 		const id = this.selectedJoplinItemId;
 		const index = this.itemIndexByKey('id', id);
 		return this.itemAt(index);
 	}
 
-	updateIndexFromSelectedItemId(itemId = null) {
+	public updateIndexFromSelectedItemId(itemId: string = null) {
 		if (itemId === null) itemId = this.selectedJoplinItemId;
 		const index = this.itemIndexByKey('id', itemId);
 		this.currentIndex = index >= 0 ? index : 0;
 	}
 }
-
-module.exports = FolderListWidget;