use Data::Dumper;
use Encode;
use POSIX qw/:sys_wait_h/;
+use Net::Twitter qw/3.05/;
$Data::Dumper::Indent = 1;
use vars qw($VERSION %IRSSI);
-$VERSION = "2.4.0beta";
+$VERSION = "2.4.2beta";
%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-08-07 01:24:53 -0700 (Fri, 07 Aug 2009) $',
+ changed => 'Fri Jan 22 14:40:48 PST 2010',
);
my $window;
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+$//;
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;
- }
-
return unless &logged_in($twit);
$data =~ s/^\s+|\s+$//;
return unless $data = &valid_username($data);
¬ice("Logging out $data...");
- eval {
- $twits{$data}->end_session();
- };
+ eval { $twits{$data}->end_session(); };
delete $twits{$data};
undef $twit;
if ( keys %twits ) {
if ($data) {
print "manual data login" if &debug;
( $user, $pass ) = split ' ', $data, 2;
- unless (Irssi::settings_get_bool("twirssi_use_oauth") or $pass) {
+ unless ( Irssi::settings_get_bool("twirssi_use_oauth") or $pass ) {
¬ice("usage: /twitter_login <username>[\@<service>] <password>");
return;
}
- } elsif ( Irssi::settings_get_bool("twirssi_use_oauth") and
- my $autouser = Irssi::settings_get_str("twitter_usernames") ) {
+ } elsif ( Irssi::settings_get_bool("twirssi_use_oauth")
+ and my $autouser = Irssi::settings_get_str("twitter_usernames") )
+ {
print "oauth autouser login" if &debug;
- foreach my $user (split /,/, $autouser) {
+ foreach my $user ( split /,/, $autouser ) {
&cmd_login($user);
}
return;
¬ice("/twitter_login requires either a username/password "
. "or twitter_usernames and twitter_passwords to be set. "
. "Note that if twirssi_use_oauth is true, passwords are "
- . "not required");
+ . "not required" );
return;
}
}
$defservice = $service = ucfirst lc $service;
- print "Loading Net::$service" if &debug;
- eval "use Net::$service 3.05";
- if ($@) {
- ¬ice(
- "Failed to load Net::$service when trying to log in as $user: $@");
- return;
- }
-
- if ( Irssi::settings_get_bool("twirssi_use_oauth") ) {
+ if ( $service eq 'Twitter'
+ and Irssi::settings_get_bool("twirssi_use_oauth") )
+ {
print "Attempting OAuth for $user\@$service" if &debug;
eval {
- $twit = "Net::$service"->new(
- traits => [ 'API::REST', 'OAuth' ],
- consumer_key => 'BZVAvBma4GxdiRwXIvbnw',
- consumer_secret => '0T5kahwLyb34vciGZsgkA9lsjtGCQ05vxVE2APXM',
- source => "twirssi",
- ssl => Irssi::settings_get_bool("twirssi_avoid_ssl") ? 0 : 1,
- );
+ if ( $service eq 'Identica' )
+ {
+ $twit = Net::Twitter->new(
+ identica => 1,
+ traits => [ 'API::REST', 'API::Search' ],
+ source => "twirssi",
+ ssl => !Irssi::settings_get_bool("twirssi_avoid_ssl"),
+ );
+ } else {
+ $twit = Net::Twitter->new(
+ traits => [ 'API::REST', 'OAuth', 'API::Search' ],
+ consumer_key => 'BZVAvBma4GxdiRwXIvbnw',
+ consumer_secret =>
+ '0T5kahwLyb34vciGZsgkA9lsjtGCQ05vxVE2APXM',
+ source => "twirssi",
+ ssl => !Irssi::settings_get_bool("twirssi_avoid_ssl"),
+ );
+ }
};
- if ( $twit ) {
- if (open( OAUTH, Irssi::settings_get_str("twirssi_oauth_store") ) ) {
+ if ($twit) {
+ if ( open( OAUTH, Irssi::settings_get_str("twirssi_oauth_store") ) )
+ {
while (<OAUTH>) {
chomp;
next unless m/$user\@$service (\S+) (\S+)/i;
- print "Trying cached oauth creds for $user\@$service" if &debug;
+ print "Trying cached oauth creds for $user\@$service"
+ if &debug;
$twit->access_token($1);
$twit->access_token_secret($2);
last;
}
unless ( $twit->authorized ) {
- eval {
- my $url = $twit->get_authorization_url;
- };
+ my $url;
+ eval { $url = $twit->get_authorization_url; };
if ($@) {
- ¬ice("ERROR: Failed to get OAuth authorization_url. Try again later.");
+ ¬ice( "ERROR: Failed to get OAuth authorization_url. " .
+ "Try again later.");
return;
}
-
- ¬ice("Twirssi not autorized to access $service for $user.");
- ¬ice("Please authorize at the following url, then enter the pin ");
- ¬ice("supplied with /twirssi_oauth $user\@$service <pin>");
- ¬ice($url);
+ ¬ice( "Twirssi not autorized to access $service for $user.",
+ "Please authorize at the following url, then enter the pin",
+ "supplied with /twirssi_oauth $user\@$service <pin>",
+ $url
+ );
$oauth{pending}{"$user\@$service"} = $twit;
return;
}
}
- } else {
- $twit = "Net::$service"->new(
+ } else {
+ $twit = Net::Twitter->new(
+ $service eq 'Identica' ? ( identica => 1 ) : (),
username => $user,
password => $pass,
source => "twirssi",
}
unless ($twit) {
- ¬ice("Failed to create Net::$service object! Aborting.");
+ ¬ice("Failed to create object! Aborting.");
return;
}
- return &verify_twitter_object($server, $win, $user, $service, $twit);
+ return &verify_twitter_object( $server, $win, $user, $service, $twit );
}
sub cmd_oauth {
- my ($data, $server, $win) = @_;
+ my ( $data, $server, $win ) = @_;
my ( $key, $pin ) = split ' ', $data;
- my ($user, $service);
+ my ( $user, $service );
$key = &normalize_username($key);
if ( $key =~ /^(.*)@(Twitter|Identica)$/ ) {
( $user, $service ) = ( $1, $2 );
. "Please /set twirssi_oauth_store to a writable filename." );
}
- return &verify_twitter_object($server, $win, $user, $service, $twit);
+ return &verify_twitter_object( $server, $win, $user, $service, $twit );
}
sub verify_twitter_object {
- my ($server, $win, $user, $service, $twit) = @_;
+ my ( $server, $win, $user, $service, $twit ) = @_;
if ( my $timeout = Irssi::settings_get_int("twitter_timeout")
and $twit->can('ua') )
my $rate_limit = $twit->rate_limit_status();
if ( $rate_limit and $rate_limit->{remaining_hits} < 1 ) {
¬ice(
- "Rate limit exceeded, try again after $rate_limit->{reset_time}" );
+ "Rate limit exceeded, try again after $rate_limit->{reset_time}");
$twit = undef;
return;
}
$poll = Irssi::timeout_add( &get_poll_time * 1000, \&get_updates, "" );
¬ice("Logged in as $user\@$service, loading friends list...");
&load_friends();
- ¬ice( "loaded friends: ", scalar keys %friends );
+ ¬ice( "loaded friends: ". scalar keys %friends );
if ( Irssi::settings_get_bool("twirssi_first_run") ) {
Irssi::settings_set_bool( "twirssi_first_run", 0 );
}
};
if ($@) {
- print $fh "type:debug Error during friends list update. Aborted.\n";
+ print $fh "type:debug Error during friends list update. Aborted.\n"
+ if $fh;
return;
}
return unless &logged_in($twit);
my ( $fh, $filename ) = File::Temp::tempfile();
- binmode( $fh, ":utf8" );
+ binmode( $fh, ":" . &get_charset );
$child_pid = fork();
if ($child_pid) { # parent
}
$id_map{__searches}{$username}{$topic} = $search->{max_id};
+ $topic =~ s/ /%20/g;
printf $fh "id:%s account:%s type:searchid topic:%s\n",
$search->{max_id}, $username, $topic;
# pretend
if ( open FILE, $filename ) {
- binmode FILE, ":utf8";
+ binmode FILE, ":" . &get_charset;
my @lines;
my %new_cache;
while (<FILE>) {
my %meta;
foreach my $key (qw/id account nick type topic/) {
- if (s/^$key:(\S+)\s*//) {
+ if (s/^$key:((?:\S|\\ )+)\s*//) {
$meta{$key} = $1;
+ $meta{$key} =~ s/%20/ /g;
}
}
}
my $marker = "";
- if ( $meta{type} ne 'dm'
- and Irssi::settings_get_bool("twirssi_track_replies")
- and $meta{nick}
- and $meta{id} )
+ if ($meta{type} ne 'dm' and $meta{nick} and $meta{id} )
{
$marker = ( $id_map{__indexes}{ $meta{nick} } + 1 ) % 100;
$id_map{ lc $meta{nick} }[$marker] = $meta{id};
Irssi::pidwait_remove($child_pid);
# and that we don't leave any zombies behind, somehow
- wait();
+ waitpid( -1, WNOHANG );
# save id_map hash
if ( keys %id_map
} else {
print "Giving up on polling $filename" if &debug;
Irssi::pidwait_remove($child_pid);
- wait();
+ waitpid( -1, WNOHANG );
unlink $filename unless &debug;
return unless Irssi::settings_get_bool("twirssi_notify_timeouts");
}
if ( not $failwhale and time - $last_poll > 60 * 60 ) {
- foreach my $whale (
+ &ccrap(
q{ v v v},
q{ | | v | v},
q{ | .-, | | |},
q{ \\ a |},
q{ ',.__. ,__.-'/},
q{ '--/_.'----'`}
- )
- {
- &ccrap($whale);
- }
+ );
$failwhale = 1;
}
}
sub notice {
- $window->print( "%R***%n @_", MSGLEVEL_PUBLIC );
+ foreach my $msg (@_) {
+ $window->print( "%R***%n $msg", MSGLEVEL_PUBLIC );
+ }
}
sub ccrap {
- $window->print( "%R***%n @_", MSGLEVEL_CLIENTCRAP );
+ foreach my $msg (@_) {
+ $window->print( "%R***%n $msg", MSGLEVEL_CLIENTCRAP );
+ }
}
sub update_away {
return 60;
}
+sub get_charset {
+ my $charset = Irssi::settings_get_str("twirssi_charset");
+ return "utf8" if $charset =~ /^\s*$/;
+ return $charset;
+}
+
sub hilight {
my $text = shift;
"Set short_url_args to username,API_key or change your",
"short_url_provider."
);
- return decode "utf8", $data;
+ return decode &get_charset, $data;
}
}
}
}
- return decode "utf8", $data;
+ return decode &get_charset, $data;
}
sub normalize_username {
);
Irssi::settings_add_int( "twirssi", "twitter_poll_interval", 300 );
+Irssi::settings_add_str( "twirssi", "twirssi_charset", "utf8" );
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", "twirssi_retweet_format",
'RT $n: "$t" ${-- $c$}' );
Irssi::settings_add_str( "twirssi", "twirssi_location",
- "$ENV{HOME}/.irssi/scripts/twirssi.pl" );
+ Irssi::get_irssi_dir . "/scripts/twirssi.pl" );
Irssi::settings_add_str( "twirssi", "twirssi_replies_store",
- "$ENV{HOME}/.irssi/scripts/twirssi.json" );
+ Irssi::get_irssi_dir . "/scripts/twirssi.json" );
Irssi::settings_add_str( "twirssi", "twirssi_oauth_store",
- "$ENV{HOME}/.irssi/scripts/twirssi.oauth" );
+ Irssi::get_irssi_dir . "/scripts/twirssi.oauth" );
Irssi::settings_add_int( "twirssi", "twitter_friends_poll", 600 );
Irssi::settings_add_int( "twirssi", "twitter_timeout", 30 );
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_replies_autonick", 1 );
Irssi::settings_add_bool( "twirssi", "twirssi_use_reply_aliases", 0 );
Irssi::settings_add_bool( "twirssi", "twirssi_notify_timeouts", 1 );
);
Irssi::signal_add_last( 'complete word' => \&sig_complete );
- ¬ice(" %Y<%C(%B^%C)%N TWIRSSI v%R$VERSION%N");
- ¬ice(" %C(_(\\%N http://twirssi.com/ for full docs");
- ¬ice(
- " %Y||%C `%N Log in with /twitter_login, send updates with /tweet");
+ ¬ice(" %Y<%C(%B^%C)%N TWIRSSI v%R$VERSION%N",
+ " %C(_(\\%N http://twirssi.com/ for full docs",
+ " %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 ) {
projects / twirssi-net-twitter-lite.git / blobdiff