Merge remote-tracking branch 'origin/dev' into dev

.github/workflows/cd.yml

@@ -55,15 +55,14 @@ jobs:
 
       - name: Create Release
         id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: ncipollo/release-action@v1
         with:
-          release_name: ${{ steps.release_info.outputs.release_version }}
-          tag_name: ${{ github.ref }}
+          name: ${{ steps.release_info.outputs.release_version }}
+          tag: ${{ github.ref }}
           body: ${{ env.release_body }}
           draft: false
           prerelease: true
+          token: ${{ secrets.GITHUB_TOKEN }}
 
   build:
     runs-on: ${{ matrix.config.os }}

app/appearance/langs/en_US.json

@@ -428,9 +428,9 @@
   "customEmoji": "Add custom emoji",
   "customEmojiTip": "Open <a href=\"javascript:void(0)\" id=\"appearanceOpenEmoji\">Emoji folder</a>, put the picture in and click the refresh button",
   "recentEmoji": "Common Emoticons",
-  "andSubFile": "and its <b>x</b> subfiles",
+  "andSubFile": "and its <b>x</b> subdocs",
   "changeIcon": "Change icon",
-  "includeSubFile": "\nInclude x subfiles",
+  "includeSubFile": "\nInclude x subdocs",
   "untitled": "Untitled",
   "lockScreen": "Lock Screen",
   "cloudIntro1": "End-to-end encrypted data sync",

app/appearance/langs/es_ES.json

@@ -428,9 +428,9 @@
   "customEmoji": "Añadir un emoji personalizado",
   "customEmojiTip": "Abrir <a href=\"javascript:void(0)\" id=\"appearanceOpenEmoji\">carpeta de emojis</a>, poner la imagen y hacer clic en el botón de actualización",
   "recentEmoji": "Emoticonos comunes",
-  "andSubFile": "y sus <b>x</b> subarchivos",
+  "andSubFile": "y sus <b>x</b> documentos secundarios",
   "changeIcon": "Cambiar el icono",
-  "includeSubFile": "\nIncluir x subfichas",
+  "includeSubFile": "\nIncluir x documentos secundarios",
   "untitled": "Sin título",
   "lockScreen": "Pantalla de bloqueo",
   "cloudIntro1": "Sincronización de datos cifrada de extremo a extremo",

app/appearance/langs/fr_FR.json

@@ -428,9 +428,9 @@
   "customEmoji": "Ajouter un emoji personnalisé",
   "customEmojiTip": "Ouvrir <a href=\"javascript:void(0)\" id=\"appearanceOpenEmoji\">Emoji folder</a>, insérez l'image et cliquez sur le bouton d'actualisation",
   "recentEmoji": "Emoticônes courantes",
-  "andSubFile": "et son <b>x</b> sous-fichiers",
+  "andSubFile": "et son <b>x</b> sous-documents",
   "changeIcon": "Changer l'icône",
-  "includeSubFile": "\nInclure x sous-fichiers",
+  "includeSubFile": "\nInclure x sous-documents",
   "untitled": "Sans titre",
   "lockScreen": "Verrouiller Écran",
   "cloudIntro1": "Synchronisation des données cryptées de bout en bout",

app/appearance/themes/daylight/theme.css

@@ -146,7 +146,7 @@
     --b3-protyle-inline-mark-background: rgb(252, 212, 126);
     --b3-protyle-inline-mark-color: #202124;
     --b3-protyle-inline-tag-color: #5f6368;
-    --b3-protyle-inline-blockref-color: #9984ea;
+    --b3-protyle-inline-blockref-color: #8957e5;
     --b3-protyle-inline-fileref-color: #21862e;
 
     /* PDF */

app/appearance/themes/midnight/theme.css

@@ -146,7 +146,7 @@
     --b3-protyle-inline-mark-background: rgba(255, 208, 0, .4);
     --b3-protyle-inline-mark-color: var(--b3-theme-on-background);
     --b3-protyle-inline-tag-color: #9aa0a6;
-    --b3-protyle-inline-blockref-color: hsl(254, 80%, 74.8%);
+    --b3-protyle-inline-blockref-color: #8957e5;
     --b3-protyle-inline-fileref-color: var(--b3-theme-secondary);
 
     /* PDF */

kernel/util/rhy.go

@@ -32,8 +32,13 @@ func GetRhyResult(force bool) (map[string]interface{}, error) {
 	rhyResultLock.Lock()
 	defer rhyResultLock.Unlock()
 
+	cacheDuration := int64(3600)
+	if ContainerDocker == Container {
+		cacheDuration = int64(3600 * 24)
+	}
+
 	now := time.Now().Unix()
-	if 3600 >= now-rhyResultCacheTime && !force && 0 < len(cachedRhyResult) {
+	if cacheDuration >= now-rhyResultCacheTime && !force && 0 < len(cachedRhyResult) {
 		return cachedRhyResult, nil
 	}