use Data::Dumper;
use Encode;
use POSIX qw/:sys_wait_h/;
+use Net::Twitter::Lite
$Data::Dumper::Indent = 1;
use vars qw($VERSION %IRSSI);
-$VERSION = "2.4.0";
+$VERSION = "2.4.1beta";
%IRSSI = (
authors => 'Dan Boger',
contact => 'zigdon@gmail.com',
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") ) {
- 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 ( $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;
- $twit->access_token($1);
- $twit->access_token_secret($2);
- last;
- }
- close OAUTH;
- }
-
- unless ( $twit->authorized ) {
- my $url;
- eval {
- $url = $twit->get_authorization_url;
- };
-
- if ($@) {
- ¬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);
-
- $oauth{pending}{"$user\@$service"} = $twit;
- return;
- }
- }
- } else {
- $twit = "Net::$service"->new(
- username => $user,
- password => $pass,
- source => "twirssi",
- ssl => Irssi::settings_get_bool("twirssi_avoid_ssl") ? 0 : 1,
- );
- }
+ $twit = Net::Twitter::Lite->new(
+ username => $user,
+ password => $pass,
+ );
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;
}
}
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 {
if ( exists $tweet->{retweeted_status} ) {
$text = "RT \@$tweet->{retweeted_status}{user}{screen_name}: "
. "$tweet->{retweeted_status}{text}";
- } elsif ( $object->isa('Net::Twitter') ) {
+ } elsif ( $object->isa('Net::Twitter::Lite') ) {
$text .= " -- http://twitter.com/$tweet->{user}{screen_name}"
. "/status/$tweet->{id}";
}
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 );
¬ice(
"Twirssi v$VERSION; "
. (
- $Net::Twitter::VERSION
- ? "Net::Twitter v$Net::Twitter::VERSION. "
+ $Net::Twitter::Lite::VERSION
+ ? "Net::Twitter v$Net::Twitter::Lite::VERSION. "
: ""
)
. (
);
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