X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/blobdiff_plain/ba035c7d0a137bceede38c763373692c46f6285d..ffecda58bcaff0f441dd3a0583347a20a6abf3ee:/twirssi.pl diff --git a/twirssi.pl b/twirssi.pl index a164ed0..47089f7 100644 --- a/twirssi.pl +++ b/twirssi.pl @@ -12,7 +12,7 @@ $Data::Dumper::Indent = 1; use vars qw($VERSION %IRSSI); $VERSION = "1.7"; -my ($REV) = '$Rev: 340 $' =~ /(\d+)/; +my ($REV) = '$Rev: 342 $' =~ /(\d+)/; %IRSSI = ( authors => 'Dan Boger', contact => 'zigdon@gmail.com', @@ -21,7 +21,7 @@ my ($REV) = '$Rev: 340 $' =~ /(\d+)/; . '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-05 16:26:47 -0800 (Mon, 05 Jan 2009) $', ); my $window; @@ -711,9 +711,9 @@ sub do_updates { print scalar localtime, " - Polling for DMs" if &debug; eval { - $tweets = - $obj->direct_messages( { since => HTTP::Date::time2str($last_poll) } ) - || []; + $tweets = + $obj->direct_messages( { since => HTTP::Date::time2str($last_poll) } ) + || []; }; if ($@) { @@ -812,13 +812,16 @@ sub monitor_child { } # 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: $!"); - } + 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; } @@ -866,7 +869,8 @@ Irssi::settings_add_str( "twirssi", "twirssi_location", ".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_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 ); @@ -894,10 +898,11 @@ if ($window) { Irssi::command_bind( "twirssi_dump", sub { - print "twits: ", join ", ", map {"u: $_->{username}"} values %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 "id_map: ", Dumper \%{ $id_map{__indexes} }; print "last poll: $last_poll"; } ); @@ -934,20 +939,21 @@ if ($window) { " %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 = ; - 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 ( $file and -r $file ) { + if ( open( JSON, $file ) ) { + local $/; + my $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") ) {