use LWP::Simple;
use Data::Dumper;
use Encode;
+use POSIX qw/:sys_wait_h/;
$Data::Dumper::Indent = 1;
use vars qw($VERSION %IRSSI);
-$VERSION = "2.3.0beta";
-my ($REV) = '$Rev: 687 $' =~ /(\d+)/;
-%IRSSI = (
+$VERSION = "2.3.4beta";
+%IRSSI = (
authors => 'Dan Boger',
contact => 'zigdon@gmail.com',
name => 'twirssi',
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;
}
$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;
}
$defservice = $service = ucfirst lc $service;
- eval "use Net::$service";
+ eval "use Net::$service 3.05";
if ($@) {
¬ice(
"Failed to load Net::$service when trying to log in as $user: $@");
and $twit->can('ua') )
{
$twit->ua->timeout($timeout);
+ ¬ice("Twitter timeout set to $timeout");
}
unless ( $twit->verify_credentials() ) {
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;
}
};
$error++
unless &get_timeline( $fh, $frusers[ $fix_replies_index{$_} ],
- $_, $twits{$_}, \%context_cache );
+ $_, $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 "id:$fix_replies_index{$_} ",
+ "account:$_ type:fix_replies_index\n";
}
}
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}";
- }
+ 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;
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:%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};
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}";
- }
+ 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};
$search->{max_id}, $username, $topic;
foreach my $t ( reverse @{ $search->{results} } ) {
- my $text = decode_entities( $t->{text} );
- $text =~ s/[\n\r]/ /g;
+ 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}
sub get_timeline {
my ( $fh, $target, $username, $obj, $cache ) = @_;
- print $fh
-"type:debug get_timeline($fix_replies_index{$username}=$target) started. username = $username\n";
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,
- since_id => $id_map{__last_id}{$username}{$target}
+ id => $target,
+ ( $last_id ? ( since_id => $last_id ) : () ),
}
);
};
}
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}";
- }
+ 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";
}
}
- 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;
- $id_map{__last_id}{$username}{$target} = $t->{id} if
- $id_map{__last_id}{$username}{$target} < $t->{id};
+ $last_id = $t->{id} if $last_id < $t->{id};
}
- printf $fh "id:%s account:%s type:last_id_fixreplies %s\n",
- $id_map{__last_id}{$username}{$target},
- $username, $target;
+ printf $fh "id:%s account:%s type:last_id_fixreplies %s\n",
+ $last_id, $username, $target;
return 1;
}
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
# 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_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");
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(
"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(" %Y<%C(%B^%C)%N TWIRSSI v%R$VERSION%N");
¬ice(" %C(_(\\%N http://twirssi.com/ for full docs");
¬ice(
" %Y||%C `%N Log in with /twitter_login, send updates with /tweet");
projects / twirssi-net-twitter-lite.git / blobdiff