use LWP::Simple;
use Data::Dumper;
use Encode;
+use POSIX qw/:sys_wait_h/;
+use Net::Twitter qw/3.05/;
$Data::Dumper::Indent = 1;
use vars qw($VERSION %IRSSI);
-$VERSION = "2.2.7";
-my ($REV) = '$Rev: 687 $' =~ /(\d+)/;
-%IRSSI = (
+$VERSION = "2.4.2beta";
+%IRSSI = (
authors => 'Dan Boger',
contact => 'zigdon@gmail.com',
name => 'twirssi',
. 'Can optionally set your bitlbee /away message to same',
license => 'GNU GPL v2',
url => 'http://twirssi.com',
- changed => '$Date: 2009-08-07 01:24:53 -0700 (Fri, 07 Aug 2009) $',
+ changed => 'Fri Jan 22 14:40:48 PST 2010',
);
my $window;
my $twit;
my %twits;
+my %oauth;
my $user;
my $defservice;
my $poll;
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;
sub cmd_retweet_as {
my ( $data, $server, $win ) = @_;
- unless ( Irssi::settings_get_bool("twirssi_track_replies") ) {
- ¬ice("twirssi_track_replies is required in order to reteet.");
- return;
- }
-
return unless &logged_in($twit);
$data =~ s/^\s+|\s+$//;
}
$text =~ s/\$t/$id_map{__tweets}{ lc $nick }[$id]/;
+ my $modified = $data;
$data = &shorten($text);
- return if &too_long($data);
+ return if $modified and &too_long($data);
my $success = 1;
eval {
- unless (
- $twits{$username}->update(
+ if ($modified)
+ {
+ $success = $twits{$username}->update(
{
status => $data,
# in_reply_to_status_id => $id_map{ lc $nick }[$id]
}
- )
- )
- {
- ¬ice("Update failed");
- $success = 0;
+ );
+ } else {
+ $success =
+ $twits{$username}->retweet( { id => $id_map{ lc $nick }[$id] } );
+ $success = $success->{id} if ref $success;
}
+ ¬ice("Update failed") unless $success;
};
return unless $success;
sub cmd_reply_as {
my ( $data, $server, $win ) = @_;
- unless ( Irssi::settings_get_bool("twirssi_track_replies") ) {
- ¬ice("twirssi_track_replies is required in order to reply to "
- . "specific tweets. Either enable it, or just use /tweet "
- . "\@username <text>." );
- return;
- }
-
return unless &logged_in($twit);
$data =~ s/^\s+|\s+$//;
return unless $data = &valid_username($data);
¬ice("Logging out $data...");
- $twits{$data}->end_session();
+ eval { $twits{$data}->end_session(); };
delete $twits{$data};
undef $twit;
if ( keys %twits ) {
sub cmd_login {
my ( $data, $server, $win ) = @_;
my $pass;
+ print "logging in: $data" if &debug;
if ($data) {
+ print "manual data login" if &debug;
( $user, $pass ) = split ' ', $data, 2;
+ unless ( Irssi::settings_get_bool("twirssi_use_oauth") or $pass ) {
+ ¬ice("usage: /twitter_login <username>[\@<service>] <password>");
+ return;
+ }
+ } elsif ( Irssi::settings_get_bool("twirssi_use_oauth")
+ and my $autouser = Irssi::settings_get_str("twitter_usernames") )
+ {
+ print "oauth autouser login" if &debug;
+ foreach my $user ( split /,/, $autouser ) {
+ &cmd_login($user);
+ }
+ return;
} elsif ( my $autouser = Irssi::settings_get_str("twitter_usernames")
and my $autopass = Irssi::settings_get_str("twitter_passwords") )
{
+ print "autouser login" if &debug;
my @user = split /\s*,\s*/, $autouser;
my @pass = split /\s*,\s*/, $autopass;
return;
}
} else {
- ¬ice("/twitter_login requires either a username and password "
- . "or twitter_usernames and twitter_passwords to be set." );
+ ¬ice("/twitter_login requires either a username/password "
+ . "or twitter_usernames and twitter_passwords to be set. "
+ . "Note that if twirssi_use_oauth is true, passwords are "
+ . "not required" );
return;
}
}
$defservice = $service = ucfirst lc $service;
- eval "use Net::$service";
- if ($@) {
- ¬ice(
- "Failed to load Net::$service when trying to log in as $user: $@");
+ if ( $service eq 'Twitter'
+ and Irssi::settings_get_bool("twirssi_use_oauth") )
+ {
+ print "Attempting OAuth for $user\@$service" if &debug;
+ eval {
+ if ( $service eq 'Identica' )
+ {
+ $twit = Net::Twitter->new(
+ identica => 1,
+ traits => [ 'API::REST', 'API::Search' ],
+ source => "twirssi",
+ ssl => !Irssi::settings_get_bool("twirssi_avoid_ssl"),
+ );
+ } else {
+ $twit = Net::Twitter->new(
+ traits => [ 'API::REST', 'OAuth', 'API::Search' ],
+ consumer_key => 'BZVAvBma4GxdiRwXIvbnw',
+ consumer_secret =>
+ '0T5kahwLyb34vciGZsgkA9lsjtGCQ05vxVE2APXM',
+ source => "twirssi",
+ ssl => !Irssi::settings_get_bool("twirssi_avoid_ssl"),
+ );
+ }
+ };
+
+ if ($twit) {
+ if ( open( OAUTH, Irssi::settings_get_str("twirssi_oauth_store") ) )
+ {
+ while (<OAUTH>) {
+ chomp;
+ next unless m/$user\@$service (\S+) (\S+)/i;
+ print "Trying cached oauth creds for $user\@$service"
+ if &debug;
+ $twit->access_token($1);
+ $twit->access_token_secret($2);
+ last;
+ }
+ close OAUTH;
+ }
+
+ unless ( $twit->authorized ) {
+ my $url;
+ eval { $url = $twit->get_authorization_url; };
+
+ if ($@) {
+ ¬ice( "ERROR: Failed to get OAuth authorization_url. " .
+ "Try again later.");
+ return;
+ }
+ ¬ice( "Twirssi not autorized to access $service for $user.",
+ "Please authorize at the following url, then enter the pin",
+ "supplied with /twirssi_oauth $user\@$service <pin>",
+ $url
+ );
+
+ $oauth{pending}{"$user\@$service"} = $twit;
+ return;
+ }
+ }
+ } else {
+ $twit = Net::Twitter->new(
+ $service eq 'Identica' ? ( identica => 1 ) : (),
+ username => $user,
+ password => $pass,
+ source => "twirssi",
+ ssl => Irssi::settings_get_bool("twirssi_avoid_ssl") ? 0 : 1,
+ );
+ }
+
+ unless ($twit) {
+ ¬ice("Failed to create object! Aborting.");
return;
}
- $twit = "Net::$service"->new(
- username => $user,
- password => $pass,
- source => "twirssi",
- ssl => Irssi::settings_get_bool("twirssi_avoid_ssl") ? 0 : 1,
- );
+ return &verify_twitter_object( $server, $win, $user, $service, $twit );
+}
- unless ($twit) {
- ¬ice("Failed to create Net::$service object! Aborting.");
+sub cmd_oauth {
+ my ( $data, $server, $win ) = @_;
+ my ( $key, $pin ) = split ' ', $data;
+ my ( $user, $service );
+ $key = &normalize_username($key);
+ if ( $key =~ /^(.*)@(Twitter|Identica)$/ ) {
+ ( $user, $service ) = ( $1, $2 );
+ }
+ $pin =~ s/\D//g;
+ print "Applying pin to $key" if &debug;
+
+ unless ( exists $oauth{pending}{$key} ) {
+ ¬ice("There isn't a pending oauth request for $key. "
+ . "Try /twitter_login first" );
return;
}
+ my $twit = $oauth{pending}{$key};
+ my ( $access_token, $access_token_secret );
+ eval {
+ ( $access_token, $access_token_secret ) =
+ $twit->request_access_token( verifier => $pin );
+ };
+
+ if ($@) {
+ ¬ice("Invalid pin, try again.");
+ return;
+ }
+
+ delete $oauth{pending}{$key};
+
+ my $store_file = Irssi::settings_get_str("twirssi_oauth_store");
+ if ($store_file) {
+ my @store;
+ if ( open( OAUTH, $store_file ) ) {
+ while (<OAUTH>) {
+ chomp;
+ next if /$key/i;
+ push @store, $_;
+ }
+ close OAUTH;
+
+ }
+
+ push @store, "$key $access_token $access_token_secret";
+
+ if ( open( OAUTH, ">$store_file.new" ) ) {
+ print OAUTH "$_\n" foreach @store;
+ close OAUTH;
+ rename "$store_file.new", $store_file
+ or ¬ice("Failed to rename $store_file.new: $!");
+ } else {
+ ¬ice("Failed to write $store_file.new: $!");
+ }
+ } else {
+ ¬ice("No persistant storage set for OAuth. "
+ . "Please /set twirssi_oauth_store to a writable filename." );
+ }
+
+ return &verify_twitter_object( $server, $win, $user, $service, $twit );
+}
+
+sub verify_twitter_object {
+ my ( $server, $win, $user, $service, $twit ) = @_;
+
if ( my $timeout = Irssi::settings_get_int("twitter_timeout")
and $twit->can('ua') )
{
$twit->ua->timeout($timeout);
+ ¬ice("Twitter timeout set to $timeout");
}
unless ( $twit->verify_credentials() ) {
return;
}
- if ($twit) {
- my $rate_limit = $twit->rate_limit_status();
- if ( $rate_limit and $rate_limit->{remaining_hits} < 1 ) {
- ¬ice(
- "Rate limit exceeded, try again after $rate_limit->{reset_time}"
- );
- $twit = undef;
- return;
- }
+ my $rate_limit = $twit->rate_limit_status();
+ if ( $rate_limit and $rate_limit->{remaining_hits} < 1 ) {
+ ¬ice(
+ "Rate limit exceeded, try again after $rate_limit->{reset_time}");
+ $twit = undef;
+ return;
+ }
- $twits{"$user\@$service"} = $twit;
- Irssi::timeout_remove($poll) if $poll;
- $poll = Irssi::timeout_add( &get_poll_time * 1000, \&get_updates, "" );
- ¬ice("Logged in as $user\@$service, loading friends list...");
- &load_friends();
- ¬ice( "loaded friends: ", scalar keys %friends );
- if ( Irssi::settings_get_bool("twirssi_first_run") ) {
- Irssi::settings_set_bool( "twirssi_first_run", 0 );
+ print "saving object for $user\@$service" if &debug;
+ $twits{"$user\@$service"} = $twit;
+ Irssi::timeout_remove($poll) if $poll;
+ $poll = Irssi::timeout_add( &get_poll_time * 1000, \&get_updates, "" );
+ ¬ice("Logged in as $user\@$service, loading friends list...");
+ &load_friends();
+ ¬ice( "loaded friends: ". scalar keys %friends );
+ if ( Irssi::settings_get_bool("twirssi_first_run") ) {
+ Irssi::settings_set_bool( "twirssi_first_run", 0 );
+ }
+ %nicks = %friends;
+ $nicks{$user} = 0;
+ return 1;
+}
+
+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");
}
- %nicks = %friends;
- $nicks{$user} = 0;
- return 1;
- } else {
- ¬ice("Login failed");
+ }
+
+ unless ($found) {
+ ¬ice("Not following all replies by anyone");
}
}
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;
}
}
sub load_friends {
- my $fh = shift;
- my $page = 1;
+ 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;
}
};
if ($@) {
- print $fh "type:debug Error during friends list update. Aborted.\n";
+ print $fh "type:debug Error during friends list update. Aborted.\n"
+ if $fh;
return;
}
return unless &logged_in($twit);
my ( $fh, $filename ) = File::Temp::tempfile();
- binmode( $fh, ":utf8" );
+ binmode( $fh, ":" . &get_charset );
$child_pid = fork();
if ($child_pid) { # parent
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";
sub do_updates {
my ( $fh, $username, $obj, $cache ) = @_;
- my $rate_limit = $obj->rate_limit_status();
- if ( $rate_limit and $rate_limit->{remaining_hits} < 1 ) {
- ¬ice("Rate limit exceeded for $username");
- return undef;
- }
+ eval {
+ my $rate_limit = $obj->rate_limit_status();
+ if ( $rate_limit and $rate_limit->{remaining_hits} < 1 ) {
+ ¬ice("Rate limit exceeded for $username");
+ return undef;
+ }
+ };
print scalar localtime, " - Polling for updates for $username" if &debug;
my $tweets;
eval {
if ( $id_map{__last_id}{$username}{timeline} )
{
- $tweets = $obj->friends_timeline( { count => 100 } );
+ $tweets = $obj->home_timeline( { count => 100 } );
} else {
- $tweets = $obj->friends_timeline();
+ $tweets = $obj->home_timeline();
}
};
if ($@) {
- print $fh "type:debug Error during friends_timeline call: Aborted.\n";
+ print $fh "type:debug Error during home_timeline call: Aborted.\n";
print $fh "type:debug : $_\n" foreach split /\n/, Dumper($@);
return undef;
}
eval { $error = JSON::Any->jsonToObj( $obj->get_error() ) };
unless ($@) { $error = $obj->get_error() }
print $fh
- "type:debug API Error during friends_timeline call: Aborted\n";
+ "type:debug API Error during home_timeline call: Aborted\n";
print $fh "type:debug : $_\n" foreach split /\n/, Dumper($error);
} else {
print $fh
- "type:debug API Error during friends_timeline call. Aborted.\n";
+ "type:debug API Error during home_timeline call. Aborted.\n";
}
return undef;
}
foreach my $t ( reverse @$tweets ) {
- my $text = decode_entities( $t->{text} );
- $text =~ s/[\n\r]/ /g;
+ my $text = &get_text( $t, $obj );
my $reply = "tweet";
if ( Irssi::settings_get_bool("show_reply_context")
and $t->{in_reply_to_screen_name} ne $username
$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:$context->{id} account:%s nick:%s type:tweet %s\n",
- $username, $context->{user}{screen_name}, $ctext;
+ my $ctext = &get_text( $context, $obj );
+ printf $fh "id:%s account:%s nick:%s type:tweet %s\n",
+ $context->{id}, $username,
+ $context->{user}{screen_name}, $ctext;
$reply = "reply";
}
}
next
if $t->{user}{screen_name} eq $username
and not Irssi::settings_get_bool("show_own_tweets");
- if ( $t->{truncated} and ref($obj) ne 'Net::Identica' ) {
- $text .= " -- http://twitter.com/$t->{user}{screen_name}"
- . "/status/$t->{id}";
- }
- printf $fh "id:$t->{id} account:%s nick:%s type:%s %s\n",
- $username, $t->{user}{screen_name}, $reply, $text;
+ 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:$new_poll_id account:%s type:last_id timeline\n",
- $username;
+ printf $fh "id:%s account:%s type:last_id timeline\n",
+ $new_poll_id, $username;
print scalar localtime, " - Polling for replies since ",
$id_map{__last_id}{$username}{reply}
next
if exists $friends{ $t->{user}{screen_name} };
- my $text = decode_entities( $t->{text} );
- $text =~ s/[\n\r]/ /g;
- if ( $t->{truncated} ) {
- $text .= " -- http://twitter.com/$t->{user}{screen_name}"
- . "/status/$t->{id}";
- }
- printf $fh "id:$t->{id} account:%s nick:%s type:tweet %s\n",
- $username, $t->{user}{screen_name}, $text;
+ my $text = &get_text( $t, $obj );
+ 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:$new_poll_id account:%s type:last_id reply\n", $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 =~ s/[\n\r]/ /g;
- printf $fh "id:$t->{id} account:%s nick:%s type:dm %s\n",
- $username, $t->{sender_screen_name}, $text;
+ 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:$new_poll_id account:%s type:last_id dm\n", $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:$search->{max_id} account:%s type:searchid topic:%s\n",
- $username, $topic;
+ $topic =~ s/ /%20/g;
+ 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 =~ s/[\n\r]/ /g;
- printf $fh "id:$t->{id} account:%s nick:%s type:search topic:%s %s\n",
- $username, $t->{from_user}, $topic, $text;
+ my $text = &get_text( $t, $obj );
+ 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
or $t->{id} < $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 = &get_text( $t, $obj );
+ 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 = &get_text( $context, $obj );
+ printf $fh "id:%s account:%s nick:%s type:tweet %s\n",
+ $context->{id}, $username,
+ $context->{user}{screen_name}, $ctext;
+ $reply = "reply";
+ }
+ }
+ 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];
if &debug;
my ($new_last_poll);
+ # reap any random leftover processes - work around a bug in irssi on gentoo
+ waitpid( -1, WNOHANG );
+
# first time we run we don't want to print out *everything*, so we just
# pretend
if ( open FILE, $filename ) {
- binmode FILE, ":utf8";
+ binmode FILE, ":" . &get_charset;
my @lines;
my %new_cache;
while (<FILE>) {
my %meta;
foreach my $key (qw/id account nick type topic/) {
- if (s/^$key:(\S+)\s*//) {
+ if (s/^$key:((?:\S|\\ )+)\s*//) {
$meta{$key} = $1;
+ $meta{$key} =~ s/%20/ /g;
}
}
+ 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;
}
my $marker = "";
- if ( $meta{type} ne 'dm'
- and Irssi::settings_get_bool("twirssi_track_replies")
- and $meta{nick}
- and $meta{id} )
+ if ($meta{type} ne 'dm' and $meta{nick} and $meta{id} )
{
$marker = ( $id_map{__indexes}{ $meta{nick} } + 1 ) % 100;
$id_map{ lc $meta{nick} }[$marker] = $meta{id};
$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' ) {
# 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
+ waitpid( -1, WNOHANG );
+
# 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);
+ waitpid( -1, WNOHANG );
unlink $filename unless &debug;
return unless Irssi::settings_get_bool("twirssi_notify_timeouts");
}
if ( not $failwhale and time - $last_poll > 60 * 60 ) {
- foreach my $whale (
+ &ccrap(
q{ v v v},
q{ | | v | v},
q{ | .-, | | |},
q{ \\ a |},
q{ ',.__. ,__.-'/},
q{ '--/_.'----'`}
- )
- {
- &ccrap($whale);
- }
+ );
$failwhale = 1;
}
}
sub notice {
- $window->print( "%R***%n @_", MSGLEVEL_PUBLIC );
+ foreach my $msg (@_) {
+ $window->print( "%R***%n $msg", MSGLEVEL_PUBLIC );
+ }
}
sub ccrap {
- $window->print( "%R***%n @_", MSGLEVEL_CLIENTCRAP );
+ foreach my $msg (@_) {
+ $window->print( "%R***%n $msg", MSGLEVEL_CLIENTCRAP );
+ }
}
sub update_away {
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,
return 60;
}
+sub get_charset {
+ my $charset = Irssi::settings_get_str("twirssi_charset");
+ return "utf8" if $charset =~ /^\s*$/;
+ return $charset;
+}
+
sub hilight {
my $text = shift;
if ( Irssi::settings_get_str("twirssi_nick_color") ) {
my $c = Irssi::settings_get_str("twirssi_nick_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\cO/g if $c;
}
if ( Irssi::settings_get_str("twirssi_topic_color") ) {
my $c = Irssi::settings_get_str("twirssi_topic_color");
"Set short_url_args to username,API_key or change your",
"short_url_provider."
);
- return decode "utf8", $data;
+ return decode &get_charset, $data;
}
}
}
}
- return decode "utf8", $data;
+ return decode &get_charset, $data;
}
sub normalize_username {
return "$username\@$service";
}
+sub get_text {
+ my $tweet = shift;
+ my $object = shift;
+ my $text = decode_entities( $tweet->{text} );
+ if ( $tweet->{truncated} ) {
+ if ( exists $tweet->{retweeted_status} ) {
+ $text = "RT \@$tweet->{retweeted_status}{user}{screen_name}: "
+ . "$tweet->{retweeted_status}{text}";
+ } elsif ( $object->isa('Net::Twitter') ) {
+ $text .= " -- http://twitter.com/$tweet->{user}{screen_name}"
+ . "/status/$tweet->{id}";
+ }
+ }
+
+ $text =~ s/[\n\r]/ /g;
+
+ return $text;
+}
+
Irssi::signal_add( "send text", "event_send_text" );
Irssi::theme_register(
);
Irssi::settings_add_int( "twirssi", "twitter_poll_interval", 300 );
+Irssi::settings_add_str( "twirssi", "twirssi_charset", "utf8" );
Irssi::settings_add_str( "twirssi", "twitter_window", "twitter" );
Irssi::settings_add_str( "twirssi", "bitlbee_server", "bitlbee" );
Irssi::settings_add_str( "twirssi", "short_url_provider", "TinyURL" );
Irssi::settings_add_str( "twirssi", "twirssi_retweet_format",
'RT $n: "$t" ${-- $c$}' );
Irssi::settings_add_str( "twirssi", "twirssi_location",
- ".irssi/scripts/twirssi.pl" );
+ Irssi::get_irssi_dir . "/scripts/twirssi.pl" );
Irssi::settings_add_str( "twirssi", "twirssi_replies_store",
- ".irssi/scripts/twirssi.json" );
+ Irssi::get_irssi_dir . "/scripts/twirssi.json" );
+Irssi::settings_add_str( "twirssi", "twirssi_oauth_store",
+ Irssi::get_irssi_dir . "/scripts/twirssi.oauth" );
Irssi::settings_add_int( "twirssi", "twitter_friends_poll", 600 );
Irssi::settings_add_int( "twirssi", "twitter_timeout", 30 );
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_replies_autonick", 1 );
Irssi::settings_add_bool( "twirssi", "twirssi_use_reply_aliases", 0 );
Irssi::settings_add_bool( "twirssi", "twirssi_notify_timeouts", 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 );
+Irssi::settings_add_bool( "twirssi", "twirssi_use_oauth", 1 );
$last_poll = time - &get_poll_time;
$window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') );
Irssi::command_bind( "twitter_unsubscribe", "cmd_del_search" );
Irssi::command_bind( "twitter_list_subscriptions", "cmd_list_search" );
Irssi::command_bind( "twirssi_upgrade", "cmd_upgrade" );
+ Irssi::command_bind( "twirssi_oauth", "cmd_oauth" );
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" );
"twirssi_version",
sub {
¬ice(
- "Twirssi v$VERSION (r$REV); "
+ "Twirssi v$VERSION; "
. (
$Net::Twitter::VERSION
? "Net::Twitter v$Net::Twitter::VERSION. "
);
Irssi::signal_add_last( 'complete word' => \&sig_complete );
- ¬ice(" %Y<%C(%B^%C)%N TWIRSSI v%R$VERSION%N (r$REV)");
- ¬ice(" %C(_(\\%N http://twirssi.com/ for full docs");
- ¬ice(
- " %Y||%C `%N Log in with /twitter_login, send updates with /tweet");
+ ¬ice(" %Y<%C(%B^%C)%N TWIRSSI v%R$VERSION%N",
+ " %C(_(\\%N http://twirssi.com/ for full docs",
+ " %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 ) {
¬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: $!");
}
}
- if ( my $autouser = Irssi::settings_get_str("twitter_usernames")
- and my $autopass = Irssi::settings_get_str("twitter_passwords") )
- {
+ if ( my $autouser = Irssi::settings_get_str("twitter_usernames") ) {
&cmd_login();
&get_updates;
}
projects / twirssi-net-twitter-lite.git / blobdiff