use vars qw($VERSION %IRSSI);
-$VERSION = "2.2.1beta";
-my ($REV) = '$Rev: 569 $' =~ /(\d+)/;
+$VERSION = "2.2.3beta";
+my ($REV) = '$Rev: 616 $' =~ /(\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-03-19 11:44:03 -0700 (Thu, 19 Mar 2009) $',
+ changed => '$Date: 2009-04-21 12:20:40 -0700 (Tue, 21 Apr 2009) $',
);
my $window;
my $defservice;
my $poll;
my $last_poll;
+my $last_friends_poll = time;
my %nicks;
my %friends;
my %tweet_cache;
}
}
+sub cmd_retweet {
+ my ( $data, $server, $win ) = @_;
+
+ return unless &logged_in($twit);
+
+ $data =~ s/^\s+|\s+$//;
+ unless ($data) {
+ ¬ice("Usage: /retweet <nick[:num]> [comment]");
+ return;
+ }
+
+ my ( $id, $data ) = split ' ', $data, 2;
+
+ &cmd_retweet_as( "$user $id $data", $server, $win );
+}
+
+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+$//;
+ my ( $username, $id, $data ) = split ' ', $data, 3;
+
+ unless ($username) {
+ ¬ice("Usage: /retweet_as <username> <nick[:num]> [comment]");
+ return;
+ }
+
+ return unless $username = &valid_username($username);
+
+ my $nick;
+ $id =~ s/[^\w\d\-:]+//g;
+ ( $nick, $id ) = split /:/, $id;
+ unless ( exists $id_map{ lc $nick } ) {
+ ¬ice("Can't find a tweet from $nick to retweet!");
+ return;
+ }
+
+ $id = $id_map{__indexes}{$nick} unless $id;
+ unless ( $id_map{ lc $nick }[$id] ) {
+ ¬ice("Can't find a tweet numbered $id from $nick to retweet!");
+ return;
+ }
+
+ unless ( $id_map{__tweets}{ lc $nick }[$id] ) {
+ ¬ice("The text of this tweet isn't saved, sorry!");
+ return;
+ }
+
+# Irssi::settings_add_str( "twirssi", "twirssi_retweet_format", 'RT $n: $t ${-- $c$}' );
+ my $text = Irssi::settings_get_str("twirssi_retweet_format");
+ $text =~ s/\$n/\@$nick/g;
+ if ($data) {
+ $text =~ s/\${|\$}//g;
+ $text =~ s/\$c/$data/;
+ } else {
+ $text =~ s/\${.*?\$}//;
+ }
+ $text =~ s/\$t/$id_map{__tweets}{ lc $nick }[$id]/;
+
+ $data = &shorten($text);
+
+ return if &too_long($data);
+
+ my $success = 1;
+ eval {
+ unless (
+ $twits{$username}->update(
+ {
+ status => $data,
+ in_reply_to_status_id => $id_map{ lc $nick }[$id]
+ }
+ )
+ )
+ {
+ ¬ice("Update failed");
+ $success = 0;
+ }
+ };
+ return unless $success;
+
+ if ($@) {
+ ¬ice("Update caused an error: $@. Aborted");
+ return;
+ }
+
+ foreach ( $data =~ /@([-\w]+)/ ) {
+ $nicks{$1} = time;
+ }
+
+ ¬ice("Retweet sent");
+}
+
sub cmd_tweet {
my ( $data, $server, $win ) = @_;
return;
}
- $data =~ s/^\s+|\s+$//;
my ( $id, $data ) = split ' ', $data, 2;
unless ( $id and $data ) {
- ¬ice("Usage: /reply_as <nick[:num]> <update>");
+ ¬ice("Usage: /reply <nick[:num]> <update>");
return;
}
return;
}
- if ( exists $id_map{__searches}{$user}{$data} ) {
+ if ( exists $id_map{__searches}{"$user\@$defservice"}{$data} ) {
¬ice("Already had a subscription for '$data'");
return;
}
- $id_map{__searches}{$user}{$data} = 1;
+ $id_map{__searches}{"$user\@$defservice"}{$data} = 1;
¬ice("Added subscription for '$data'");
}
return;
}
- unless ( exists $id_map{__searches}{$user}{$data} ) {
+ unless ( exists $id_map{__searches}{"$user\@$defservice"}{$data} ) {
¬ice("No subscription found for '$data'");
return;
}
- delete $id_map{__searches}{$user}{$data};
+ delete $id_map{__searches}{"$user\@$defservice"}{$data};
¬ice("Removed subscription for '$data'");
}
my $new_poll = time;
my $error = 0;
+ my %context_cache;
foreach ( keys %twits ) {
- $error += &do_updates( $fh, $_, $twits{$_} );
+ $error++ unless &do_updates( $fh, $_, $twits{$_}, \%context_cache );
}
- my ( $added, $removed ) = &load_friends($fh);
- if ( $added + $removed ) {
- print $fh "type:debug %R***%n Friends list updated: ",
- join( ", ",
- sprintf( "%d added", $added ),
- sprintf( "%d removed", $removed ) ),
- "\n";
+ if (
+ time - $last_friends_poll >
+ Irssi::settings_get_int('twitter_friends_poll') )
+ {
+ my ( $added, $removed ) = &load_friends($fh);
+ if ( $added + $removed ) {
+ print $fh "type:debug %R***%n Friends list updated: ",
+ join( ", ",
+ sprintf( "%d added", $added ),
+ sprintf( "%d removed", $removed ) ),
+ "\n";
+ }
+
+ $last_friends_poll = time;
}
+
print $fh "__friends__\n";
foreach ( sort keys %friends ) {
print $fh "$_ $friends{$_}\n";
if ($error) {
print $fh "type:debug Update encountered errors. Aborted\n";
- print $fh $last_poll;
+ print $fh "-- $last_poll";
} else {
- print $fh $new_poll;
+ print $fh "-- $new_poll";
}
close $fh;
exit;
}
sub do_updates {
- my ( $fh, $username, $obj ) = @_;
+ 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 1;
+ return undef;
}
print scalar localtime, " - Polling for updates for $username" if &debug;
my $tweets;
- eval { $tweets = $obj->friends_timeline(); };
+ my $new_poll_id = 0;
+ eval {
+ if ( $id_map{__last_id}{$username}{timeline} )
+ {
+ $tweets = $obj->friends_timeline( { count => 100 } );
+ } else {
+ $tweets = $obj->friends_timeline();
+ }
+ };
if ($@) {
- print $fh
- "type:debug Error during friends_timeline call: $@. Aborted.\n";
- return 1;
+ print $fh "type:debug Error during friends_timeline call: Aborted.\n";
+ print $fh "type:debug : $_\n" foreach split /\n/, Dumper($@);
+ return undef;
}
unless ( ref $tweets ) {
if ( $obj->can("get_error") ) {
- my $error;
+ my $error = "Unknown error";
eval { $error = JSON::Any->jsonToObj( $obj->get_error() ) };
- if ($@) { $error = $obj->get_error() }
- print $fh "type:debug API Error during friends_timeline call: ",
- "$error Aborted.\n";
+ unless ($@) { $error = $obj->get_error() }
+ print $fh
+ "type:debug API Error during friends_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";
}
- return 1;
+ return undef;
}
foreach my $t ( reverse @$tweets ) {
{
$nicks{ $t->{in_reply_to_screen_name} } = time;
my $context;
- eval {
- $context = $obj->show_status( $t->{in_reply_to_status_id} );
- };
+ 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} );
$context->{id}, $username,
$context->{user}{screen_name}, $ctext;
$reply = "reply";
- } elsif ($@) {
- print $fh "type:debug request to get context failed: $@";
- } else {
- print $fh
-"type:debug Failed to get context from $t->{in_reply_to_screen_name}\n"
- if &debug;
}
}
next
}
printf $fh "id:%d 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",
+ $new_poll_id, $username;
print scalar localtime, " - Polling for replies" if &debug;
+ $new_poll_id = 0;
eval {
- $tweets = $obj->replies( { since => HTTP::Date::time2str($last_poll) } )
- || [];
+ if ( $id_map{__last_id}{$username}{reply} )
+ {
+ $tweets = $obj->replies(
+ { since_id => $id_map{__last_id}{$username}{reply} } )
+ || [];
+ } else {
+ $tweets = $obj->replies() || [];
+ }
};
if ($@) {
print $fh "type:debug Error during replies call. Aborted.\n";
- return 1;
+ return undef;
}
foreach my $t ( reverse @$tweets ) {
}
printf $fh "id:%d 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;
print scalar localtime, " - Polling for DMs" if &debug;
+ $new_poll_id = 0;
eval {
- $tweets =
- $obj->direct_messages( { since => HTTP::Date::time2str($last_poll) } )
- || [];
+ if ( $id_map{__last_id}{$username}{dm} )
+ {
+ $tweets = $obj->direct_messages(
+ { since_id => $id_map{__last_id}{$username}{dm} } )
+ || [];
+ } else {
+ $tweets = $obj->direct_messages() || [];
+ }
};
if ($@) {
print $fh "type:debug Error during direct_messages call. Aborted.\n";
- return 1;
+ return undef;
}
foreach my $t ( reverse @$tweets ) {
$text = &hilight($text);
printf $fh "id:%d 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;
print scalar localtime, " - Polling for subscriptions" if &debug;
if ( $obj->can('search') and $id_map{__searches}{$username} ) {
if ($@) {
print $fh
"type:debug Error during search($topic) call. Aborted.\n";
- return 1;
+ return undef;
}
unless ( $search->{max_id} ) {
- print $fh
-"type:debug Invalid search results when searching for $topic.",
- " Aborted.\n";
- return 1;
+ print $fh "type:debug Invalid search results when searching",
+ " for $topic. Aborted.\n";
+ return undef;
}
$id_map{__searches}{$username}{$topic} = $search->{max_id};
$text = &hilight($text);
printf $fh "id:%d 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;
}
}
}
print scalar localtime, " - Done" if &debug;
- return 0;
+ return 1;
}
sub monitor_child {
print scalar localtime, " - checking child log at $filename ($attempt)"
if &debug;
- my $new_last_poll;
+ my ($new_last_poll);
# first time we run we don't want to print out *everything*, so we just
# pretend
last if /^__friends__/;
my $hilight = 0;
my %meta;
+
foreach my $key (qw/id account nick type topic/) {
if (s/^$key:(\S+)\s*//) {
$meta{$key} = $1;
}
}
- if ( not $meta{type} or $meta{type} ne 'searchid' ) {
+ if ( not $meta{type} or $meta{type} !~ /searchid|last_id/ ) {
if ( exists $meta{id} and exists $new_cache{ $meta{id} } ) {
next;
}
}
my $account = "";
- if ( lc $meta{account} ne lc "$user\@$defservice" ) {
- $meta{account} =~ s/\@(\w+)$//;
- my $service = $1;
- if (
- lc $service eq
- lc Irssi::settings_get_str("twirssi_default_service") )
- {
- $account = "$meta{account}: ";
- } else {
- $account = "$meta{account}\@$service: ";
- }
+ $meta{account} =~ s/\@(\w+)$//;
+ $meta{service} = $1;
+ if (
+ lc $meta{service} eq
+ lc Irssi::settings_get_str("twirssi_default_service") )
+ {
+ $account = "$meta{account}: "
+ if lc "$meta{account}\@$meta{service}" ne lc
+ "$user\@$defservice";
+ } else {
+ $account = "$meta{account}\@$meta{service}: ";
}
my $marker = "";
and $meta{id} )
{
$marker = ( $id_map{__indexes}{ $meta{nick} } + 1 ) % 100;
- $id_map{ lc $meta{nick} }[$marker] = $meta{id};
- $id_map{__indexes}{ $meta{nick} } = $marker;
- $marker = ":$marker";
+ $id_map{ lc $meta{nick} }[$marker] = $meta{id};
+ $id_map{__indexes}{ $meta{nick} } = $marker;
+ $id_map{__tweets}{ lc $meta{nick} }[$marker] = $_;
+ $marker = ":$marker";
}
my $hilight_color =
} elsif (&debug) {
print "Search '$meta{topic}' returned invalid id $meta{id}";
}
+ } elsif ( $meta{type} eq 'last_id' ) {
+ $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' ) {
%friends = ();
while (<FILE>) {
- if (/^\d+$/) {
- $new_last_poll = $_;
+ if (/^-- (\d+)$/) {
+ ($new_last_poll) = ($1);
last;
}
my ( $f, $t ) = split ' ', $_;
}
if ($new_last_poll) {
- print "new last_poll = $new_last_poll" if &debug;
+ print "new last_poll = $new_last_poll" if &debug;
+ print "new last_poll_id = ", Dumper( $id_map{__last_id} ) if &debug;
if ($suppress) {
print "First call, not printing updates" if &debug;
} else {
my ( $complist, $window, $word, $linestart, $want_space ) = @_;
if (
- $linestart =~ /^\/twitter_reply(?:_as)?\s*$/
+ $linestart =~ /^\/(?:retweet|twitter_reply)(?:_as)?\s*$/
or ( Irssi::settings_get_bool("twirssi_use_reply_aliases")
and $linestart =~ /^\/reply(?:_as)?\s*$/ )
)
keys %{ $id_map{__indexes} };
}
+ if ( $linestart =~ /^\/twitter_unfriend\s*$/ )
+ { # /twitter_unfriend gets a nick
+ $word =~ s/^@//;
+ push @$complist, grep /^\Q$word/i,
+ sort { $nicks{$b} <=> $nicks{$a} } keys %nicks;
+ }
+
# /tweet, /tweet_as, /dm, /dm_as - complete @nicks (and nicks as the first
# arg to dm)
if ( $linestart =~ /^\/(?:tweet|dm)/ ) {
Irssi::settings_add_str( "twirssi", "twirssi_default_service", "Twitter" );
Irssi::settings_add_str( "twirssi", "twirssi_nick_color", "%B" );
Irssi::settings_add_str( "twirssi", "twirssi_topic_color", "%r" );
+Irssi::settings_add_str( "twirssi", "twirssi_retweet_format",
+ 'RT $n: "$t" ${-- $c$}' );
Irssi::settings_add_str( "twirssi", "twirssi_location",
".irssi/scripts/twirssi.pl" );
Irssi::settings_add_str( "twirssi", "twirssi_replies_store",
".irssi/scripts/twirssi.json" );
+
+Irssi::settings_add_int( "twirssi", "twitter_friends_poll", 600 );
+
Irssi::settings_add_bool( "twirssi", "twirssi_upgrade_beta", 0 );
Irssi::settings_add_bool( "twirssi", "tweet_to_away", 0 );
Irssi::settings_add_bool( "twirssi", "show_reply_context", 0 );
Irssi::command_bind( "dm_as", "cmd_direct_as" );
Irssi::command_bind( "tweet", "cmd_tweet" );
Irssi::command_bind( "tweet_as", "cmd_tweet_as" );
+ Irssi::command_bind( "retweet", "cmd_retweet" );
+ Irssi::command_bind( "retweet_as", "cmd_retweet_as" );
Irssi::command_bind( "twitter_reply", "cmd_reply" );
Irssi::command_bind( "twitter_reply_as", "cmd_reply_as" );
Irssi::command_bind( "twitter_login", "cmd_login" );
projects / twirssi-net-twitter-lite.git / blobdiff