From 6e3c03f9850f5736d35234bec5dc26b2d775c8f7 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 5 Jul 2023 19:41:54 +0800 Subject: [PATCH 1/4] :art: Update block ref color --- app/appearance/themes/daylight/theme.css | 2 +- app/appearance/themes/midnight/theme.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/appearance/themes/daylight/theme.css b/app/appearance/themes/daylight/theme.css index 5a301bb72..c6df34e47 100644 --- a/app/appearance/themes/daylight/theme.css +++ b/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 */ diff --git a/app/appearance/themes/midnight/theme.css b/app/appearance/themes/midnight/theme.css index dd227053a..15f2c1263 100644 --- a/app/appearance/themes/midnight/theme.css +++ b/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 */ From 19ed48a05ce007722d8367da7bf37f49382f147b Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 5 Jul 2023 19:47:46 +0800 Subject: [PATCH 2/4] :art: Update text --- app/appearance/langs/en_US.json | 4 ++-- app/appearance/langs/es_ES.json | 4 ++-- app/appearance/langs/fr_FR.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index b5608dac1..95cafa208 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -428,9 +428,9 @@ "customEmoji": "Add custom emoji", "customEmojiTip": "Open Emoji folder, put the picture in and click the refresh button", "recentEmoji": "Common Emoticons", - "andSubFile": "and its x subfiles", + "andSubFile": "and its x subdocs", "changeIcon": "Change icon", - "includeSubFile": "\nInclude x subfiles", + "includeSubFile": "\nInclude x subdocs", "untitled": "Untitled", "lockScreen": "Lock Screen", "cloudIntro1": "End-to-end encrypted data sync", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index c2c07d1d0..44e0428c6 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -428,9 +428,9 @@ "customEmoji": "Añadir un emoji personalizado", "customEmojiTip": "Abrir carpeta de emojis, poner la imagen y hacer clic en el botón de actualización", "recentEmoji": "Emoticonos comunes", - "andSubFile": "y sus x subarchivos", + "andSubFile": "y sus x 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", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 1c420162e..a9c8b9cc9 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -428,9 +428,9 @@ "customEmoji": "Ajouter un emoji personnalisé", "customEmojiTip": "Ouvrir Emoji folder, insérez l'image et cliquez sur le bouton d'actualisation", "recentEmoji": "Emoticônes courantes", - "andSubFile": "et son x sous-fichiers", + "andSubFile": "et son x 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", From 944180f9ccdfa1fe9fdd908f6211f37b6bf6a83d Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 5 Jul 2023 19:57:32 +0800 Subject: [PATCH 3/4] :art: Change rhy result cache time to 24 hours if on the docker --- kernel/util/rhy.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kernel/util/rhy.go b/kernel/util/rhy.go index b3937a1b5..4620bf5dd 100644 --- a/kernel/util/rhy.go +++ b/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 } From cdf0477ca284faa0974f13de62f323418fb13451 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 5 Jul 2023 20:05:08 +0800 Subject: [PATCH 4/4] :octocat: Update cd --- .github/workflows/cd.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index b8374660a..8906301df 100644 --- a/.github/workflows/cd.yml +++ b/.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 }}