Merge remote-tracking branch 'github/main'

.github/workflows/perl.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         perl-version:
-          - '5.20-buster'
+          - '5.30-buster'
           - 'latest'
           - 'threaded'
 

lib/Travelynx/Controller/Api.pm

@@ -571,6 +571,7 @@ sub import_v1 {
 	my $journey;
 
 	if ( not $error ) {
+		eval {
 			$journey = $self->journeys->get_single(
 				uid        => $uid,
 				db         => $db,
@@ -578,7 +579,12 @@ sub import_v1 {
 				verbose    => 1
 			);
 			$error
-		  = $self->journeys->sanity_check( $journey, $payload->{lax} ? 1 : 0 );
+			  = $self->journeys->sanity_check( $journey,
+				$payload->{lax} ? 1 : 0 );
+		};
+		if ($@) {
+			$error = $@;
+		}
 	}
 
 	if ($error) {
@@ -673,7 +679,8 @@ sub autocomplete {
 	  = "document.addEventListener('DOMContentLoaded',function(){M.Autocomplete.init(document.querySelectorAll('.autocomplete'),{\n";
 	$output .= 'minLength:3,limit:50,data:';
 	$output
-	  .= encode_json( $self->stations->get_for_autocomplete( backend_id => $backend_id ) );
+	  .= encode_json(
+		$self->stations->get_for_autocomplete( backend_id => $backend_id ) );
 	$output .= "\n});});\n";
 
 	$self->render(