From b85db3a10df32cb2648607c83d37160ac3ee8691 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Tue, 14 May 2019 20:05:45 +0200
Subject: Show web-hook test result immediately after saving it

Closes #12
---
 lib/Travelynx.pm                    | 18 ++++++++++++++++--
 lib/Travelynx/Controller/Account.pm | 15 ++++++++++++---
 2 files changed, 28 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/Travelynx.pm b/lib/Travelynx.pm
index 3284418..c4a2b53 100755
--- a/lib/Travelynx.pm
+++ b/lib/Travelynx.pm
@@ -1059,12 +1059,15 @@ sub startup {
 
 	$self->helper(
 		'run_hook' => sub {
-			my ( $self, $uid, $reason ) = @_;
+			my ( $self, $uid, $reason, $callback ) = @_;
 
 			my $hook = $self->get_webhook($uid);
 
 			if ( not $hook->{enabled} or not $hook->{url} =~ m{^ https?:// }x )
 			{
+				if ($callback) {
+					&$callback();
+				}
 				return;
 			}
 
@@ -1080,7 +1083,12 @@ sub startup {
 			}
 
 			my $ua = $self->ua;
-			$ua->request_timeout(10);
+			if ($callback) {
+				$ua->request_timeout(4);
+			}
+			else {
+				$ua->request_timeout(10);
+			}
 
 			$ua->post_p( $hook->{url} => $header => json => $hook_body )->then(
 				sub {
@@ -1093,11 +1101,17 @@ sub startup {
 						$self->mark_hook_status( $uid, $hook->{url}, 1,
 							$tx->result->body );
 					}
+					if ($callback) {
+						&$callback();
+					}
 				}
 			)->catch(
 				sub {
 					my ($err) = @_;
 					$self->mark_hook_status( $uid, $hook->{url}, 0, $err );
+					if ($callback) {
+						&$callback();
+					}
 				}
 			)->wait;
 		}
diff --git a/lib/Travelynx/Controller/Account.pm b/lib/Travelynx/Controller/Account.pm
index e272eb1..e2bfd39 100644
--- a/lib/Travelynx/Controller/Account.pm
+++ b/lib/Travelynx/Controller/Account.pm
@@ -246,9 +246,18 @@ sub webhook {
 			token   => $hook->{token},
 			enabled => $hook->{enabled}
 		);
-		$self->flash( success => 'webhook' );
-		$self->redirect_to('account');
-		$self->run_hook( $self->current_user->{id}, 'ping' );
+		$self->run_hook(
+			$self->current_user->{id},
+			'ping',
+			sub {
+				$self->render(
+					'webhooks',
+					hook     => $self->get_webhook,
+					new_hook => 1
+				);
+			}
+		);
+		return;
 	}
 	else {
 		$self->param( url     => $hook->{url} );
-- 
cgit v1.2.3