use vars qw($VERSION %IRSSI);
-$VERSION = "1.5";
-my ($REV) = '$Rev: 318 $' =~ /(\d+)/;
+$VERSION = "1.7";
+my ($REV) = '$Rev: 341 $' =~ /(\d+)/;
%IRSSI = (
authors => 'Dan Boger',
contact => 'zigdon@gmail.com',
my %friends;
my $last_poll = time - 300;
my %tweet_cache;
+my %id_map;
sub cmd_direct {
my ( $data, $server, $win ) = @_;
return;
}
- unless ( $twits{$username}
- ->new_direct_message( { user => $target, text => $text } ) )
- {
- ¬ice("DM to $target failed");
+ eval {
+ unless ( $twits{$username}
+ ->new_direct_message( { user => $target, text => $text } ) )
+ {
+ ¬ice("DM to $target failed");
+ return;
+ }
+ };
+
+ if ($@) {
+ ¬ice("DM caused an error. Aborted");
return;
}
return;
}
- unless ( $twits{$username}->update($data) ) {
- ¬ice("Update failed");
+ eval {
+ unless ( $twits{$username}->update($data) )
+ {
+ ¬ice("Update failed");
+ return;
+ }
+ };
+
+ if ($@) {
+ ¬ice("Update caused an error. Aborted.");
+ return;
+ }
+
+ foreach ( $data =~ /@([-\w]+)/ ) {
+ $nicks{$1} = time;
+ }
+
+ my $away = 0;
+ if ( Irssi::settings_get_bool("tweet_to_away")
+ and $data !~ /\@\w/
+ and $data !~ /^[dD] / )
+ {
+ my $server =
+ Irssi::server_find_tag( Irssi::settings_get_str("bitlbee_server") );
+ if ($server) {
+ $server->send_raw("away :$data");
+ $away = 1;
+ } else {
+ ¬ice( "Can't find bitlbee server.",
+ "Update bitlbee_server or disalbe tweet_to_away" );
+ }
+ }
+
+ ¬ice( "Update sent" . ( $away ? " (and away msg set)" : "" ) );
+}
+
+sub cmd_reply {
+ my ( $data, $server, $win ) = @_;
+
+ unless ($twit) {
+ ¬ice("Not logged in! Use /twitter_login username pass!");
+ return;
+ }
+
+ $data =~ s/^\s+|\s+$//;
+ unless ($data) {
+ ¬ice("Usage: /reply <nick[:num]> <update>");
+ return;
+ }
+
+ $data =~ s/^\s+|\s+$//;
+ my ( $id, $data ) = split ' ', $data, 2;
+ unless ( $id and $data ) {
+ ¬ice("Usage: /reply_as <nick[:num]> <update>");
+ return;
+ }
+
+ &cmd_reply_as( "$user $id $data", $server, $win );
+}
+
+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;
+ }
+
+ unless ($twit) {
+ ¬ice("Not logged in! Use /twitter_login username pass!");
+ return;
+ }
+
+ $data =~ s/^\s+|\s+$//;
+ my ( $username, $id, $data ) = split ' ', $data, 3;
+
+ unless ( $username and $data ) {
+ ¬ice("Usage: /reply_as <username> <nick[:num]> <update>");
+ return;
+ }
+
+ unless ( exists $twits{$username} ) {
+ ¬ice("Unknown username $username");
+ return;
+ }
+
+ my $nick;
+ $id =~ s/[^\w\d\-:]+//g;
+ ( $nick, $id ) = split /:/, $id;
+ unless ( exists $id_map{$nick} ) {
+ ¬ice("Can't find a tweet from $nick to reply to!");
+ 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 reply to!");
+ return;
+ }
+
+ # remove any @nick at the beginning of the reply, as we'll add it anyway
+ $data =~ s/^\s*\@?$nick\s*//;
+ $data = "\@$nick " . $data;
+
+ if ( Irssi::settings_get_str("short_url_provider") ) {
+ foreach my $url ( $data =~ /(https?:\/\/\S+[\w\/])/g ) {
+ eval {
+ my $short = makeashorterlink($url);
+ $data =~ s/\Q$url/$short/g;
+ };
+ }
+ }
+
+ if ( length $data > 140 ) {
+ ¬ice(
+ "Tweet too long (" . length($data) . " characters) - aborted" );
+ return;
+ }
+
+ eval {
+ unless (
+ $twits{$username}->update(
+ {
+ status => $data,
+ in_reply_to_status_id => $id_map{ lc $nick }[$id]
+ }
+ )
+ )
+ {
+ ¬ice("Update failed");
+ return;
+ }
+ };
+
+ if ($@) {
+ ¬ice("Update caused an error. Aborted");
return;
}
return;
}
- unless ( $twit->$api_name($data) ) {
- ¬ice("$api_name failed");
+ eval {
+ unless ( $twit->$api_name($data) )
+ {
+ ¬ice("$api_name failed");
+ return;
+ }
+ };
+
+ if ($@) {
+ ¬ice("$api_name caused an error. Aborted.");
return;
}
$p = shift @pass;
&cmd_login("$u $p");
}
+ return;
}
} else {
¬ice("/twitter_login requires either a username and password "
Irssi::timeout_remove($poll) if $poll;
$poll = Irssi::timeout_add( 300 * 1000, \&get_updates, "" );
¬ice("Logged in as $user, loading friends list...");
- &load_friends;
+ &load_friends();
¬ice( "loaded friends: ", scalar keys %friends );
if ( Irssi::settings_get_bool("twirssi_first_run") ) {
Irssi::settings_set_bool( "twirssi_first_run", 0 );
return;
}
- $md5 = get("http://irc.peeron.com/~zigdon/twirssi/md5sum");
+ $md5 = get("http://twirssi.com/md5sum");
chomp $md5;
$md5 =~ s/ .*//;
unless ($md5) {
}
}
- my $URL = "http://irc.peeron.com/~zigdon/twirssi/twirssi.pl";
+ my $URL = "http://twirssi.com/twirssi.pl";
¬ice("Downloading twirssi from $URL");
LWP::Simple::getstore( $URL, "$loc.upgrade" );
}
sub load_friends {
+ my $fh = shift;
my $page = 1;
my %new_friends;
- while (1) {
- my $friends = $twit->friends( { page => $page } );
- last unless $friends;
- $new_friends{ $_->{screen_name} } = time foreach @$friends;
- $page++;
- last if @$friends == 0 or $page == 10;
- $friends = $twit->friends( page => $page );
+ eval {
+ while (1)
+ {
+ print $fh "Loading friends page $page...\n" if ( $fh and &debug );
+ my $friends = $twit->friends( { page => $page } );
+ last unless $friends;
+ $new_friends{ $_->{screen_name} } = time foreach @$friends;
+ $page++;
+ last if @$friends == 0 or $page == 10;
+ }
+ };
+
+ if ($@) {
+ ¬ice("Error during friends list update. Aborted.");
+ return;
}
+ my ( $added, $removed ) = ( 0, 0 );
+ print $fh "Scanning for new friends...\n" if ( $fh and &debug );
foreach ( keys %new_friends ) {
next if exists $friends{$_};
$friends{$_} = time;
+ $added++;
}
+ print $fh "Scanning for removed friends...\n" if ( $fh and &debug );
foreach ( keys %friends ) {
- delete $friends{$_} unless exists $new_friends{$_};
+ next if exists $new_friends{$_};
+ delete $friends{$_};
+ $removed++;
}
+
+ return ( $added, $removed );
}
sub get_updates {
if ($pid) { # parent
Irssi::timeout_add_once( 5000, 'monitor_child', [$filename] );
+ Irssi::pidwait_add($pid);
} elsif ( defined $pid ) { # child
close STDIN;
close STDOUT;
&do_updates( $fh, $_, $twits{$_} );
}
+ my ( $added, $removed ) = &load_friends($fh);
+ if ( $added + $removed ) {
+ print $fh "%R***%n Friends list updated: ",
+ join( ", ",
+ sprintf( "%d added", $added ),
+ sprintf( "%d removed", $removed ) ),
+ "\n";
+ }
print $fh "__friends__\n";
- &load_friends;
foreach ( sort keys %friends ) {
print $fh "$_ $friends{$_}\n";
}
my ( $fh, $username, $obj ) = @_;
print scalar localtime, " - Polling for updates for $username" if &debug;
- my $tweets =
- $obj->friends_timeline( { since => HTTP::Date::time2str($last_poll) } )
- || [];
+ my $tweets;
+ eval {
+ $tweets = $obj->friends_timeline(
+ { since => HTTP::Date::time2str($last_poll) } )
+ || [];
+ };
+
+ if ($@) {
+ print $fh "type:error Error during friends_timeline call. Aborted.\n";
+ return;
+ }
+
foreach my $t ( reverse @$tweets ) {
my $text = decode_entities( $t->{text} );
$text =~ s/%/%%/g;
$text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
- my $prefix = "";
+ 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}
my $ctext = decode_entities( $context->{text} );
$ctext =~ s/%/%%/g;
$ctext =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
- printf $fh "id:%d [%s%%B\@%s%%n] %s\n",
- $context->{id},
- ( $username ne $user ? "$username: " : "" ),
+ printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
+ $context->{id}, $username,
$context->{user}{screen_name}, $ctext;
- $prefix = "\--> ";
+ $reply = "reply";
} else {
print "Failed to get context from $t->{in_reply_to_screen_name}"
if &debug;
next
if $t->{user}{screen_name} eq $username
and not Irssi::settings_get_bool("show_own_tweets");
- printf $fh "id:%d %s[%s%%B\@%s%%n] %s\n",
- $t->{id},
- $prefix,
- ( $username ne $user ? "$username: " : "" ),
- $t->{user}{screen_name},
- $text;
+ printf $fh "id:%d account:%s nick:%s type:%s %s\n",
+ $t->{id}, $username, $t->{user}{screen_name}, $reply, $text;
}
print scalar localtime, " - Polling for replies" if &debug;
- $tweets = $obj->replies( { since => HTTP::Date::time2str($last_poll) } )
- || [];
+ eval {
+ $tweets = $obj->replies( { since => HTTP::Date::time2str($last_poll) } )
+ || [];
+ };
+
+ if ($@) {
+ print $fh "type:error Error during replies call. Aborted.\n";
+ return;
+ }
+
foreach my $t ( reverse @$tweets ) {
next
if exists $friends{ $t->{user}{screen_name} };
my $text = decode_entities( $t->{text} );
$text =~ s/%/%%/g;
$text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
- printf $fh "id:%d [%s%%B\@%s%%n] %s\n",
- $t->{id},
- ( $username ne $user ? "$username: " : "" ),
- $t->{user}{screen_name},
- $text;
+ printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
+ $t->{id}, $username, $t->{user}{screen_name}, $text;
}
print scalar localtime, " - Polling for DMs" if &debug;
- $tweets =
- $obj->direct_messages( { since => HTTP::Date::time2str($last_poll) } )
- || [];
+ eval {
+ $tweets =
+ $obj->direct_messages( { since => HTTP::Date::time2str($last_poll) } )
+ || [];
+ };
+
+ if ($@) {
+ print $fh "type:error Error during direct_messages call. Aborted.\n";
+ return;
+ }
+
foreach my $t ( reverse @$tweets ) {
my $text = decode_entities( $t->{text} );
$text =~ s/%/%%/g;
$text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
- printf $fh "id:%d [%s%%B\@%s%%n (%%WDM%%n)] %s\n",
- $t->{id},
- ( $username ne $user ? "$username: " : "" ),
- $t->{sender_screen_name},
- $text;
+ printf $fh "id:%d account:%s nick:%s type:dm %s\n",
+ $t->{id}, $username, $t->{sender_screen_name}, $text;
}
print scalar localtime, " - Done" if &debug;
}
while (<FILE>) {
chomp;
last if /^__friends__/;
- if (s/^id:(\d+) //) {
- next if exists $tweet_cache{$1};
- $tweet_cache{$1} = time;
+ my %meta;
+ foreach my $key (qw/id account nick type/) {
+ s/^$key:(\S+)\s*//;
+ $meta{$key} = $1;
+ }
+
+ next if exists $tweet_cache{ $meta{id} };
+ $tweet_cache{ $meta{id} } = time;
+ my $account = "";
+ if ( $meta{account} ne $user ) {
+ $account = "$meta{account}: ";
+ }
+
+ my $marker = "";
+ if ( $meta{type} ne 'dm'
+ and Irssi::settings_get_bool("twirssi_track_replies")
+ and $meta{nick}
+ 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";
+ }
+
+ if ( $meta{type} eq 'tweet' ) {
+ push @lines, "[$account%B\@$meta{nick}%n$marker] $_\n",;
+ } elsif ( $meta{type} eq 'reply' ) {
+ push @lines, "[$account\\--> %B\@$meta{nick}%n$marker] $_\n",;
+ } elsif ( $meta{type} eq 'dm' ) {
+ push @lines, "[$account%B\@$meta{nick}%n (%WDM%n)] $_\n",;
+ } elsif ( $meta{type} eq 'error' ) {
+ push @lines, "debug: $_\n" if &debug,;
+ } elsif ( $meta{type} eq 'debug' ) {
+ push @lines, "debug: $_\n" if &debug,;
}
- push @lines, $_ unless /^__friends__/;
}
%friends = ();
or warn "Failed to remove $filename: $!"
unless &debug;
- # keep 10 minutes of cached tweets, to make sure we don't show duplicates.
+ # keep enough cached tweets, to make sure we don't show duplicates.
foreach ( keys %tweet_cache ) {
- next if $tweet_cache{$_} > time - 600;
+ next if $tweet_cache{$_} >= $old_last_poll;
delete $tweet_cache{$_};
}
+
+ # 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: $!");
+ }
+ }
return;
}
}
sub sig_complete {
my ( $complist, $window, $word, $linestart, $want_space ) = @_;
- return unless $linestart =~ /^\/(?:tweet|dm)/;
- return if $linestart eq '/tweet' and $word !~ s/^@//;
- push @$complist, grep /^\Q$word/i,
- sort { $nicks{$b} <=> $nicks{$a} } keys %nicks;
- @$complist = map { "\@$_" } @$complist if $linestart eq '/tweet';
+ if (
+ $linestart =~ /^\/twitter_reply(?:_as)?\s*$/
+ or ( Irssi::settings_get_bool("twirssi_use_reply_aliases")
+ and $linestart =~ /^\/reply(?:_as)?\s*$/ )
+ )
+ { # /twitter_reply gets a nick:num
+ @$complist = grep /^\Q$word/i, sort keys %{ $id_map{__indexes} };
+ }
+
+ # /tweet, /tweet_as, /dm, /dm_as - complete @nicks (and nicks as the first
+ # arg to dm)
+ if ( $linestart =~ /^\/(?:tweet|dm)/ ) {
+ my $prefix = $word =~ s/^@//;
+ $prefix = 0 if $linestart eq '/dm' or $linestart eq '/dm_as';
+ push @$complist, grep /^\Q$word/i,
+ sort { $nicks{$b} <=> $nicks{$a} } keys %nicks;
+ @$complist = map { "\@$_" } @$complist if $prefix;
+ }
}
Irssi::settings_add_str( "twirssi", "twitter_window", "twitter" );
".irssi/scripts/twirssi.pl" );
Irssi::settings_add_str( "twirssi", "twitter_usernames", undef );
Irssi::settings_add_str( "twirssi", "twitter_passwords", undef );
-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 );
-Irssi::settings_add_bool( "twirssi", "twirssi_debug", 0 );
-Irssi::settings_add_bool( "twirssi", "twirssi_first_run", 1 );
+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 );
+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_use_reply_aliases", 0 );
$window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') );
if ($window) {
- Irssi::command_bind( "dm", "cmd_direct" );
- Irssi::command_bind( "tweet", "cmd_tweet" );
- Irssi::command_bind( "dm_as", "cmd_direct_as" );
- Irssi::command_bind( "tweet_as", "cmd_tweet_as" );
- Irssi::command_bind( "twitter_login", "cmd_login" );
- Irssi::command_bind( "twitter_logout", "cmd_logout" );
- Irssi::command_bind( "twitter_switch", "cmd_switch" );
- Irssi::command_bind( "twirssi_upgrade", "cmd_upgrade" );
+ Irssi::command_bind( "dm", "cmd_direct" );
+ 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( "twitter_reply", "cmd_reply" );
+ Irssi::command_bind( "twitter_reply_as", "cmd_reply_as" );
+ Irssi::command_bind( "twitter_login", "cmd_login" );
+ Irssi::command_bind( "twitter_logout", "cmd_logout" );
+ Irssi::command_bind( "twitter_switch", "cmd_switch" );
+ Irssi::command_bind( "twirssi_upgrade", "cmd_upgrade" );
+ if ( Irssi::settings_get_bool("twirssi_use_reply_aliases") ) {
+ Irssi::command_bind( "reply", "cmd_reply" );
+ Irssi::command_bind( "reply_as", "cmd_reply_as" );
+ }
Irssi::command_bind(
- "twitter_dump",
+ "twirssi_dump",
sub {
- print "twits: ", Dumper \%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 "last poll: $last_poll";
}
);
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://tinyurl.com/twirssi for full docs");
+ ¬ice(" %C(_(\\%N http://twirssi.com/ for full docs");
¬ice(
" %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 = <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") ) {
eval "use WWW::Shorten::$provider;";
projects / twirssi-net-twitter-lite.git / blobdiff