@@ -12,7 +12,7 @@ $Data::Dumper::Indent = 1;
use vars qw($VERSION %IRSSI);
$VERSION = "2.0.5";
-my ($REV) = '$Rev: 480 $' =~ /(\d+)/;
+my ($REV) = '$Rev: 481 $' =~ /(\d+)/;
%IRSSI = (
authors => 'Dan Boger',
contact => 'zigdon@gmail.com',
@@ -21,7 +21,7 @@ my ($REV) = '$Rev: 480 $' =~ /(\d+)/;
. 'Can optionally set your bitlbee /away message to same',
license => 'GNU GPL v2',
url => 'http://twirssi.com',
- changed => '$Date: 2009-02-18 13:41:52 -0800 (Wed, 18 Feb 2009) $',
+ changed => '$Date: 2009-02-19 14:22:45 -0800 (Thu, 19 Feb 2009) $',
);
my $window;
@@ -81,20 +81,25 @@ sub cmd_direct_as {
return unless &valid_username($username);
eval {
- unless ( $twits{$username}
+ if ( $twits{$username}
->new_direct_message( { user => $target, text => $text } ) )
{
+ ¬ice("DM sent to $target");
+ $nicks{$target} = time;
+ } else {
+ my $error;
+ eval {
+ $error = JSON::Any->jsonToObj( $twits{$username}->get_error() );
+ $error = $error->{error};
+ };
+ die $error if $error;
¬ice("DM to $target failed");
- return;
}
};
if ($@) {
- ¬ice("DM caused an error: $@. Aborted");
+ ¬ice("DM caused an error: $@");
return;
- } else {
- ¬ice("DM sent to $target");
- $nicks{$target} = time;
}
}
@@ -141,16 +146,18 @@ sub cmd_tweet_as {
return if &too_long($data);
+ my $success = 1;
eval {
unless ( $twits{$username}->update($data) )
{
¬ice("Update failed");
- return;
+ $success = 0;
}
};
+ return unless $success;
if ($@) {
- ¬ice("Update caused an error. Aborted.");
+ ¬ice("Update caused an error: $@. Aborted.");
return;
}
@@ -238,6 +245,7 @@ sub cmd_reply_as {
return if &too_long($data);
+ my $success = 1;
eval {
unless (
$twits{$username}->update(
@@ -249,12 +257,13 @@ sub cmd_reply_as {
)
{
¬ice("Update failed");
- return;
+ $success = 0;
}
};
+ return unless $success;
if ($@) {
- ¬ice("Update caused an error. Aborted");
+ ¬ice("Update caused an error: $@. Aborted");
return;
}
@@ -281,13 +290,15 @@ sub gen_cmd {
return;
}
+ my $success = 1;
eval {
unless ( $twit->$api_name($data) )
{
¬ice("$api_name failed");
- return;
+ $success = 0;
}
};
+ return unless $success;
if ($@) {
¬ice("$api_name caused an error. Aborted.");
@@ -689,7 +700,8 @@ sub do_updates {
};
if ($@) {
- print $fh "type:debug Error during friends_timeline call. Aborted.\n";
+ print $fh
+ "type:debug Error during friends_timeline call: $@. Aborted.\n";
return 1;
}
twirssi.pl
a6c66dd36bdcbd7c740827e5cf37fb4ade5d0a61
Dan Boger
zigdon@irc.peeron.com
http://github.com/bssteph/twirssi/commit/6e2d1f7b739136086662bb4b4fb1a6c5d75d2b8a
6e2d1f7b739136086662bb4b4fb1a6c5d75d2b8a
2009-02-19T14:23:34-08:00
2009-02-19T14:23:34-08:00
r481 - apparently, returns return from evals. Adjusted code.
8d30a9b22d81967322c1cfc1faa34f473198cbb0
Dan Boger
zigdon@irc.peeron.com