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

use journey-specific status links -> one twitter card per journey

Browse source
This commit is contained in:
Daniel Friesel 2019-05-29 20:01:52 +02:00
parent 146b3a2682
commit 155f9f39cc
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Travelynx.pm
View file

@ -2177,7 +2177,9 @@ sub startup {
$r->get('/register')->to('account#registration_form'); $r->get('/register')->to('account#registration_form');
$r->get('/reg/:id/:token')->to('account#verify'); $r->get('/reg/:id/:token')->to('account#verify');
$r->get('/status/:name')->to('traveling#user_status'); $r->get('/status/:name')->to('traveling#user_status');
$r->get('/status/:name/:ts')->to('traveling#user_status');
$r->get('/ajax/status/:name')->to('traveling#public_status_card'); $r->get('/ajax/status/:name')->to('traveling#public_status_card');
$r->get('/ajax/status/:name/:ts')->to('traveling#public_status_card');
$r->post('/action')->to('traveling#log_action'); $r->post('/action')->to('traveling#log_action');
$r->post('/geolocation')->to('traveling#geolocation'); $r->post('/geolocation')->to('traveling#geolocation');
$r->post('/list_departures')->to('traveling#redirect_to_station'); $r->post('/list_departures')->to('traveling#redirect_to_station');

13
lib/Travelynx/Controller/Traveling.pm
View file

@ -29,6 +29,7 @@ sub user_status {
my ($self) = @_; my ($self) = @_;
my $name = $self->stash('name'); my $name = $self->stash('name');
my $ts = $self->stash('ts');
my $user = $self->get_privacy_by_name($name); my $user = $self->get_privacy_by_name($name);
if ( $user and ( $user->{public_level} & 0x02 ) ) { if ( $user and ( $user->{public_level} & 0x02 ) ) {
@ -41,7 +42,16 @@ sub user_status {
->to_abs->scheme('https'), ->to_abs->scheme('https'),
); );
if ( $status->{checked_in} ) { if (
$ts
and ( not $status->{checked_in}
or $status->{sched_departure}->epoch != $ts )
)
{
$tw_data{title} = "Bahnfahrt beendet";
$tw_data{description} = "${name} hat das Ziel erreicht";
}
elsif ( $status->{checked_in} ) {
$tw_data{title} = "${name} ist unterwegs"; $tw_data{title} = "${name} ist unterwegs";
$tw_data{description} = sprintf( $tw_data{description} = sprintf(
'%s %s von %s nach %s', '%s %s von %s nach %s',
@ -53,7 +63,6 @@ sub user_status {
if ( $status->{real_arrival}->epoch ) { if ( $status->{real_arrival}->epoch ) {
$tw_data{description} .= $status->{real_arrival} $tw_data{description} .= $status->{real_arrival}
->strftime(' – Ankunft gegen %H:%M Uhr'); ->strftime(' – Ankunft gegen %H:%M Uhr');
} }
} }
else { else {

2
templates/_checked_in.html.ep
View file

@ -134,7 +134,7 @@
<a class="action-share blue-text right" <a class="action-share blue-text right"
data-text="Ich bin gerade <%= $attrib %> <%= $journey->{train_type} %> <%= $journey->{train_no} %> nach <%= $journey->{arr_name} %> #NowTräwelling #dbl" data-text="Ich bin gerade <%= $attrib %> <%= $journey->{train_type} %> <%= $journey->{train_no} %> nach <%= $journey->{arr_name} %> #NowTräwelling #dbl"
% if (current_user()->{is_public} & 0x02) { % if (current_user()->{is_public} & 0x02) {
data-url="<%= url_for('/status')->to_abs->scheme('https') %>/<%= current_user->{name} %>" data-url="<%= url_for('/status')->to_abs->scheme('https') %>/<%= current_user->{name} %>/<%= $journey->{sched_departure}->epoch %>"
% } % }
> >
<i class="material-icons left">share</i> Teilen <i class="material-icons left">share</i> Teilen