use vars qw($VERSION %IRSSI);
-$VERSION = "1.5.2";
-my ($REV) = '$Rev: 326 $' =~ /(\d+)/;
+$VERSION = "1.6.1";
+my ($REV) = '$Rev: 335 $' =~ /(\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 ) = @_;
¬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;
+ }
+
+ unless (
+ $twits{$username}->update(
+ { status => $data, in_reply_to_status_id => $id_map{lc $nick}[$id] }
+ )
+ )
+ {
+ ¬ice("Update failed");
+ 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 gen_cmd {
my ( $usage_str, $api_name, $post_ref ) = @_;
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) {
+ 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;
- $friends = $twit->friends( page => $page );
}
+ 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 {
&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 $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;
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;
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 'debug' ) {
+ push @lines, "debug: $_\n" if &debug,;
}
- push @lines, $_ unless /^__friends__/;
}
%friends = ();
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_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",
sub {
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");
projects / twirssi-net-twitter-lite.git / blobdiff