use vars qw($VERSION %IRSSI);
-$VERSION = "1.6.1";
-my ($REV) = '$Rev: 335 $' =~ /(\d+)/;
+$VERSION = "1.7.1";
+my ($REV) = '$Rev: 346 $' =~ /(\d+)/;
%IRSSI = (
authors => 'Dan Boger',
contact => 'zigdon@gmail.com',
. 'Can optionally set your bitlbee /away message to same',
license => 'GNU GPL v2',
url => 'http://tinyurl.com/twirssi',
- changed => 'Mon Dec 1 15:36:01 PST 2008',
+ changed => '$Date: 2009-01-06 07:14:23 -0800 (Tue, 06 Jan 2009) $',
);
my $window;
return;
}
- unless ( $twits{$username}
- ->new_direct_message( { user => $target, text => $text } ) )
- {
- ¬ice("DM to $target failed");
+ eval {
+ unless ( $twits{$username}
+ ->new_direct_message( { user => $target, text => $text } ) )
+ {
+ ¬ice("DM to $target failed");
+ return;
+ }
+ };
+
+ if ($@) {
+ ¬ice("DM caused an error. Aborted");
return;
}
return;
}
- unless ( $twits{$username}->update($data) ) {
- ¬ice("Update failed");
+ eval {
+ unless ( $twits{$username}->update($data) )
+ {
+ ¬ice("Update failed");
+ return;
+ }
+ };
+
+ if ($@) {
+ ¬ice("Update caused an error. Aborted.");
return;
}
$away = 1;
} else {
¬ice( "Can't find bitlbee server.",
- "Update bitlbee_server or disalbe tweet_to_away" );
+ "Update bitlbee_server or disable tweet_to_away" );
}
}
my $nick;
$id =~ s/[^\w\d\-:]+//g;
( $nick, $id ) = split /:/, $id;
- unless ( exists $id_map{$nick} ) {
+ unless ( exists $id_map{ lc $nick } ) {
¬ice("Can't find a tweet from $nick to reply to!");
return;
}
$id = $id_map{__indexes}{$nick} unless $id;
- unless ( $id_map{lc $nick}[$id] ) {
+ unless ( $id_map{ lc $nick }[$id] ) {
¬ice("Can't find a tweet numbered $id from $nick to reply to!");
return;
}
return;
}
- unless (
- $twits{$username}->update(
- { status => $data, in_reply_to_status_id => $id_map{lc $nick}[$id] }
- )
- )
- {
- ¬ice("Update failed");
+ eval {
+ unless (
+ $twits{$username}->update(
+ {
+ status => $data,
+ in_reply_to_status_id => $id_map{ lc $nick }[$id]
+ }
+ )
+ )
+ {
+ ¬ice("Update failed");
+ return;
+ }
+ };
+
+ if ($@) {
+ ¬ice("Update caused an error. Aborted");
return;
}
return;
}
- unless ( $twit->$api_name($data) ) {
- ¬ice("$api_name failed");
+ eval {
+ unless ( $twit->$api_name($data) )
+ {
+ ¬ice("$api_name failed");
+ return;
+ }
+ };
+
+ if ($@) {
+ ¬ice("$api_name caused an error. Aborted.");
return;
}
my $fh = shift;
my $page = 1;
my %new_friends;
- while (1) {
- print $fh "Loading friends page $page...\n" if ( $fh and &debug );
- my $friends = $twit->friends( { page => $page } );
- last unless $friends;
- $new_friends{ $_->{screen_name} } = time foreach @$friends;
- $page++;
- last if @$friends == 0 or $page == 10;
+ eval {
+ while (1)
+ {
+ print $fh "Loading friends page $page...\n" if ( $fh and &debug );
+ my $friends = $twit->friends( { page => $page } );
+ last unless $friends;
+ $new_friends{ $_->{screen_name} } = time foreach @$friends;
+ $page++;
+ last if @$friends == 0 or $page == 10;
+ }
+ };
+
+ if ($@) {
+ ¬ice("Error during friends list update. Aborted.");
+ return;
}
my ( $added, $removed ) = ( 0, 0 );
my $pid = fork();
if ($pid) { # parent
- Irssi::timeout_add_once( 5000, 'monitor_child', [$filename] );
+ Irssi::timeout_add_once( 5000, 'monitor_child', [ $filename, 0 ] );
Irssi::pidwait_add($pid);
} elsif ( defined $pid ) { # child
close STDIN;
my $new_poll = time;
- &do_updates( $fh, $user, $twit );
+ my $error = 0;
+ $error += &do_updates( $fh, $user, $twit );
foreach ( keys %twits ) {
next if $_ eq $user;
- &do_updates( $fh, $_, $twits{$_} );
+ $error += &do_updates( $fh, $_, $twits{$_} );
}
my ( $added, $removed ) = &load_friends($fh);
foreach ( sort keys %friends ) {
print $fh "$_ $friends{$_}\n";
}
- print $fh $new_poll;
+
+ if ($error) {
+ print $fh "type:error Update encountered errors. Aborted\n";
+ print $fh $last_poll;
+ } else {
+ print $fh $new_poll;
+ }
close $fh;
exit;
}
my ( $fh, $username, $obj ) = @_;
print scalar localtime, " - Polling for updates for $username" if &debug;
- my $tweets =
- $obj->friends_timeline( { since => HTTP::Date::time2str($last_poll) } )
- || [];
+ my $tweets;
+ eval {
+ $tweets = $obj->friends_timeline(
+ { since => HTTP::Date::time2str($last_poll) } )
+ || [];
+ };
+
+ if ($@) {
+ print $fh "type:error Error during friends_timeline call. Aborted.\n";
+ return 1;
+ }
+
foreach my $t ( reverse @$tweets ) {
my $text = decode_entities( $t->{text} );
$text =~ s/%/%%/g;
}
print scalar localtime, " - Polling for replies" if &debug;
- $tweets = $obj->replies( { since => HTTP::Date::time2str($last_poll) } )
- || [];
+ eval {
+ $tweets = $obj->replies( { since => HTTP::Date::time2str($last_poll) } )
+ || [];
+ };
+
+ if ($@) {
+ print $fh "type:error Error during replies call. Aborted.\n";
+ return 1;
+ }
+
foreach my $t ( reverse @$tweets ) {
next
if exists $friends{ $t->{user}{screen_name} };
}
print scalar localtime, " - Polling for DMs" if &debug;
- $tweets =
- $obj->direct_messages( { since => HTTP::Date::time2str($last_poll) } )
- || [];
+ eval {
+ $tweets =
+ $obj->direct_messages( { since => HTTP::Date::time2str($last_poll) } )
+ || [];
+ };
+
+ if ($@) {
+ print $fh "type:error Error during direct_messages call. Aborted.\n";
+ return 1;
+ }
+
foreach my $t ( reverse @$tweets ) {
my $text = decode_entities( $t->{text} );
$text =~ s/%/%%/g;
$t->{id}, $username, $t->{sender_screen_name}, $text;
}
print scalar localtime, " - Done" if &debug;
+
+ return 0;
}
sub monitor_child {
- my $data = shift;
+ my ( $data, $attempt ) = @_;
my $filename = $data->[0];
print scalar localtime, " - checking child log at $filename" if &debug;
and $meta{id} )
{
$marker = ( $id_map{__indexes}{ $meta{nick} } + 1 ) % 100;
- $id_map{ lc $meta{nick} }[$marker] = $meta{id};
- $id_map{__indexes}{ $meta{nick} } = $marker;
- $marker = ":$marker";
+ $id_map{ lc $meta{nick} }[$marker] = $meta{id};
+ $id_map{__indexes}{ $meta{nick} } = $marker;
+ $marker = ":$marker";
}
if ( $meta{type} eq 'tweet' ) {
} elsif ( $meta{type} eq 'reply' ) {
push @lines, "[$account\\--> %B\@$meta{nick}%n$marker] $_\n",;
} elsif ( $meta{type} eq 'dm' ) {
- push @lines, "[$account%B\@$meta{nick}%n (%%WDM%%n)] $_\n",;
+ push @lines, "[$account%B\@$meta{nick}%n (%WDM%n)] $_\n",;
+ } elsif ( $meta{type} eq 'error' ) {
+ push @lines, "error: $_\n" if &debug,;
} elsif ( $meta{type} eq 'debug' ) {
push @lines, "debug: $_\n" if &debug,;
}
or warn "Failed to remove $filename: $!"
unless &debug;
- # keep 10 minutes of cached tweets, to make sure we don't show duplicates.
+ # keep enough cached tweets, to make sure we don't show duplicates.
foreach ( keys %tweet_cache ) {
- next if $tweet_cache{$_} > time - 600;
+ next if $tweet_cache{$_} >= $old_last_poll;
delete $tweet_cache{$_};
}
+
+ # save id_map hash
+ if ( keys %id_map
+ and my $file =
+ Irssi::settings_get_str("twirssi_replies_store") )
+ {
+ if ( open JSON, ">$file" ) {
+ print JSON JSON::Any->objToJson( \%id_map );
+ close JSON;
+ } else {
+ ¬ice("Failed to write replies to $file: $!");
+ }
+ }
return;
}
}
close FILE;
- Irssi::timeout_add_once( 5000, 'monitor_child', [$filename] );
+
+ if ( $attempt < 12 ) {
+ Irssi::timeout_add_once( 5000, 'monitor_child',
+ [ $filename, $attempt + 1 ] );
+ } else {
+ ¬ice("Giving up on polling $filename");
+ unlink $filename unless &debug;
+ }
}
sub debug {
and $linestart =~ /^\/reply(?:_as)?\s*$/ )
)
{ # /twitter_reply gets a nick:num
- @$complist = grep /^\Q$word/i, sort keys %{$id_map{__indexes}};
+ @$complist = grep /^\Q$word/i, sort keys %{ $id_map{__indexes} };
}
# /tweet, /tweet_as, /dm, /dm_as - complete @nicks (and nicks as the first
".irssi/scripts/twirssi.pl" );
Irssi::settings_add_str( "twirssi", "twitter_usernames", undef );
Irssi::settings_add_str( "twirssi", "twitter_passwords", undef );
+Irssi::settings_add_str( "twirssi", "twirssi_replies_store",
+ ".irssi/scripts/twirssi.json" );
Irssi::settings_add_bool( "twirssi", "tweet_to_away", 0 );
Irssi::settings_add_bool( "twirssi", "show_reply_context", 0 );
Irssi::settings_add_bool( "twirssi", "show_own_tweets", 1 );
Irssi::command_bind( "reply_as", "cmd_reply_as" );
}
Irssi::command_bind(
- "twitter_dump",
+ "twirssi_dump",
sub {
- print "twits: ", Dumper \%twits;
+ print "twits: ", join ", ",
+ map { "u: $_->{username}" } values %twits;
print "friends: ", join ", ", sort keys %friends;
print "nicks: ", join ", ", sort keys %nicks;
+ print "id_map: ", Dumper \%{ $id_map{__indexes} };
print "last poll: $last_poll";
}
);
¬ice(
" %Y||%C `%N Log in with /twitter_login, send updates with /tweet");
+ my $file = Irssi::settings_get_str("twirssi_replies_store");
+ if ( $file and -r $file ) {
+ if ( open( JSON, $file ) ) {
+ local $/;
+ my $json = <JSON>;
+ close JSON;
+ eval {
+ my $ref = JSON::Any->jsonToObj($json);
+ %id_map = %$ref;
+ my $num = keys %{ $id_map{__indexes} };
+ ¬ice( sprintf "Loaded old replies from %d contact%s.",
+ $num, ( $num == 1 ? "" : "s" ) );
+ };
+ } else {
+ ¬ice("Failed to load old replies from $file: $!");
+ }
+ }
+
if ( my $provider = Irssi::settings_get_str("short_url_provider") ) {
eval "use WWW::Shorten::$provider;";
projects / twirssi-net-twitter-lite.git / blobdiff