PrivateCoffee/travelynx
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

profile: use effective visibility from journey object

Browse source
This commit is contained in:
Derf Null 2023-06-29 21:54:25 +02:00
parent 4f54597c0d
commit a73e2edc86
No known key found for this signature in database
GPG key ID: 19E6E524EBB177BA
4 changed files with 23 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
lib/Travelynx/Controller/Profile.pm
View file

@ -213,9 +213,8 @@ sub profile {
follow_reqs_me => follow_reqs_me =>
( $inverse_relation and $inverse_relation eq 'requests_follow' ) ? 1 ( $inverse_relation and $inverse_relation eq 'requests_follow' ) ? 1
: 0, : 0,
journey => $status, journey => $status,
journey_visibility => $visibility, journeys => [@journeys],
journeys => [@journeys],
); );
} }
@ -363,14 +362,13 @@ sub journey_details {
} }
$self->render( $self->render(
'journey', 'journey',
error => undef, error => undef,
journey => $journey, journey => $journey,
with_map => 1, with_map => 1,
username => $name, username => $name,
readonly => 1, readonly => 1,
twitter => \%tw_data, twitter => \%tw_data,
opengraph => \%og_data, opengraph => \%og_data,
journey_visibility => $visibility,
%{$map_data}, %{$map_data},
); );
} }
@ -542,14 +540,13 @@ sub user_status {
}, },
}, },
any => { any => {
template => 'user_status', template => 'user_status',
name => $name, name => $name,
privacy => $user, privacy => $user,
journey => $status, journey => $status,
journey_visibility => $visibility, twitter => \%tw_data,
twitter => \%tw_data, opengraph => \%og_data,
opengraph => \%og_data, version => $self->app->config->{version} // 'UNKNOWN',
version => $self->app->config->{version} // 'UNKNOWN',
}, },
); );
} }
@ -626,11 +623,10 @@ sub status_card {
$self->render( $self->render(
'_public_status_card', '_public_status_card',
name => $name, name => $name,
privacy => $user, privacy => $user,
journey => $status, journey => $status,
journey_visibility => $visibility, from_profile => $self->param('profile') ? 1 : 0,
from_profile => $self->param('profile') ? 1 : 0,
); );
} }

4
templates/_public_status_card.html.ep
View file

@ -10,9 +10,7 @@
% else { % else {
<a href="/p/<%= $name %>"><%= $name %></a> ist unterwegs <a href="/p/<%= $name %>"><%= $name %></a> ist unterwegs
% } % }
% if ($journey_visibility) { <i class="material-icons right"><%= visibility_icon($journey->{effective_visibility_str}) %></i>
<i class="material-icons right"><%= visibility_icon($journey_visibility) %></i>
% }
</span> </span>
% if ($privacy->{comments_visible} and $journey->{comment}) { % if ($privacy->{comments_visible} and $journey->{comment}) {
<p>„<%= $journey->{comment} %>“</p> <p>„<%= $journey->{comment} %>“</p>

2
templates/profile.html.ep
View file

@ -79,7 +79,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col s12 publicstatuscol" data-user="<%= $name %>" data-profile="1"> <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>
</div> </div>
% if ($journeys and @{$journeys}) { % if ($journeys and @{$journeys}) {

2
templates/user_status.html.ep
View file

@ -1,6 +1,6 @@
<div class="row"> <div class="row">
<div class="col s12 publicstatuscol" data-user="<%= $name %>"> <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>
</div> </div>