2 files changed, 55 insertions, 24 deletions

diff --git a/lib/Travelynx/Controller/Profile.pm b/lib/Travelynx/Controller/Profile.pm
index a063c10..fc2d38c 100755
--- a/lib/Travelynx/Controller/Profile.pm
+++ b/lib/Travelynx/Controller/Profile.pm
@@ -334,7 +334,16 @@ sub user_status {
 	my $user = $self->users->get_privacy_by( name => $name );
 
 	if ( not $user ) {
-		$self->render( 'not_found', status => 404 );
+		$self->respond_to(
+			json => {
+				json   => { error => 'not found' },
+				status => 404,
+			},
+			any => {
+				template => 'not_found',
+				status   => 404
+			}
+		);
 		return;
 	}
 
@@ -389,11 +398,29 @@ sub user_status {
 					"/p/${name}/j/$journey->{id}?token=${token}-${ts}");
 			}
 			else {
-				$self->render( 'not_found', status => 404 );
+				$self->respond_to(
+					json => {
+						json   => { error => 'not found' },
+						status => 404,
+					},
+					any => {
+						template => 'not_found',
+						status   => 404
+					}
+				);
 			}
 			return;
 		}
-		$self->render( 'not_found', status => 404 );
+		$self->respond_to(
+			json => {
+				json   => { error => 'not found' },
+				status => 404,
+			},
+			any => {
+				template => 'not_found',
+				status   => 404
+			}
+		);
 		return;
 	}
 
diff --git a/lib/Travelynx/Model/InTransit.pm b/lib/Travelynx/Model/InTransit.pm
index 69026ac..6278bad 100644
--- a/lib/Travelynx/Model/InTransit.pm
+++ b/lib/Travelynx/Model/InTransit.pm
@@ -47,6 +47,16 @@ sub epoch_to_dt {
 	);
 }
 
+sub epoch_or_dt_to_dt {
+	my ($input) = @_;
+
+	if ( ref($input) eq 'DateTime' ) {
+		return $input;
+	}
+
+	return epoch_to_dt($input);
+}
+
 sub new {
 	my ( $class, %opt ) = @_;
 
@@ -273,31 +283,25 @@ sub postprocess {
 			# station is present several times in a train's route, e.g.
 			# for Frankfurt Flughafen in some nightly connections.
 			my $times = $station->[2] // {};
-			if ( $times->{sched_arr}
-				and ref( $times->{sched_arr} ) ne 'DateTime' )
-			{
-				$times->{sched_arr}
-				  = epoch_to_dt( $times->{sched_arr} );
-				if ( $times->{rt_arr} ) {
-					$times->{rt_arr}
-					  = epoch_to_dt( $times->{rt_arr} );
-					$times->{arr_delay}
-					  = $times->{rt_arr}->epoch - $times->{sched_arr}->epoch;
+			for my $key (qw(sched_arr rt_arr sched_dep rt_dep)) {
+				if ( $times->{$key} ) {
+					$times->{$key}
+					  = epoch_or_dt_to_dt( $times->{$key} );
 				}
+			}
+			if ( $times->{sched_arr} and $times->{rt_arr} ) {
+				$times->{arr_delay}
+				  = $times->{rt_arr}->epoch - $times->{sched_arr}->epoch;
+			}
+			if ( $times->{sched_arr} or $times->{rt_arr} ) {
 				$times->{arr} = $times->{rt_arr} || $times->{sched_arr};
 				$times->{arr_countdown} = $times->{arr}->epoch - $epoch;
 			}
-			if ( $times->{sched_dep}
-				and ref( $times->{sched_dep} ) ne 'DateTime' )
-			{
-				$times->{sched_dep}
-				  = epoch_to_dt( $times->{sched_dep} );
-				if ( $times->{rt_dep} ) {
-					$times->{rt_dep}
-					  = epoch_to_dt( $times->{rt_dep} );
-					$times->{dep_delay}
-					  = $times->{rt_dep}->epoch - $times->{sched_dep}->epoch;
-				}
+			if ( $times->{sched_dep} and $times->{rt_dep} ) {
+				$times->{dep_delay}
+				  = $times->{rt_dep}->epoch - $times->{sched_dep}->epoch;
+			}
+			if ( $times->{sched_dep} or $times->{rt_dep} ) {
 				$times->{dep} = $times->{rt_dep} || $times->{sched_dep};
 				$times->{dep_countdown} = $times->{dep}->epoch - $epoch;
 			}