summaryrefslogtreecommitdiff
path: root/lib/Travelynx
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2019-05-06 16:59:48 +0200
committerDaniel Friesel <derf@finalrewind.org>2019-05-06 16:59:48 +0200
commit2ddab756440333fb42a9813df87b978a82e490d2 (patch)
tree6ead34dc431e564d1570718b741dd9652322b317 /lib/Travelynx
parentb36ba45aef6ce3a62079064a900915a9e222acde (diff)
basic webhook support, onwards to betatesting
Diffstat (limited to 'lib/Travelynx')
-rw-r--r--lib/Travelynx/Controller/Account.pm1
-rwxr-xr-xlib/Travelynx/Controller/Api.pm65
2 files changed, 2 insertions, 64 deletions
diff --git a/lib/Travelynx/Controller/Account.pm b/lib/Travelynx/Controller/Account.pm
index 75b8f02..c02fb1a 100644
--- a/lib/Travelynx/Controller/Account.pm
+++ b/lib/Travelynx/Controller/Account.pm
@@ -244,6 +244,7 @@ sub webhook {
token => $hook->{token},
enabled => $hook->{enabled}
);
+ $self->run_hook( $self->current_user->{id}, 'ping' );
$hook = $self->get_webhook;
}
else {
diff --git a/lib/Travelynx/Controller/Api.pm b/lib/Travelynx/Controller/Api.pm
index b0047b9..a442784 100755
--- a/lib/Travelynx/Controller/Api.pm
+++ b/lib/Travelynx/Controller/Api.pm
@@ -142,70 +142,7 @@ sub get_v1 {
return;
}
if ( $api_action eq 'status' ) {
- my $status = $self->get_user_status($uid);
-
- my $ret = {
- deprecated => \0,
- checkedIn => (
- $status->{checked_in}
- or $status->{cancelled}
- ) ? \1 : \0,
- fromStation => {
- ds100 => $status->{dep_ds100},
- name => $status->{dep_name},
- uic => undef,
- longitude => undef,
- latitude => undef,
- scheduledTime => $status->{sched_departure}->epoch || undef,
- realTime => $status->{real_departure}->epoch || undef,
- },
- toStation => {
- ds100 => $status->{arr_ds100},
- name => $status->{arr_name},
- uic => undef,
- longitude => undef,
- latitude => undef,
- scheduledTime => $status->{sched_arrival}->epoch || undef,
- realTime => $status->{real_arrival}->epoch || undef,
- },
- train => {
- type => $status->{train_type},
- line => $status->{train_line},
- no => $status->{train_no},
- id => $status->{train_id},
- },
- actionTime => $status->{timestamp}->epoch,
- };
-
- if ( $status->{dep_ds100} ) {
- my @station_descriptions
- = Travel::Status::DE::IRIS::Stations::get_station(
- $status->{dep_ds100} );
- if ( @station_descriptions == 1 ) {
- (
- undef, undef,
- $ret->{fromStation}{uic},
- $ret->{fromStation}{longitude},
- $ret->{fromStation}{latitude}
- ) = @{ $station_descriptions[0] };
- }
- }
-
- if ( $status->{arr_ds100} ) {
- my @station_descriptions
- = Travel::Status::DE::IRIS::Stations::get_station(
- $status->{arr_ds100} );
- if ( @station_descriptions == 1 ) {
- (
- undef, undef,
- $ret->{toStation}{uic},
- $ret->{toStation}{longitude},
- $ret->{toStation}{latitude}
- ) = @{ $station_descriptions[0] };
- }
- }
-
- $self->render( json => $ret );
+ $self->render( json => $self->get_user_status_json_v1($uid) );
}
else {
$self->render(