summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xlib/Travelynx.pm2
-rwxr-xr-xlib/Travelynx/Controller/Profile.pm27
2 files changed, 19 insertions, 10 deletions
diff --git a/lib/Travelynx.pm b/lib/Travelynx.pm
index 643024b..5ae7a9f 100755
--- a/lib/Travelynx.pm
+++ b/lib/Travelynx.pm
@@ -1696,7 +1696,7 @@ sub startup {
'get_user_status_json_v1' => sub {
my ( $self, %opt ) = @_;
my $uid = $opt{uid};
- my $status = $self->get_user_status($uid);
+ my $status = $opt{status} // $self->get_user_status($uid);
my $ret = {
deprecated => \0,
diff --git a/lib/Travelynx/Controller/Profile.pm b/lib/Travelynx/Controller/Profile.pm
index e809491..58c9263 100755
--- a/lib/Travelynx/Controller/Profile.pm
+++ b/lib/Travelynx/Controller/Profile.pm
@@ -405,15 +405,24 @@ sub user_status {
$og_data{description} = $tw_data{description} = q{};
}
- $self->render(
- 'user_status',
- name => $name,
- public_level => $user->{public_level},
- journey => $status,
- journey_visibility => $visibility,
- twitter => \%tw_data,
- opengraph => \%og_data,
- version => $self->app->config->{version} // 'UNKNOWN',
+ $self->respond_to(
+ json => {
+ json => {
+ name => $name,
+ status => $self->get_user_status_json_v1( status => $status ),
+ version => $self->app->config->{version} // 'UNKNOWN',
+ },
+ },
+ any => {
+ template => 'user_status',
+ name => $name,
+ public_level => $user->{public_level},
+ journey => $status,
+ journey_visibility => $visibility,
+ twitter => \%tw_data,
+ opengraph => \%og_data,
+ version => $self->app->config->{version} // 'UNKNOWN',
+ },
);
}