From e1231b88e2dd989dea0ce97d2b28d7e895cbfeaa Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Sat, 4 Mar 2023 09:03:50 +0100
Subject: status/profile: re-add ability to show latest checkout, if desired

got lost in 1.30.0
---
 lib/Travelynx/Controller/Account.pm   |  4 +++-
 lib/Travelynx/Controller/Traveling.pm | 27 ++++++++++++++++++++++++---
 lib/Travelynx/Model/Journeys.pm       | 10 ++++++++++
 lib/Travelynx/Model/Users.pm          |  4 +++-
 4 files changed, 40 insertions(+), 5 deletions(-)

(limited to 'lib/Travelynx')

diff --git a/lib/Travelynx/Controller/Account.pm b/lib/Travelynx/Controller/Account.pm
index e8bfcaf..4836117 100644
--- a/lib/Travelynx/Controller/Account.pm
+++ b/lib/Travelynx/Controller/Account.pm
@@ -463,7 +463,8 @@ sub privacy {
 
 		$opt{comments_visible} = $self->param('public_comment') ? 1 : 0;
 
-		$opt{past_all} = $self->param('history_age') eq 'infinite' ? 1 : 0;
+		$opt{past_all}    = $self->param('history_age') eq 'infinite' ? 1 : 0;
+		$opt{past_status} = $self->param('past_status')               ? 1 : 0;
 
 		if ( $self->param('history_level') eq 'intern' ) {
 			$opt{past_visible} = 1;
@@ -493,6 +494,7 @@ sub privacy {
 			:                                'private'
 		);
 		$self->param( history_age => $user->{past_all} ? 'infinite' : 'month' );
+		$self->param( past_status => $user->{past_status} );
 		$self->render( 'privacy', name => $user->{name} );
 	}
 }
diff --git a/lib/Travelynx/Controller/Traveling.pm b/lib/Travelynx/Controller/Traveling.pm
index 8cf1722..80768ce 100755
--- a/lib/Travelynx/Controller/Traveling.pm
+++ b/lib/Travelynx/Controller/Traveling.pm
@@ -570,7 +570,7 @@ sub user_status {
 	);
 
 	my $visibility;
-	if ( $status->{checked_in} ) {
+	if ( $status->{checked_in} or $status->{arr_name} ) {
 		$visibility
 		  = $self->compute_effective_visibility(
 			$user->{default_visibility_str},
@@ -589,8 +589,15 @@ sub user_status {
 		  )
 		{
 			$status->{checked_in} = 0;
+			$status->{arr_name}   = undef;
 		}
 	}
+	if (    not $status->{checked_in}
+		and $status->{arr_name}
+		and not $user->{past_status} )
+	{
+		$status->{arr_name} = undef;
+	}
 
 	if ( $status->{checked_in} ) {
 		$og_data{url} .= '/' . $status->{sched_departure}->epoch;
@@ -640,7 +647,7 @@ sub public_profile {
 
 	my $status = $self->get_user_status( $user->{id} );
 	my $visibility;
-	if ( $status->{checked_in} ) {
+	if ( $status->{checked_in} or $status->{arr_name} ) {
 		$visibility
 		  = $self->compute_effective_visibility(
 			$user->{default_visibility_str},
@@ -659,8 +666,15 @@ sub public_profile {
 		  )
 		{
 			$status->{checked_in} = 0;
+			$status->{arr_name}   = undef;
 		}
 	}
+	if (    not $status->{checked_in}
+		and $status->{arr_name}
+		and not $user->{past_status} )
+	{
+		$status->{arr_name} = undef;
+	}
 
 	my %opt = (
 		uid           => $user->{id},
@@ -855,7 +869,7 @@ sub public_status_card {
 
 	my $status = $self->get_user_status( $user->{id} );
 	my $visibility;
-	if ( $status->{checked_in} ) {
+	if ( $status->{checked_in} or $status->{arr_name} ) {
 		$visibility
 		  = $self->compute_effective_visibility(
 			$user->{default_visibility_str},
@@ -874,8 +888,15 @@ sub public_status_card {
 		  )
 		{
 			$status->{checked_in} = 0;
+			$status->{arr_name}   = undef;
 		}
 	}
+	if (    not $status->{checked_in}
+		and $status->{arr_name}
+		and not $user->{past_status} )
+	{
+		$status->{arr_name} = undef;
+	}
 
 	$self->render(
 		'_public_status_card',
diff --git a/lib/Travelynx/Model/Journeys.pm b/lib/Travelynx/Model/Journeys.pm
index 0062642..312910f 100755
--- a/lib/Travelynx/Model/Journeys.pm
+++ b/lib/Travelynx/Model/Journeys.pm
@@ -720,6 +720,11 @@ sub get_latest {
 		}
 	)->expand->hash;
 
+	$latest_successful->{visibility_str}
+	  = $latest_successful->{visibility}
+	  ? $visibility_itoa{ $latest_successful->{visibility} }
+	  : 'default';
+
 	my $latest = $db->select(
 		'journeys_str',
 		'*',
@@ -732,6 +737,11 @@ sub get_latest {
 		}
 	)->expand->hash;
 
+	$latest->{visibility_str}
+	  = $latest->{visibility}
+	  ? $visibility_itoa{ $latest->{visibility} }
+	  : 'default';
+
 	return ( $latest_successful, $latest );
 }
 
diff --git a/lib/Travelynx/Model/Users.pm b/lib/Travelynx/Model/Users.pm
index 397b618..1ffd7ab 100644
--- a/lib/Travelynx/Model/Users.pm
+++ b/lib/Travelynx/Model/Users.pm
@@ -178,6 +178,7 @@ sub get_privacy_by_name {
 			comments_visible => $user->{public_level} & 0x80 ? 1 : 0,
 			past_visible     => ( $user->{public_level} & 0x300 ) >> 8,
 			past_all         => $user->{public_level} & 0x400 ? 1 : 0,
+			past_status      => $user->{public_level} & 0x800 ? 1 : 0,
 		};
 	}
 	return;
@@ -194,7 +195,7 @@ sub set_privacy {
 		  = ( $opt{default_visibility} & 0x7f )
 		  | ( $opt{comments_visible} ? 0x80 : 0x00 )
 		  | ( ( ( $opt{past_visible} // 0 ) << 8 ) & 0x300 )
-		  | ( $opt{past_all} ? 0x400 : 0 );
+		  | ( $opt{past_all} ? 0x400 : 0 ) | ( $opt{past_status} ? 0x800 : 0 );
 	}
 
 	$db->update( 'users', { public_level => $public_level }, { id => $uid } );
@@ -376,6 +377,7 @@ sub get {
 			comments_visible => $user->{public_level} & 0x80 ? 1 : 0,
 			past_visible     => ( $user->{public_level} & 0x300 ) >> 8,
 			past_all         => $user->{public_level} & 0x400 ? 1 : 0,
+			past_status      => $user->{public_level} & 0x800 ? 1 : 0,
 			email            => $user->{email},
 			sb_name          => $user->{external_services}
 			? $sb_templates[ $user->{external_services} & 0x07 ][0]
-- 
cgit v1.2.3