From a73e2edc8604c8d83c0a85044ca2fc8ef4108bfb Mon Sep 17 00:00:00 2001
From: Derf Null <derf@finalrewind.org>
Date: Thu, 29 Jun 2023 21:54:25 +0200
Subject: profile: use effective visibility from journey object
---
lib/Travelynx/Controller/Profile.pm | 44 ++++++++++++++++-------------------
templates/_public_status_card.html.ep | 4 +---
templates/profile.html.ep | 2 +-
templates/user_status.html.ep | 2 +-
4 files changed, 23 insertions(+), 29 deletions(-)
diff --git a/lib/Travelynx/Controller/Profile.pm b/lib/Travelynx/Controller/Profile.pm
index c242f58..a6b4a7c 100755
--- a/lib/Travelynx/Controller/Profile.pm
+++ b/lib/Travelynx/Controller/Profile.pm
@@ -213,9 +213,8 @@ sub profile {
follow_reqs_me =>
( $inverse_relation and $inverse_relation eq 'requests_follow' ) ? 1
: 0,
- journey => $status,
- journey_visibility => $visibility,
- journeys => [@journeys],
+ journey => $status,
+ journeys => [@journeys],
);
}
@@ -363,14 +362,13 @@ sub journey_details {
}
$self->render(
'journey',
- error => undef,
- journey => $journey,
- with_map => 1,
- username => $name,
- readonly => 1,
- twitter => \%tw_data,
- opengraph => \%og_data,
- journey_visibility => $visibility,
+ error => undef,
+ journey => $journey,
+ with_map => 1,
+ username => $name,
+ readonly => 1,
+ twitter => \%tw_data,
+ opengraph => \%og_data,
%{$map_data},
);
}
@@ -542,14 +540,13 @@ sub user_status {
},
},
any => {
- template => 'user_status',
- name => $name,
- privacy => $user,
- journey => $status,
- journey_visibility => $visibility,
- twitter => \%tw_data,
- opengraph => \%og_data,
- version => $self->app->config->{version} // 'UNKNOWN',
+ template => 'user_status',
+ name => $name,
+ privacy => $user,
+ journey => $status,
+ twitter => \%tw_data,
+ opengraph => \%og_data,
+ version => $self->app->config->{version} // 'UNKNOWN',
},
);
}
@@ -626,11 +623,10 @@ sub status_card {
$self->render(
'_public_status_card',
- name => $name,
- privacy => $user,
- journey => $status,
- journey_visibility => $visibility,
- from_profile => $self->param('profile') ? 1 : 0,
+ name => $name,
+ privacy => $user,
+ journey => $status,
+ from_profile => $self->param('profile') ? 1 : 0,
);
}
diff --git a/templates/_public_status_card.html.ep b/templates/_public_status_card.html.ep
index 65255c5..33635ae 100644
--- a/templates/_public_status_card.html.ep
+++ b/templates/_public_status_card.html.ep
@@ -10,9 +10,7 @@
% else {
<a href="/p/<%= $name %>"><%= $name %></a> ist unterwegs
% }
- % if ($journey_visibility) {
- <i class="material-icons right"><%= visibility_icon($journey_visibility) %></i>
- % }
+ <i class="material-icons right"><%= visibility_icon($journey->{effective_visibility_str}) %></i>
</span>
% if ($privacy->{comments_visible} and $journey->{comment}) {
<p>„<%= $journey->{comment} %>“</p>
diff --git a/templates/profile.html.ep b/templates/profile.html.ep
index ed7ff0d..c0ffe1d 100644
--- a/templates/profile.html.ep
+++ b/templates/profile.html.ep
@@ -79,7 +79,7 @@
</div>
<div class="row">
<div class="col s12 publicstatuscol" data-user="<%= $name %>" data-profile="1">
- %= include '_public_status_card', name => $name, privacy => $privacy, journey => $journey, journey_visibility => $journey_visibility, from_profile => 1
+ %= include '_public_status_card', name => $name, privacy => $privacy, journey => $journey, from_profile => 1
</div>
</div>
% if ($journeys and @{$journeys}) {
diff --git a/templates/user_status.html.ep b/templates/user_status.html.ep
index 97c10ec..95d2dfa 100644
--- a/templates/user_status.html.ep
+++ b/templates/user_status.html.ep
@@ -1,6 +1,6 @@
<div class="row">
<div class="col s12 publicstatuscol" data-user="<%= $name %>">
- %= include '_public_status_card', name => $name, privacy => $privacy, journey => $journey, journey_visibility => $journey_visibility
+ %= include '_public_status_card', name => $name, privacy => $privacy, journey => $journey
</div>
</div>
--
cgit v1.2.3