From 7918ed7f6a69d5483a80a86e07bb740bf8d7b562 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Mon, 24 Apr 2023 21:54:52 +0200
Subject: [PATCH] Fix signup from with registration application

---
 .gitignore                           | 3 ++-
 .woodpecker.yml                      | 4 ++--
 src/main.rs                          | 2 +-
 templates/components/header.html.hbs | 2 +-
 templates/user/register.html.hbs     | 6 +++---
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 11b4bfe..8660fb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,5 @@
 /docker/volumes
 
 # lemmybb
-/lemmybb_categories.hjson
\ No newline at end of file
+/lemmybb_categories.hjson
+http-cacache/
diff --git a/.woodpecker.yml b/.woodpecker.yml
index 677dc74..e7c20d5 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -41,7 +41,7 @@ pipeline:
       - cargo test --workspace --no-fail-fast
 
   nightly_build:
-    image: plugins/docker
+    image: woodpeckerci/plugin-docker-buildx
     settings:
       dockerfile: docker/Dockerfile
       username:
@@ -56,7 +56,7 @@ pipeline:
         - cron
 
   publish_release_docker_image:
-    image: plugins/docker
+    image: woodpeckerci/plugin-docker-buildx
     settings:
       dockerfile: docker/Dockerfile
       username:
diff --git a/src/main.rs b/src/main.rs
index a2f4b8e..b213772 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -43,7 +43,7 @@ use rocket_dyn_templates::Template;
 #[main]
 async fn main() -> Result<(), Error> {
     env_logger::Builder::from_env(
-        Env::default().default_filter_or("warn,lemmy_bb=debug,handlebars=info"),
+        Env::default().default_filter_or("warn,lemmy_bb=info,handlebars=info"),
     )
     .init();
     let rocket = init_rocket()?.launch();
diff --git a/templates/components/header.html.hbs b/templates/components/header.html.hbs
index 88a7a9c..bb1c26a 100644
--- a/templates/components/header.html.hbs
+++ b/templates/components/header.html.hbs
@@ -163,7 +163,7 @@
                     <li class="rightside" data-skip-responsive="true">
                         <a href="./login" accesskey="x" role="menuitem"> <i class="icon fa-power-off fa-fw" aria-hidden="true"></i><span>{{{i18n site_data "login"}}}</span> </a>
                     </li>
-                        {{#if site_data.site.site_view.site.open_registration}}
+                        {{#if (ne site_data.site.site_view.local_site.registration_mode "closed")}}
                         <li class="rightside" data-skip-responsive="true">
                             <a href="./register" role="menuitem"> <i class="icon fa-pencil-square-o fa-fw" aria-hidden="true"></i><span>{{{i18n site_data "register"}}}</span> </a>
                         </li>
diff --git a/templates/user/register.html.hbs b/templates/user/register.html.hbs
index b3c841a..b846c89 100644
--- a/templates/user/register.html.hbs
+++ b/templates/user/register.html.hbs
@@ -49,8 +49,8 @@
 
             <h3 class="captcha-title">{{{i18n site_data "confirmation_of_registration_title"}}}</h3>
 
-            {{#if site_data.site.site_view.site.require_application}}
-            <p>{{site_data.site.site_view.site.application_question}}</p>
+            {{#if (eq site_data.site.site_view.local_site.registration_mode "requireapplication")}}
+            <p>{{site_data.site.site_view.local_site.application_question}}</p>
 
             <fieldset class="fields2">
                 <dl>
@@ -62,7 +62,7 @@
             </fieldset>
 
             {{/if}}
-            {{#if site_data.site.site_view.site.require_application and captcha.ok}}
+            {{#if (eq site_data.site.site_view.local_site.registration_mode "requireapplication") and captcha.ok}}
             <hr/>
             {{/if}}
             {{#if captcha.ok}}