X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/blobdiff_plain/7c7f161dbdf78e1a5428a35701387548b0aa0e0f..6143e982ea2f215f5059c262d7904228a588ea32:/twirssi.pl diff --git a/twirssi.pl b/twirssi.pl index 001b182..840a20e 100644 --- a/twirssi.pl +++ b/twirssi.pl @@ -430,7 +430,9 @@ sub cmd_logout { return unless $data = &valid_username($data); ¬ice("Logging out $data..."); - $twits{$data}->end_session(); + eval { + $twits{$data}->end_session(); + }; delete $twits{$data}; undef $twit; if ( keys %twits ) { @@ -541,10 +543,20 @@ sub cmd_login { } unless ( $twit->authorized ) { + my $url; + eval { + $url = $twit->get_authorization_url; + }; + + if ($@) { + ¬ice("ERROR: Failed to get OAuth authorization_url. Try again later."); + return; + } + ¬ice("Twirssi not autorized to access $service for $user."); ¬ice("Please authorize at the following url, then enter the pin "); - ¬ice("supplied with /twirssi_oath $user\@$service "); - ¬ice($twit->get_authorization_url); + ¬ice("supplied with /twirssi_oauth $user\@$service "); + ¬ice($url); $oauth{pending}{"$user\@$service"} = $twit; return; @@ -1043,11 +1055,13 @@ sub get_updates { sub do_updates { my ( $fh, $username, $obj, $cache ) = @_; - my $rate_limit = $obj->rate_limit_status(); - if ( $rate_limit and $rate_limit->{remaining_hits} < 1 ) { - ¬ice("Rate limit exceeded for $username"); - return undef; - } + eval { + my $rate_limit = $obj->rate_limit_status(); + if ( $rate_limit and $rate_limit->{remaining_hits} < 1 ) { + ¬ice("Rate limit exceeded for $username"); + return undef; + } + }; print scalar localtime, " - Polling for updates for $username" if &debug; my $tweets;