From a67cbb99a6a419b26ae8f7efc9a954940c0c6fee Mon Sep 17 00:00:00 2001
From: ayaka <ayaka@kitty.community>
Date: Tue, 18 Jun 2024 19:56:04 +1200
Subject: [PATCH] sync upstream

---
 .envrc                                 | 1 +
 .github/workflows/build-artifacts.yaml | 3 ++-
 .gitignore                             | 4 ++++
 README.md                              | 6 ------
 src/config.rs                          | 2 +-
 static/style.css                       | 1 +
 6 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 .envrc

diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..3550a30
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/.github/workflows/build-artifacts.yaml b/.github/workflows/build-artifacts.yaml
index 57632ef..695d1bf 100644
--- a/.github/workflows/build-artifacts.yaml
+++ b/.github/workflows/build-artifacts.yaml
@@ -7,6 +7,8 @@ on:
       - "compose.*"
     branches:
       - "main"
+  release:
+    types: [published]
 
 env: 
   CARGO_TERM_COLOR: always
@@ -60,7 +62,6 @@ jobs:
 
       - name: Upload release
         uses: softprops/action-gh-release@v1
-        if: github.base_ref != 'main' && github.event_name == 'release'
         with:
           tag_name: ${{ steps.version.outputs.VERSION }}
           name: ${{ steps.version.outputs.VERSION }} - ${{ github.event.head_commit.message }}
diff --git a/.gitignore b/.gitignore
index 323a69d..a8d371a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,7 @@
 .env
 # Idea Files
 .idea/
+
+# nix files
+.direnv/
+result
diff --git a/README.md b/README.md
index 6bda401..d7e471f 100644
--- a/README.md
+++ b/README.md
@@ -181,12 +181,6 @@ docker logs -f redlib
 
 ### Docker CLI
 
-> [!IMPORTANT]
-> If deploying on:
->
-> - an `arm64` platform, use the `quay.io/redlib/redlib:latest-arm` image instead.
-> - an `armv7` platform, use the `quay.io/redlib/redlib:latest-armv7` image instead.
-
 Deploy Redlib:
 
 ```bash
diff --git a/src/config.rs b/src/config.rs
index c7ebb58..e345537 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -156,7 +156,7 @@ fn get_setting_from_config(name: &str, config: &Config) -> Option<String> {
 		"REDLIB_DEFAULT_HIDE_HLS_NOTIFICATION" => config.default_hide_hls_notification.clone(),
 		"REDLIB_DEFAULT_WIDE" => config.default_wide.clone(),
 		"REDLIB_DEFAULT_HIDE_AWARDS" => config.default_hide_awards.clone(),
-		"REDLIB_DEFAULT_HIDE_SIDEBAR_AND_SUMMARY" => config.default_hide_awards.clone(),
+		"REDLIB_DEFAULT_HIDE_SIDEBAR_AND_SUMMARY" => config.default_hide_sidebar_and_summary.clone(),
 		"REDLIB_DEFAULT_HIDE_SCORE" => config.default_hide_score.clone(),
 		"REDLIB_DEFAULT_SUBSCRIPTIONS" => config.default_subscriptions.clone(),
 		"REDLIB_DEFAULT_DISABLE_VISIT_REDDIT_CONFIRMATION" => config.default_disable_visit_reddit_confirmation.clone(),
diff --git a/static/style.css b/static/style.css
index 4f99e34..54093f0 100644
--- a/static/style.css
+++ b/static/style.css
@@ -34,6 +34,7 @@
 	font-family: 'Inter';
 	src: url('/Inter.var.woff2') format('woff2-variations');
 	font-style: normal;
+	font-weight: 100 900;
 }
 
 /* Automatic theme selection */