From a4d60a03f68e29e68f341b339f48cae452f8a383 Mon Sep 17 00:00:00 2001
From: Birte Kristina Friesel <derf@finalrewind.org>
Date: Mon, 10 Jul 2023 20:57:27 +0200
Subject: pass version via defaults

---
 lib/DBInfoscreen.pm                         | 1 +
 lib/DBInfoscreen/Controller/Static.pm       | 1 -
 lib/DBInfoscreen/Controller/Stationboard.pm | 5 -----
 3 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/DBInfoscreen.pm b/lib/DBInfoscreen.pm
index bc0f181..fd3ed0b 100644
--- a/lib/DBInfoscreen.pm
+++ b/lib/DBInfoscreen.pm
@@ -38,6 +38,7 @@ sub startup {
 	);
 
 	chomp $self->config->{version};
+	$self->defaults( version => $self->config->{version} // 'UNKNOWN' );
 
 	# Generally, the reverse proxy handles compression.
 	# Also, Mojolicious compression breaks legacy callback-based JSON endpoints
diff --git a/lib/DBInfoscreen/Controller/Static.pm b/lib/DBInfoscreen/Controller/Static.pm
index e9ca6cf..4560d02 100644
--- a/lib/DBInfoscreen/Controller/Static.pm
+++ b/lib/DBInfoscreen/Controller/Static.pm
@@ -70,7 +70,6 @@ sub about {
 	$self->render(
 		'about',
 		hide_opts => 1,
-		version   => $self->config->{version}
 	);
 }
 
diff --git a/lib/DBInfoscreen/Controller/Stationboard.pm b/lib/DBInfoscreen/Controller/Stationboard.pm
index 912d95d..8fb57a2 100644
--- a/lib/DBInfoscreen/Controller/Stationboard.pm
+++ b/lib/DBInfoscreen/Controller/Stationboard.pm
@@ -131,7 +131,6 @@ sub handle_no_results_json {
 	if ($errstr) {
 		$json = {
 			api_version => $api_version,
-			version     => $self->config->{version},
 			error       => $errstr,
 		};
 	}
@@ -143,7 +142,6 @@ sub handle_no_results_json {
 		{
 			$json = {
 				api_version => $api_version,
-				version     => $self->config->{version},
 				error       => 'ambiguous station code/name',
 				candidates  => \@candidates,
 			};
@@ -151,7 +149,6 @@ sub handle_no_results_json {
 		else {
 			$json = {
 				api_version => $api_version,
-				version     => $self->config->{version},
 				error       => ( $errstr // "Got no results for '$station'" )
 			};
 		}
@@ -403,7 +400,6 @@ sub handle_request {
 
 	$self->stash( departures => [] );
 	$self->stash( title      => 'DBF' );
-	$self->stash( version    => $self->config->{version} );
 
 	if ( not( $template ~~ [qw[app infoscreen json multi single text]] ) ) {
 		$template = 'app';
@@ -1110,7 +1106,6 @@ sub train_details {
 
 	$self->stash( departures => [] );
 	$self->stash( title      => 'DBF' );
-	$self->stash( version    => $self->config->{version} );
 
 	my $res = {
 		train_type      => undef,
-- 
cgit v1.2.3