From d0e081e6a0f9eb35aa481cb931a4e6ea3389fc58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 19:21:11 -0400 Subject: [PATCH 1/3] chore(deps): bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows (#214) Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.1.7. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4.1.7) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/main-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main-docker.yml b/.github/workflows/main-docker.yml index 9a10ac7..ea521b1 100644 --- a/.github/workflows/main-docker.yml +++ b/.github/workflows/main-docker.yml @@ -76,7 +76,7 @@ jobs: steps: - name: Download digests - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4.1.7 with: name: digests path: /tmp/digests From 438e412be3b038bf2d6f600778e8a13a2791e018 Mon Sep 17 00:00:00 2001 From: Butter Cat Date: Tue, 3 Sep 2024 19:21:33 -0400 Subject: [PATCH 2/3] Add anchor to comment link (#212) --- templates/comment.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/comment.html b/templates/comment.html index ef1f4d8..36c9b60 100644 --- a/templates/comment.html +++ b/templates/comment.html @@ -24,7 +24,7 @@ {% if author.flair.flair_parts.len() > 0 %} {% call utils::render_flair(author.flair.flair_parts) %} {% endif %} - {{ rel_time }} + {{ rel_time }} {% if edited.0 != "".to_string() %}edited {{ edited.0 }}{% endif %} {% if !awards.is_empty() && prefs.hide_awards != "on" %} • From c494fbec318c8bc93a81756f7a3308f55435d379 Mon Sep 17 00:00:00 2001 From: Kot C Date: Tue, 3 Sep 2024 18:44:04 -0500 Subject: [PATCH 3/3] Insert noindex meta for ROBOTS_DISABLE_INDEXING (#199) (#207) --- src/utils.rs | 12 ++++++++++++ templates/base.html | 3 +++ 2 files changed, 15 insertions(+) diff --git a/src/utils.rs b/src/utils.rs index ee1fc66..ff968f8 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -1096,6 +1096,18 @@ pub fn enable_rss() -> bool { } } +/// Returns true if the config/env variable `REDLIB_ROBOTS_DISABLE_INDEXING` carries the +/// value `on`. +/// +/// If this variable is set as such, the instance will block all robots in robots.txt and +/// insert the noindex, nofollow meta tag on every page. +pub fn disable_indexing() -> bool { + match get_setting("REDLIB_ROBOTS_DISABLE_INDEXING") { + Some(val) => val == "on", + None => false, + } +} + // Determines if a request shoud redirect to a nsfw landing gate. pub fn should_be_nsfw_gated(req: &Request, req_url: &str) -> bool { let sfw_instance = sfw_only(); diff --git a/templates/base.html b/templates/base.html index 139c76f..1c3ef18 100644 --- a/templates/base.html +++ b/templates/base.html @@ -8,6 +8,9 @@ + {% if crate::utils::disable_indexing() %} + + {% endif %}