use vars qw($VERSION %IRSSI);
-$VERSION = "1.6.1";
-my ($REV) = '$Rev: 336 $' =~ /(\d+)/;
+$VERSION = "1.7.2";
+my ($REV) = '$Rev: 347 $' =~ /(\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 09:54:25 -0800 (Tue, 06 Jan 2009) $',
);
my $window;
$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;
}
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;
}
};
if ($@) {
- printf $fh "type:error Error during friends_timeline call. Aborted.\n"
- return;
+ print $fh "type:error Error during friends_timeline call. Aborted.\n";
+ return 1;
}
foreach my $t ( reverse @$tweets ) {
eval {
$tweets = $obj->replies( { since => HTTP::Date::time2str($last_poll) } )
|| [];
- }
+ };
- if ($@) {
- printf $fh "type:error Error during replies call. Aborted.\n" return;
+ if ($@) {
+ print $fh "type:error Error during replies call. Aborted.\n";
+ return 1;
}
foreach my $t ( reverse @$tweets ) {
}
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;
} 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, "debug: $_\n" if &debug,;
+ 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 {
sub sig_complete {
my ( $complist, $window, $word, $linestart, $want_space ) = @_;
- if (
- $linestart =~ /^\/twitter_reply(?:_as)?\s*$/
- or ( Irssi::settings_get_bool("twirssi_use_reply_aliases")
- and $linestart =~ /^\/reply(?:_as)?\s*$/ )
- )
- { # /twitter_reply gets a nick:num
+ # /twitter_reply gets a nick:num
+ if ( $linestart =~ /^\/twitter_reply(?:_as)?\s*$/ ) {
@$complist = grep /^\Q$word/i, sort keys %{ $id_map{__indexes} };
}
".irssi/scripts/twirssi.pl" );
Irssi::settings_add_str( "twirssi", "twitter_usernames", undef );
Irssi::settings_add_str( "twirssi", "twitter_passwords", undef );
-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::settings_add_bool( "twirssi", "twirssi_debug", 0 );
-Irssi::settings_add_bool( "twirssi", "twirssi_first_run", 1 );
-Irssi::settings_add_bool( "twirssi", "twirssi_track_replies", 1 );
-Irssi::settings_add_bool( "twirssi", "twirssi_use_reply_aliases", 0 );
+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::settings_add_bool( "twirssi", "twirssi_debug", 0 );
+Irssi::settings_add_bool( "twirssi", "twirssi_first_run", 1 );
+Irssi::settings_add_bool( "twirssi", "twirssi_track_replies", 1 );
$window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') );
if ($window) {
Irssi::command_bind( "twitter_logout", "cmd_logout" );
Irssi::command_bind( "twitter_switch", "cmd_switch" );
Irssi::command_bind( "twirssi_upgrade", "cmd_upgrade" );
- if ( Irssi::settings_get_bool("twirssi_use_reply_aliases") ) {
- Irssi::command_bind( "reply", "cmd_reply" );
- 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