use File::Temp;
use LWP::Simple;
use Data::Dumper;
+use Encode;
$Data::Dumper::Indent = 1;
use vars qw($VERSION %IRSSI);
-$VERSION = "2.2.4beta";
-my ($REV) = '$Rev: 647 $' =~ /(\d+)/;
+$VERSION = "2.3.0beta";
+my ($REV) = '$Rev: 687 $' =~ /(\d+)/;
%IRSSI = (
authors => 'Dan Boger',
contact => 'zigdon@gmail.com',
. 'Can optionally set your bitlbee /away message to same',
license => 'GNU GPL v2',
url => 'http://twirssi.com',
- changed => '$Date: 2009-06-04 16:02:51 -0700 (Thu, 04 Jun 2009) $',
+ changed => '$Date: 2009-08-07 01:24:53 -0700 (Fri, 07 Aug 2009) $',
);
my $window;
my %id_map;
my $failwhale = 0;
my $first_call = 1;
+my $child_pid;
+my %fix_replies_index;
my %irssi_to_mirc_colors = (
'%k' => '01',
if ( $twits{$username}
->new_direct_message( { user => $target, text => $text } ) )
{
- ¬ice("DM sent to $target");
+ ¬ice("DM sent to $target: $text");
$nicks{$target} = time;
} else {
my $error;
unless (
$twits{$username}->update(
{
- status => $data,
+ status => $data,
+
# in_reply_to_status_id => $id_map{ lc $nick }[$id]
}
)
my $pass;
if ($data) {
( $user, $pass ) = split ' ', $data, 2;
+ unless ($pass) {
+ ¬ice("usage: /twitter_login <username>[\@<service>] <password>");
+ return;
+ }
} elsif ( my $autouser = Irssi::settings_get_str("twitter_usernames")
and my $autopass = Irssi::settings_get_str("twitter_passwords") )
{
$twit = "Net::$service"->new(
username => $user,
password => $pass,
- source => "twirssi"
+ source => "twirssi",
+ ssl => Irssi::settings_get_bool("twirssi_avoid_ssl") ? 0 : 1,
);
+ unless ($twit) {
+ ¬ice("Failed to create Net::$service object! Aborting.");
+ return;
+ }
+
+ if ( my $timeout = Irssi::settings_get_int("twitter_timeout")
+ and $twit->can('ua') )
+ {
+ $twit->ua->timeout($timeout);
+ }
+
unless ( $twit->verify_credentials() ) {
¬ice("Login as $user\@$service failed");
+
+ if ( not Irssi::settings_get_bool("twirssi_avoid_ssl") ) {
+ ¬ice(
+ "It's possible you're missing one of the modules required for "
+ . "SSL logins. Try setting twirssi_avoid_ssl to on. See "
+ . "http://cpansearch.perl.org/src/GAAS/libwww-perl-5.831/README.SSL "
+ . "for the detailed requirements." );
+ }
+
$twit = undef;
if ( keys %twits ) {
&cmd_switch( ( keys %twits )[0], $server, $win );
¬ice( "loaded friends: ", scalar keys %friends );
if ( Irssi::settings_get_bool("twirssi_first_run") ) {
Irssi::settings_set_bool( "twirssi_first_run", 0 );
- unless ( exists $friends{twirssi} ) {
- ¬ice("Welcome to twirssi!"
- . " Perhaps you should add \@twirssi to your friends list,"
- . " so you can be notified when a new version is release?"
- . " Just type /twitter_friend twirssi." );
- }
}
%nicks = %friends;
$nicks{$user} = 0;
}
}
+sub cmd_add_follow {
+ my ( $data, $server, $win ) = @_;
+
+ unless ($data) {
+ ¬ice("Usage: /twitter_add_follow_extra <username>");
+ return;
+ }
+
+ $data =~ s/^\s+|\s+$//;
+ $data =~ s/^\@//;
+ $data = lc $data;
+
+ if ( exists $id_map{__fixreplies}{"$user\@$defservice"}{$data} ) {
+ ¬ice("Already following all replies by \@$data");
+ return;
+ }
+
+ $id_map{__fixreplies}{"$user\@$defservice"}{$data} = 1;
+ ¬ice("Will now follow all replies by \@$data");
+}
+
+sub cmd_del_follow {
+ my ( $data, $server, $win ) = @_;
+
+ unless ($data) {
+ ¬ice("Usage: /twitter_del_follow_extra <username>");
+ return;
+ }
+
+ $data =~ s/^\s+|\s+$//;
+ $data =~ s/^\@//;
+ $data = lc $data;
+
+ unless ( exists $id_map{__fixreplies}{"$user\@$defservice"}{$data} ) {
+ ¬ice("Wasn't following all replies by \@$data");
+ return;
+ }
+
+ delete $id_map{__fixreplies}{"$user\@$defservice"}{$data};
+ ¬ice("Will no longer follow all replies by \@$data");
+}
+
+sub cmd_list_follow {
+ my ( $data, $server, $win ) = @_;
+
+ my $found = 0;
+ foreach my $suser ( sort keys %{ $id_map{__fixreplies} } ) {
+ my $frusers;
+ foreach my $fruser ( sort keys %{ $id_map{__fixreplies}{$suser} } ) {
+ $frusers = $frusers ? "$frusers, $fruser" : $fruser;
+ }
+ if ($frusers) {
+ $found = 1;
+ ¬ice("Following all replies as \@$suser: $frusers");
+ }
+ }
+
+ unless ($found) {
+ ¬ice("Not following all replies by anyone");
+ }
+}
+
sub cmd_add_search {
my ( $data, $server, $win ) = @_;
my $loc = Irssi::settings_get_str("twirssi_location");
unless ( -w $loc ) {
- ¬ice(
-"$loc isn't writable, can't upgrade. Perhaps you need to /set twirssi_location?"
+ ¬ice( "$loc isn't writable, can't upgrade." .
+ " Perhaps you need to /set twirssi_location?"
);
return;
}
eval { use Digest::MD5; };
if ($@) {
- ¬ice(
-"Failed to load Digest::MD5. Try '/twirssi_upgrade nomd5' to skip MD5 verification"
+ ¬ice( "Failed to load Digest::MD5." .
+ " Try '/twirssi_upgrade nomd5' to skip MD5 verification"
);
return;
}
}
unless ( open( CUR, $loc ) ) {
- ¬ice(
-"Failed to read $loc. Check that /set twirssi_location is set to the correct location."
+ ¬ice( "Failed to read $loc." .
+ " Check that /set twirssi_location is set to the correct location."
);
return;
}
¬ice("Downloading twirssi from $URL");
LWP::Simple::getstore( $URL, "$loc.upgrade" );
+ unless ( -s "$loc.upgrade" ) {
+ ¬ice("Failed to save $loc.upgrade."
+ . " Check that /set twirssi_location is set to the correct location."
+ );
+ return;
+ }
+
unless ( $data or Irssi::settings_get_bool("twirssi_upgrade_beta") ) {
unless ( open( NEW, "$loc.upgrade" ) ) {
- ¬ice(
-"Failed to read $loc.upgrade. Check that /set twirssi_location is set to the correct location."
+ ¬ice("Failed to read $loc.upgrade."
+ . " Check that /set twirssi_location is set to the correct location."
);
return;
}
sub load_friends {
my $fh = shift;
+ my $cursor = -1;
my $page = 1;
my %new_friends;
eval {
- while (1)
+ while ($page < 11 and $cursor ne "0")
{
print $fh "type:debug Loading friends page $page...\n"
if ( $fh and &debug );
- my $friends = $twit->friends( { page => $page } );
- last unless $friends;
+ my $friends;
+ if (ref $twit =~ /^Net::Twitter/) {
+ $friends = $twit->friends( { cursor => $cursor } );
+ last unless $friends;
+ $cursor = $friends->{next_cursor};
+ $friends = $friends->{users};
+ } else {
+ $friends = $twit->friends( { page => $page } );
+ last unless $friends;
+ }
$new_friends{ $_->{screen_name} } = time foreach @$friends;
$page++;
- last if @$friends == 0 or $page == 10;
}
};
my ( $fh, $filename ) = File::Temp::tempfile();
binmode( $fh, ":utf8" );
- my $pid = fork();
+ $child_pid = fork();
- if ($pid) { # parent
- Irssi::timeout_add_once( 5000, 'monitor_child', [ $filename, 0 ] );
- Irssi::pidwait_add($pid);
- } elsif ( defined $pid ) { # child
+ if ($child_pid) { # parent
+ Irssi::timeout_add_once( 5000, 'monitor_child',
+ [ "$filename.done", 0 ] );
+ Irssi::pidwait_add($child_pid);
+ } elsif ( defined $child_pid ) { # child
close STDIN;
close STDOUT;
close STDERR;
my %context_cache;
foreach ( keys %twits ) {
$error++ unless &do_updates( $fh, $_, $twits{$_}, \%context_cache );
+
+ if ( $id_map{__fixreplies}{$_} ) {
+ my @frusers = sort keys %{ $id_map{__fixreplies}{$_} };
+
+ $error++
+ unless &get_timeline( $fh, $frusers[ $fix_replies_index{$_} ],
+ $_, $twits{$_}, \%context_cache );
+
+ $fix_replies_index{$_}++;
+ $fix_replies_index{$_} = 0
+ if $fix_replies_index{$_} >= @frusers;
+ print $fh "id:$fix_replies_index{$_} ",
+ "account:$_ type:fix_replies_index\n";
+ }
}
print $fh "__friends__\n";
print $fh "-- $new_poll";
}
close $fh;
+ rename $filename, "$filename.done";
exit;
} else {
&ccrap("Failed to fork for updating: $!");
foreach my $t ( reverse @$tweets ) {
my $text = decode_entities( $t->{text} );
- $text = &hilight($text);
+ $text =~ s/[\n\r]/ /g;
my $reply = "tweet";
if ( Irssi::settings_get_bool("show_reply_context")
and $t->{in_reply_to_screen_name} ne $username
if ($context) {
my $ctext = decode_entities( $context->{text} );
- $ctext = &hilight($ctext);
+ $ctext =~ s/[\n\r]/ /g;
if ( $context->{truncated} and ref($obj) ne 'Net::Identica' ) {
$ctext .=
" -- http://twitter.com/$context->{user}{screen_name}"
. "/status/$context->{id}";
}
- printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
+ printf $fh "id:%s account:%s nick:%s type:tweet %s\n",
$context->{id}, $username,
$context->{user}{screen_name}, $ctext;
$reply = "reply";
$text .= " -- http://twitter.com/$t->{user}{screen_name}"
. "/status/$t->{id}";
}
- printf $fh "id:%d account:%s nick:%s type:%s %s\n",
+ printf $fh "id:%s account:%s nick:%s type:%s %s\n",
$t->{id}, $username, $t->{user}{screen_name}, $reply, $text;
$new_poll_id = $t->{id} if $new_poll_id < $t->{id};
}
- printf $fh "id:%d account:%s type:last_id timeline\n",
+ printf $fh "id:%s account:%s type:last_id timeline\n",
$new_poll_id, $username;
- print scalar localtime, " - Polling for replies" if &debug;
+ print scalar localtime, " - Polling for replies since ",
+ $id_map{__last_id}{$username}{reply}
+ if &debug;
$new_poll_id = 0;
eval {
if ( $id_map{__last_id}{$username}{reply} )
if exists $friends{ $t->{user}{screen_name} };
my $text = decode_entities( $t->{text} );
- $text = &hilight($text);
+ $text =~ s/[\n\r]/ /g;
if ( $t->{truncated} ) {
$text .= " -- http://twitter.com/$t->{user}{screen_name}"
. "/status/$t->{id}";
}
- printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
+ printf $fh "id:%s account:%s nick:%s type:tweet %s\n",
$t->{id}, $username, $t->{user}{screen_name}, $text;
$new_poll_id = $t->{id} if $new_poll_id < $t->{id};
}
- printf $fh "id:%d account:%s type:last_id reply\n", $new_poll_id, $username;
+ printf $fh "id:%s account:%s type:last_id reply\n", $new_poll_id, $username;
print scalar localtime, " - Polling for DMs" if &debug;
$new_poll_id = 0;
foreach my $t ( reverse @$tweets ) {
my $text = decode_entities( $t->{text} );
- $text = &hilight($text);
- printf $fh "id:%d account:%s nick:%s type:dm %s\n",
+ $text =~ s/[\n\r]/ /g;
+ printf $fh "id:%s account:%s nick:%s type:dm %s\n",
$t->{id}, $username, $t->{sender_screen_name}, $text;
$new_poll_id = $t->{id} if $new_poll_id < $t->{id};
}
- printf $fh "id:%d account:%s type:last_id dm\n", $new_poll_id, $username;
+ printf $fh "id:%s account:%s type:last_id dm\n", $new_poll_id, $username;
print scalar localtime, " - Polling for subscriptions" if &debug;
if ( $obj->can('search') and $id_map{__searches}{$username} ) {
}
$id_map{__searches}{$username}{$topic} = $search->{max_id};
- printf $fh "id:%d account:%s type:searchid topic:%s\n",
+ printf $fh "id:%s account:%s type:searchid topic:%s\n",
$search->{max_id}, $username, $topic;
foreach my $t ( reverse @{ $search->{results} } ) {
my $text = decode_entities( $t->{text} );
- $text = &hilight($text);
- printf $fh "id:%d account:%s nick:%s type:search topic:%s %s\n",
+ $text =~ s/[\n\r]/ /g;
+ printf $fh "id:%s account:%s nick:%s type:search topic:%s %s\n",
$t->{id}, $username, $t->{from_user}, $topic, $text;
$new_poll_id = $t->{id}
if not $new_poll_id
return 1;
}
+sub get_timeline {
+ my ( $fh, $target, $username, $obj, $cache ) = @_;
+ my $tweets;
+ my $last_id = $id_map{__last_id}{$username}{$target};
+
+ print $fh "type:debug get_timeline(" .
+ "$fix_replies_index{$username}=$target > $last_id) started." .
+ " username = $username\n";
+ eval {
+ $tweets = $obj->user_timeline(
+ {
+ id => $target,
+ (
+ $last_id ? (since_id => $last_id) : ()
+ ),
+ }
+ );
+ };
+
+ if ($@) {
+ print $fh
+ "type:debug Error during user_timeline($target) call: Aborted.\n";
+ print $fh "type:debug : $_\n" foreach split /\n/, Dumper($@);
+ return undef;
+ }
+
+ unless ($tweets) {
+ print $fh
+ "type:debug user_timeline($target) call returned undef! Aborted\n";
+ return 1;
+ }
+
+ foreach my $t ( reverse @$tweets ) {
+ my $text = decode_entities( $t->{text} );
+ $text =~ s/[\n\r]/ /g;
+ my $reply = "tweet";
+ if ( Irssi::settings_get_bool("show_reply_context")
+ and $t->{in_reply_to_screen_name} ne $username
+ and $t->{in_reply_to_screen_name}
+ and not exists $friends{ $t->{in_reply_to_screen_name} } )
+ {
+ $nicks{ $t->{in_reply_to_screen_name} } = time;
+ my $context;
+ unless ( $cache->{ $t->{in_reply_to_status_id} } ) {
+ eval {
+ $cache->{ $t->{in_reply_to_status_id} } =
+ $obj->show_status( $t->{in_reply_to_status_id} );
+ };
+
+ }
+ $context = $cache->{ $t->{in_reply_to_status_id} };
+
+ if ($context) {
+ my $ctext = decode_entities( $context->{text} );
+ $ctext =~ s/[\n\r]/ /g;
+ if ( $context->{truncated} and ref($obj) ne 'Net::Identica' ) {
+ $ctext .=
+ " -- http://twitter.com/$context->{user}{screen_name}"
+ . "/status/$context->{id}";
+ }
+ printf $fh "id:%s account:%s nick:%s type:tweet %s\n",
+ $context->{id}, $username,
+ $context->{user}{screen_name}, $ctext;
+ $reply = "reply";
+ }
+ }
+ if ( $t->{truncated} and ref($obj) ne 'Net::Identica' ) {
+ $text .= " -- http://twitter.com/$t->{user}{screen_name}"
+ . "/status/$t->{id}";
+ }
+ printf $fh "id:%s account:%s nick:%s type:%s %s\n",
+ $t->{id}, $username, $t->{user}{screen_name}, $reply, $text;
+ $last_id = $t->{id} if $last_id < $t->{id};
+ }
+ printf $fh "id:%s account:%s type:last_id_fixreplies %s\n",
+ $last_id, $username, $target;
+
+ return 1;
+}
+
sub monitor_child {
my ($data) = @_;
my $filename = $data->[0];
# pretend
if ( open FILE, $filename ) {
+ binmode FILE, ":utf8";
my @lines;
my %new_cache;
while (<FILE>) {
}
}
+ if ( $meta{type} and $meta{type} eq 'fix_replies_index' ) {
+ $fix_replies_index{ $meta{account} } = $meta{id};
+ print "fix_replies_index for $meta{account} set to $meta{id}"
+ if &debug;
+ next;
+ }
+
if ( not $meta{type} or $meta{type} !~ /searchid|last_id/ ) {
if ( exists $meta{id} and exists $new_cache{ $meta{id} } ) {
next;
$meta{id}
if $id_map{__last_id}{"$meta{account}\@$meta{service}"}{$_} <
$meta{id};
+ } elsif ( $meta{type} eq 'last_id_fixreplies' ) {
+ $id_map{__last_id}{"$meta{account}\@$meta{service}"}{$_} =
+ $meta{id}
+ if $id_map{__last_id}{"$meta{account}\@$meta{service}"}{$_} <
+ $meta{id};
} elsif ( $meta{type} eq 'error' ) {
push @lines, [ MSGLEVEL_MSGS, $_ ];
} elsif ( $meta{type} eq 'debug' ) {
}
if (/^-- (\d+)$/) {
- ($new_last_poll) = ($1);
- last;
+ $new_last_poll = $1;
+ if ( $new_last_poll >= $last_poll ) {
+ last;
+ } else {
+ print "Impossible! ",
+ "new_last_poll=$new_last_poll < last_poll=$last_poll!"
+ if &debug;
+ undef $new_last_poll;
+ next;
+ }
}
my ( $f, $t ) = split ' ', $_;
$nicks{$f} = $friends{$f} = $t;
$window->printformat(
$line->[0],
"twirssi_" . $line->[1],
- @$line[ 2 .. $#$line ]
+ @$line[ 2 .. $#$line - 1 ],
+ &hilight( $line->[-1] )
);
}
}
}
$last_poll = $new_last_poll;
+ # make sure the pid is removed from the waitpid list
+ Irssi::pidwait_remove($child_pid);
+
+ # and that we don't leave any zombies behind, somehow
+ wait();
+
# save id_map hash
if ( keys %id_map
and my $file =
[ $filename, $attempt + 1 ] );
} else {
print "Giving up on polling $filename" if &debug;
+ Irssi::pidwait_remove($child_pid);
+ wait();
unlink $filename unless &debug;
return unless Irssi::settings_get_bool("twirssi_notify_timeouts");
keys %{ $id_map{__indexes} };
}
- if ( $linestart =~ /^\/twitter_unfriend\s*$/ )
+ if ( $linestart =~ /^\/(twitter_unfriend|twitter_add_follow_extra|twitter_del_follow_extra)\s*$/ )
{ # /twitter_unfriend gets a nick
$word =~ s/^@//;
push @$complist, grep /^\Q$word/i,
if ( Irssi::settings_get_str("twirssi_topic_color") ) {
my $c = Irssi::settings_get_str("twirssi_topic_color");
$c = $irssi_to_mirc_colors{$c};
- $text =~ s/(^|\W)\#([-\w]+)/$1\cC$c\#$2\cO/g if $c;
+ $text =~ s/(^|\W)(\#|\!)([-\w]+)/$1\cC$c$2$3\cO/g if $c;
}
$text =~ s/[\n\r]/ /g;
"Set short_url_args to username,API_key or change your",
"short_url_provider."
);
- return $data;
+ return decode "utf8", $data;
}
}
}
}
- return $data;
+ return decode "utf8", $data;
}
sub normalize_username {
".irssi/scripts/twirssi.json" );
Irssi::settings_add_int( "twirssi", "twitter_friends_poll", 600 );
+Irssi::settings_add_int( "twirssi", "twitter_timeout", 30 );
Irssi::settings_add_bool( "twirssi", "twirssi_upgrade_beta", 0 );
Irssi::settings_add_bool( "twirssi", "tweet_to_away", 0 );
Irssi::settings_add_bool( "twirssi", "twirssi_hilights", 1 );
Irssi::settings_add_bool( "twirssi", "twirssi_always_shorten", 0 );
Irssi::settings_add_bool( "twirssi", "tweet_window_input", 0 );
+Irssi::settings_add_bool( "twirssi", "twirssi_avoid_ssl", 0 );
$last_poll = time - &get_poll_time;
$window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') );
Irssi::command_bind( "twitter_list_subscriptions", "cmd_list_search" );
Irssi::command_bind( "twirssi_upgrade", "cmd_upgrade" );
Irssi::command_bind( "twitter_updates", "get_updates" );
+ Irssi::command_bind( "twitter_add_follow_extra", "cmd_add_follow" );
+ Irssi::command_bind( "twitter_del_follow_extra", "cmd_del_follow" );
+ Irssi::command_bind( "twitter_list_follow_extra", "cmd_list_follow" );
Irssi::command_bind( "bitlbee_away", "update_away" );
if ( Irssi::settings_get_bool("twirssi_use_reply_aliases") ) {
Irssi::command_bind( "reply", "cmd_reply" );
Irssi::command_bind(
"twirssi_version",
sub {
- ¬ice("Twirssi v$VERSION (r$REV); "
- . "Net::Twitter v$Net::Twitter::VERSION. "
+ ¬ice(
+ "Twirssi v$VERSION (r$REV); "
+ . (
+ $Net::Twitter::VERSION
+ ? "Net::Twitter v$Net::Twitter::VERSION. "
+ : ""
+ )
+ . (
+ $Net::Identica::VERSION
+ ? "Net::Identica v$Net::Identica::VERSION. "
+ : ""
+ )
. "JSON in use: "
. JSON::Any::handler()
- . ". See details at http://twirssi.com/" );
+ . ". See details at http://twirssi.com/"
+ );
}
);
Irssi::command_bind(
- "twitter_friend",
+ "twitter_follow",
&gen_cmd(
- "/twitter_friend <username>",
+ "/twitter_follow <username>",
"create_friend",
sub { ¬ice("Following $_[0]"); $nicks{ $_[0] } = time; }
)
);
Irssi::command_bind(
- "twitter_unfriend",
+ "twitter_unfollow",
&gen_cmd(
"/twitter_unfriend <username>",
"destroy_friend",
sub { ¬ice("Device updated to $_[0]"); }
)
);
+ Irssi::command_bind(
+ "twitter_block",
+ &gen_cmd(
+ "/twitter_block <username>",
+ "create_block",
+ sub { ¬ice("Blocked $_[0]"); }
+ )
+ );
+ Irssi::command_bind(
+ "twitter_unblock",
+ &gen_cmd(
+ "/twitter_unblock <username>",
+ "destroy_block",
+ sub { ¬ice("Unblock $_[0]"); }
+ )
+ );
Irssi::signal_add_last( 'complete word' => \&sig_complete );
¬ice(" %Y<%C(%B^%C)%N TWIRSSI v%R$VERSION%N (r$REV)");
¬ice( sprintf "Loaded old replies from %d contact%s.",
$num, ( $num == 1 ? "" : "s" ) );
&cmd_list_search;
+ &cmd_list_follow;
};
} else {
¬ice("Failed to load old replies from $file: $!");
projects / twirssi-net-twitter-lite.git / blobdiff