use File::Temp;
use LWP::Simple;
use Data::Dumper;
-use Net::Twitter;
$Data::Dumper::Indent = 1;
use vars qw($VERSION %IRSSI);
-$VERSION = "2.0.5";
-my ($REV) = '$Rev: 481 $' =~ /(\d+)/;
+$VERSION = "2.2.1beta";
+my ($REV) = '$Rev: 569 $' =~ /(\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-19 14:22:45 -0800 (Thu, 19 Feb 2009) $',
+ changed => '$Date: 2009-03-19 11:44:03 -0700 (Thu, 19 Mar 2009) $',
);
my $window;
my $twit;
my %twits;
my $user;
+my $defservice;
my $poll;
my $last_poll;
my %nicks;
my %friends;
my %tweet_cache;
my %id_map;
+my $failwhale = 0;
my %irssi_to_mirc_colors = (
'%k' => '01',
'%r' => '05',
return;
}
- return unless &valid_username($username);
+ return unless $username = &valid_username($username);
eval {
if ( $twits{$username}
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;
}
- return unless &valid_username($username);
+ return unless $username = &valid_username($username);
my $nick;
$id =~ s/[^\w\d\-:]+//g;
$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;
- };
- }
- }
+ $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") ) {
}
%nicks = %friends;
$nicks{$user} = 0;
- &get_updates;
+ return 1;
} else {
¬ice("Login failed");
}
return;
}
- if ( not -x "/usr/bin/md5sum" and not $data ) {
- ¬ice(
-"/usr/bin/md5sum can't be found - try '/twirssi_upgrade nomd5' to skip MD5 verification"
- );
- return;
- }
-
my $md5;
- unless ($data) {
+ unless ( $data or Irssi::settings_get_bool("twirssi_upgrade_beta") ) {
eval { use Digest::MD5; };
if ($@) {
}
}
- my $URL = "http://twirssi.com/twirssi.pl";
+ my $URL =
+ Irssi::settings_get_bool("twirssi_upgrade_beta")
+ ? "http://github.com/zigdon/twirssi/raw/master/twirssi.pl"
+ : "http://twirssi.com/twirssi.pl";
¬ice("Downloading twirssi from $URL");
LWP::Simple::getstore( $URL, "$loc.upgrade" );
- unless ($data) {
+ unless ( $data or Irssi::settings_get_bool("twirssi_upgrade_beta") ) {
unless ( open( NEW, "$loc.upgrade" ) ) {
¬ice(
"Failed to read $loc.upgrade. Check that /set twirssi_location is set to the correct location."
return unless &logged_in($twit);
my ( $fh, $filename ) = File::Temp::tempfile();
+ binmode( $fh, ":utf8" );
my $pid = fork();
if ($pid) { # parent
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{$_} );
}
print scalar localtime, " - Polling for updates for $username" if &debug;
my $tweets;
- eval {
- $tweets = $obj->friends_timeline(
- { since => HTTP::Date::time2str($last_poll) } );
- };
+ eval { $tweets = $obj->friends_timeline(); };
if ($@) {
print $fh
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;
}
print scalar localtime, " - checking child log at $filename ($attempt)"
if &debug;
my $new_last_poll;
+
+ # first time we run we don't want to print out *everything*, so we just
+ # pretend
+ my $suppress = 0;
+ $suppress = 1 unless keys %tweet_cache;
+
if ( open FILE, $filename ) {
my @lines;
+ my %new_cache;
while (<FILE>) {
chomp;
last if /^__friends__/;
}
if ( not $meta{type} or $meta{type} ne 'searchid' ) {
- next if exists $meta{id} and exists $tweet_cache{ $meta{id} };
- $tweet_cache{ $meta{id} } = time;
+ if ( exists $meta{id} and exists $new_cache{ $meta{id} } ) {
+ next;
+ }
+
+ $new_cache{ $meta{id} } = time;
+
+ if ( exists $meta{id} and exists $tweet_cache{ $meta{id} } ) {
+ next;
+ }
}
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 = "";
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;
$meta{type}, $account, $meta{topic},
$meta{nick}, $marker, $_
];
- if ( $meta{id} >
+ if (
+ exists $id_map{__searches}{ $meta{account} }{ $meta{topic} }
+ and $meta{id} >
$id_map{__searches}{ $meta{account} }{ $meta{topic} } )
{
$id_map{__searches}{ $meta{account} }{ $meta{topic} } =
];
} elsif ( $meta{type} eq 'searchid' ) {
print "Search '$meta{topic}' returned id $meta{id}" if &debug;
- if ( $meta{id} >=
+ if (
+ exists $id_map{__searches}{ $meta{account} }{ $meta{topic} }
+ and $meta{id} >=
$id_map{__searches}{ $meta{account} }{ $meta{topic} } )
{
$id_map{__searches}{ $meta{account} }{ $meta{topic} } =
if ($new_last_poll) {
print "new last_poll = $new_last_poll" if &debug;
- for my $line (@lines) {
- $window->printformat(
- $line->[0],
- "twirssi_" . $line->[1],
- @$line[ 2 .. $#$line ]
- );
+ if ($suppress) {
+ print "First call, not printing updates" if &debug;
+ } else {
+ foreach my $line (@lines) {
+ $window->printformat(
+ $line->[0],
+ "twirssi_" . $line->[1],
+ @$line[ 2 .. $#$line ]
+ );
+ }
}
close FILE;
or warn "Failed to remove $filename: $!"
unless &debug;
+ # commit the pending cache lines to the actual cache, now that
+ # we've printed our output
+ %tweet_cache = ( %tweet_cache, %new_cache );
+
# keep enough cached tweets, to make sure we don't show duplicates.
foreach ( keys %tweet_cache ) {
- next if $tweet_cache{$_} >= $last_poll;
+ next if $tweet_cache{$_} >= $last_poll - 3600;
delete $tweet_cache{$_};
}
$last_poll = $new_last_poll;
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;
return;
}
}
} else {
$since = scalar localtime($last_poll);
}
- ¬ice("Haven't been able to get updated tweets since $since");
+
+ if ( not $failwhale and time - $last_poll > 60 * 60 ) {
+ foreach my $whale (
+ q{ v v v},
+ q{ | | v | v},
+ q{ | .-, | | |},
+ q{ .--./ / | _.---.| },
+ q{ '-. (__..-" \\},
+ q{ \\ a |},
+ q{ ',.__. ,__.-'/},
+ q{ '--/_.'----'`}
+ )
+ {
+ &ccrap($whale);
+ }
+ $failwhale = 1;
+ }
+ &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 {
)
{ # /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_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", "show_own_tweets", 1 );
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( "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} };
print "last poll: $last_poll";
+ if ( open DUMP, ">/tmp/twirssi.cache.txt" ) {
+ print DUMP Dumper \%tweet_cache;
+ close DUMP;
+ print "cache written out to /tmp/twirssi.cache.txt";
+ }
}
);
Irssi::command_bind(
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)");
my $num = keys %{ $id_map{__indexes} };
¬ice( sprintf "Loaded old replies from %d contact%s.",
$num, ( $num == 1 ? "" : "s" ) );
+ &cmd_list_search;
};
} else {
¬ice("Failed to load old replies from $file: $!");
}
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"
);
}
}
and my $autopass = Irssi::settings_get_str("twitter_passwords") )
{
&cmd_login();
+ &get_updates;
}
} else {
projects / twirssi-net-twitter-lite.git / blobdiff