use File::Temp;
use LWP::Simple;
use Data::Dumper;
-use Net::Twitter;
$Data::Dumper::Indent = 1;
use vars qw($VERSION %IRSSI);
-$VERSION = "2.1.1beta";
-my ($REV) = '$Rev: 493 $' =~ /(\d+)/;
+$VERSION = "2.2.1beta";
+my ($REV) = '$Rev: 597 $' =~ /(\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-02-25 14:44:03 -0800 (Wed, 25 Feb 2009) $',
+ changed => '$Date: 2009-04-05 19:22:22 -0700 (Sun, 05 Apr 2009) $',
);
my $window;
my $twit;
my %twits;
my $user;
+my $defservice;
my $poll;
my $last_poll;
my %nicks;
return;
}
- return unless &valid_username($username);
+ return unless $username = &valid_username($username);
eval {
if ( $twits{$username}
}
}
+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;
}
- &cmd_tweet_as( "$user $data", $server, $win );
+ &cmd_tweet_as( "$user\@$defservice $data", $server, $win );
}
sub cmd_tweet_as {
return;
}
- return unless &valid_username($username);
+ return unless $username = &valid_username($username);
- if ( &too_long( $data, 1 )
- and 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;
- };
- }
- }
+ $data = &shorten($data);
return if &too_long($data);
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;
}
- return unless &valid_username($username);
+ return unless $username = &valid_username($username);
my $nick;
$id =~ s/[^\w\d\-:]+//g;
$data = "\@$nick " . $data;
}
- if ( &too_long( $data, 1 ) ) {
- 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;
- };
- }
- }
- }
+ $data = &shorten($data);
return if &too_long($data);
my ( $data, $server, $win ) = @_;
$data =~ s/^\s+|\s+$//g;
+ $data = &normalize_username($data);
if ( exists $twits{$data} ) {
¬ice("Switching to $data");
$twit = $twits{$data};
- $user = $data;
+ if ( $data =~ /(.*)\@(.*)/ ) {
+ $user = $1;
+ $defservice = $2;
+ } else {
+ ¬ice("Couldn't figure out what service '$data' is on");
+ }
} else {
¬ice("Unknown user $data");
}
$data =~ s/^\s+|\s+$//g;
$data = $user unless $data;
- return unless &valid_username($data);
+ return unless $data = &valid_username($data);
¬ice("Logging out $data...");
$twits{$data}->end_session();
{
my @user = split /\s*,\s*/, $autouser;
my @pass = split /\s*,\s*/, $autopass;
- if ( @user != @pass ) {
+
+ # if a password ends with a '\', it was meant to escape the comma, and
+ # it should be concatinated with the next one
+ my @unescaped;
+ while (@pass) {
+ my $p = shift @pass;
+ while ( $p =~ /\\$/ and @pass ) {
+ $p .= "," . shift @pass;
+ }
+ push @unescaped, $p;
+ }
+
+ if ( @user != @unescaped ) {
¬ice("Number of usernames doesn't match "
. "the number of passwords - auto-login failed" );
} else {
my ( $u, $p );
- while ( @user and @pass ) {
+ while ( @user and @unescaped ) {
$u = shift @user;
- $p = shift @pass;
+ $p = shift @unescaped;
&cmd_login("$u $p");
}
return;
%friends = %nicks = ();
- $twit = Net::Twitter->new(
+ my $service;
+ if ( $user =~ /^(.*)@(twitter|identica)$/ ) {
+ ( $user, $service ) = ( $1, $2 );
+ } else {
+ $service = Irssi::settings_get_str("twirssi_default_service");
+ }
+ $defservice = $service = ucfirst lc $service;
+
+ eval "use Net::$service";
+ if ($@) {
+ ¬ice(
+ "Failed to load Net::$service when trying to log in as $user: $@");
+ return;
+ }
+
+ $twit = "Net::$service"->new(
username => $user,
password => $pass,
source => "twirssi"
);
unless ( $twit->verify_credentials() ) {
- ¬ice("Login as $user failed");
+ ¬ice("Login as $user\@$service failed");
$twit = undef;
if ( keys %twits ) {
&cmd_switch( ( keys %twits )[0], $server, $win );
return;
}
- $twits{$user} = $twit;
+ $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, loading friends list...");
+ ¬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") ) {
my $new_poll = time;
my $error = 0;
- $error += &do_updates( $fh, $user, $twit );
foreach ( keys %twits ) {
- next if $_ eq $user;
$error += &do_updates( $fh, $_, $twits{$_} );
}
if ($context) {
my $ctext = decode_entities( $context->{text} );
$ctext = &hilight($ctext);
+ if ( $context->{truncated} and ref($obj) ne 'Net::Identica' ) {
+ $ctext .=
+ " -- http://twitter.com/$context->{user}{screen_name}"
+ . "/status/$context->{id}";
+ }
printf $fh "id:%d 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:%d account:%s nick:%s type:%s %s\n",
$t->{id}, $username, $t->{user}{screen_name}, $reply, $text;
}
my $text = decode_entities( $t->{text} );
$text = &hilight($text);
+ if ( $t->{truncated} ) {
+ $text .= " -- http://twitter.com/$t->{user}{screen_name}"
+ . "/status/$t->{id}";
+ }
printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
$t->{id}, $username, $t->{user}{screen_name}, $text;
}
}
my $account = "";
- if ( $meta{account} ne $user ) {
- $account = "$meta{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: ";
+ }
}
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 =
$irssi_to_mirc_colors{ Irssi::settings_get_str("hilight_color") };
- if ( ( $_ =~ /\@$meta{account}\W/i )
- && Irssi::settings_get_bool("twirssi_hilights") )
+ my $nick =
+ '@' . substr( $meta{account}, 0, index( $meta{account}, "@" ) );
+ if ( $_ =~ /\Q$nick\E(?:\W|$)/i
+ and Irssi::settings_get_bool("twirssi_hilights") )
{
$meta{nick} = "\cC$hilight_color$meta{nick}\cO";
$hilight = MSGLEVEL_HILIGHT;
print JSON JSON::Any->objToJson( \%id_map );
close JSON;
} else {
- ¬ice("Failed to write replies to $file: $!");
+ &ccrap("Failed to write replies to $file: $!");
}
}
$failwhale = 0;
q{ '--/_.'----'`}
)
{
- ¬ice($whale);
+ &ccrap($whale);
}
$failwhale = 1;
}
- ¬ice("Haven't been able to get updated tweets since $since");
+ &ccrap("Haven't been able to get updated tweets since $since");
}
}
$window->print( "%R***%n @_", MSGLEVEL_PUBLIC );
}
+sub ccrap {
+ $window->print( "%R***%n @_", MSGLEVEL_CLIENTCRAP );
+}
+
sub update_away {
my $data = shift;
$server->send_raw("away :$data");
return 1;
} else {
- ¬ice( "Can't find bitlbee server.",
+ &ccrap( "Can't find bitlbee server.",
"Update bitlbee_server or disable tweet_to_away" );
return 0;
}
sub valid_username {
my $username = shift;
+ $username = &normalize_username($username);
+
unless ( exists $twits{$username} ) {
¬ice("Unknown username $username");
- return 0;
+ return undef;
}
- return 1;
+ return $username;
}
sub logged_in {
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*$/ )
)
{ # /twitter_reply gets a nick:num
$word =~ s/^@//;
- @$complist = map { "$_:$id_map{__indexes}{$_}" } grep /^\Q$word/i,
- sort keys %{ $id_map{__indexes} };
+ @$complist = map { "$_:$id_map{__indexes}{$_}" }
+ sort { $nicks{$b} <=> $nicks{$a} }
+ grep /^\Q$word/i,
+ keys %{ $id_map{__indexes} };
}
# /tweet, /tweet_as, /dm, /dm_as - complete @nicks (and nicks as the first
return $text;
}
+sub shorten {
+ my $data = shift;
+
+ my $provider = Irssi::settings_get_str("short_url_provider");
+ if (
+ (
+ Irssi::settings_get_bool("twirssi_always_shorten")
+ or &too_long( $data, 1 )
+ )
+ and $provider
+ )
+ {
+ my @args;
+ if ( $provider eq 'Bitly' ) {
+ @args[ 1, 2 ] = split ',',
+ Irssi::settings_get_str("short_url_args"), 2;
+ unless ( @args == 3 ) {
+ &ccrap(
+ "WWW::Shorten::Bitly requires a username and API key.",
+ "Set short_url_args to username,API_key or change your",
+ "short_url_provider."
+ );
+ return $data;
+ }
+ }
+
+ foreach my $url ( $data =~ /(https?:\/\/\S+[\w\/])/g ) {
+ eval {
+ $args[0] = $url;
+ my $short = makeashorterlink(@args);
+ if ($short) {
+ $data =~ s/\Q$url/$short/g;
+ } else {
+ ¬ice("Failed to shorten $url!");
+ }
+ };
+ }
+ }
+
+ return $data;
+}
+
+sub normalize_username {
+ my $user = shift;
+
+ my ( $username, $service ) = split /\@/, $user, 2;
+ if ($service) {
+ $service = ucfirst lc $service;
+ } else {
+ $service =
+ ucfirst lc Irssi::settings_get_str("twirssi_default_service");
+ unless ( exists $twits{"$username\@$service"} ) {
+ $service = undef;
+ foreach my $t ( sort keys %twits ) {
+ next unless $t =~ /^\Q$username\E\@(Twitter|Identica)/;
+ $service = $1;
+ last;
+ }
+
+ unless ($service) {
+ ¬ice("Can't find a logged in user '$user'");
+ }
+ }
+ }
+
+ return "$username\@$service";
+}
+
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", "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", "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", "short_url_args", undef );
+Irssi::settings_add_str( "twirssi", "twitter_usernames", undef );
+Irssi::settings_add_str( "twirssi", "twitter_passwords", undef );
+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", "twitter_usernames", undef );
-Irssi::settings_add_str( "twirssi", "twitter_passwords", undef );
Irssi::settings_add_str( "twirssi", "twirssi_replies_store",
".irssi/scripts/twirssi.json" );
-Irssi::settings_add_str( "twirssi", "twirssi_nick_color", "%B" );
-Irssi::settings_add_str( "twirssi", "twirssi_topic_color", "%r" );
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::settings_add_bool( "twirssi", "twirssi_use_reply_aliases", 0 );
Irssi::settings_add_bool( "twirssi", "twirssi_notify_timeouts", 1 );
Irssi::settings_add_bool( "twirssi", "twirssi_hilights", 1 );
+Irssi::settings_add_bool( "twirssi", "twirssi_always_shorten", 0 );
Irssi::settings_add_bool( "twirssi", "tweet_window_input", 0 );
$last_poll = time - &get_poll_time;
$window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') );
if ( !$window ) {
+ Irssi::active_win()
+ ->print( "Couldn't find a window named '"
+ . Irssi::settings_get_str('twitter_window')
+ . "', trying to create it." );
$window =
Irssi::Windowitem::window_create(
Irssi::settings_get_str('twitter_window'), 1 );
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" );
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( "twitter_updates", "get_updates" );
if ( Irssi::settings_get_bool("twirssi_use_reply_aliases") ) {
Irssi::command_bind( "reply", "cmd_reply" );
Irssi::command_bind( "reply_as", "cmd_reply_as" );
"twirssi_dump",
sub {
print "twits: ", join ", ",
- map { "u: $_->{username}" } values %twits;
+ map { "u: $_->{username}\@" . ref($_) } values %twits;
+ print "selected: $user\@$defservice";
print "friends: ", join ", ", sort keys %friends;
print "nicks: ", join ", ", sort keys %nicks;
print "searches: ", Dumper \%{ $id_map{__searches} };
sub { ¬ice("Stopped following $_[0]"); delete $nicks{ $_[0] }; }
)
);
- Irssi::command_bind( "twitter_updates", "get_updates" );
+ Irssi::command_bind(
+ "twitter_device_updates",
+ &gen_cmd(
+ "/twitter_device_updates none|im|sms",
+ "update_delivery_device",
+ sub { ¬ice("Device updated to $_[0]"); }
+ )
+ );
Irssi::signal_add_last( 'complete word' => \&sig_complete );
¬ice(" %Y<%C(%B^%C)%N TWIRSSI v%R$VERSION%N (r$REV)");
}
if ( my $provider = Irssi::settings_get_str("short_url_provider") ) {
+ ¬ice("Loading WWW::Shorten::$provider...");
eval "use WWW::Shorten::$provider;";
if ($@) {
¬ice(
-"Failed to load WWW::Shorten::$provider - either clear short_url_provider or install the CPAN module"
+ "Failed to load WWW::Shorten::$provider - either clear",
+ "short_url_provider or install the CPAN module"
);
}
}
projects / twirssi-net-twitter-lite.git / blobdiff