projects
/
twirssi-net-twitter-lite.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a requirement for Net::* 3.0+
[twirssi-net-twitter-lite.git]
/
twirssi.pl
diff --git
a/twirssi.pl
b/twirssi.pl
index 58b5ca6ac22402eb843a0a8b51efbe742d0f8996..5ab53c1bc2f5ba2681dd5ef517c2f4adf4fcc72e 100644
(file)
--- a/
twirssi.pl
+++ b/
twirssi.pl
@@
-11,8
+11,8
@@
$Data::Dumper::Indent = 1;
use vars qw($VERSION %IRSSI);
use vars qw($VERSION %IRSSI);
-$VERSION = "2.3.
0
";
-%IRSSI = (
+$VERSION = "2.3.
1beta
";
+%IRSSI
= (
authors => 'Dan Boger',
contact => 'zigdon@gmail.com',
name => 'twirssi',
authors => 'Dan Boger',
contact => 'zigdon@gmail.com',
name => 'twirssi',
@@
-490,7
+490,7
@@
sub cmd_login {
}
$defservice = $service = ucfirst lc $service;
}
$defservice = $service = ucfirst lc $service;
- eval "use Net::$service";
+ eval "use Net::$service
3.0
";
if ($@) {
¬ice(
"Failed to load Net::$service when trying to log in as $user: $@");
if ($@) {
¬ice(
"Failed to load Net::$service when trying to log in as $user: $@");
@@
-698,9
+698,8
@@
sub cmd_upgrade {
my $loc = Irssi::settings_get_str("twirssi_location");
unless ( -w $loc ) {
my $loc = Irssi::settings_get_str("twirssi_location");
unless ( -w $loc ) {
- ¬ice( "$loc isn't writable, can't upgrade." .
- " Perhaps you need to /set twirssi_location?"
- );
+ ¬ice("$loc isn't writable, can't upgrade."
+ . " Perhaps you need to /set twirssi_location?" );
return;
}
return;
}
@@
-709,9
+708,8
@@
sub cmd_upgrade {
eval { use Digest::MD5; };
if ($@) {
eval { use Digest::MD5; };
if ($@) {
- ¬ice( "Failed to load Digest::MD5." .
- " Try '/twirssi_upgrade nomd5' to skip MD5 verification"
- );
+ ¬ice("Failed to load Digest::MD5."
+ . " Try '/twirssi_upgrade nomd5' to skip MD5 verification" );
return;
}
return;
}
@@
-724,8
+722,8
@@
sub cmd_upgrade {
}
unless ( open( CUR, $loc ) ) {
}
unless ( open( CUR, $loc ) ) {
- ¬ice(
"Failed to read $loc." .
-
" Check that /set twirssi_location is set to the correct location."
+ ¬ice(
"Failed to read $loc."
+
.
" Check that /set twirssi_location is set to the correct location."
);
return;
}
);
return;
}
@@
-790,20
+788,20
@@
sub cmd_upgrade {
}
sub load_friends {
}
sub load_friends {
- my $fh = shift;
+ my $fh
= shift;
my $cursor = -1;
my $cursor = -1;
- my $page = 1;
+ my $page
= 1;
my %new_friends;
eval {
my %new_friends;
eval {
- while (
$page < 11 and $cursor ne "0"
)
+ while (
$page < 11 and $cursor ne "0"
)
{
print $fh "type:debug Loading friends page $page...\n"
if ( $fh and &debug );
my $friends;
{
print $fh "type:debug Loading friends page $page...\n"
if ( $fh and &debug );
my $friends;
- if (
ref $twit =~ /^Net::Twitter/
) {
+ if (
ref $twit =~ /^Net::Twitter/
) {
$friends = $twit->friends( { cursor => $cursor } );
last unless $friends;
$friends = $twit->friends( { cursor => $cursor } );
last unless $friends;
- $cursor = $friends->{next_cursor};
+ $cursor
= $friends->{next_cursor};
$friends = $friends->{users};
} else {
$friends = $twit->friends( { page => $page } );
$friends = $friends->{users};
} else {
$friends = $twit->friends( { page => $page } );
@@
-883,7
+881,7
@@
sub get_updates {
$fix_replies_index{$_} = 0
if $fix_replies_index{$_} >= @frusers;
print $fh "id:$fix_replies_index{$_} ",
$fix_replies_index{$_} = 0
if $fix_replies_index{$_} >= @frusers;
print $fh "id:$fix_replies_index{$_} ",
-
"account:$_ type:fix_replies_index\n";
+ "account:$_ type:fix_replies_index\n";
}
}
}
}
@@
-1129,16
+1127,14
@@
sub get_timeline {
my $tweets;
my $last_id = $id_map{__last_id}{$username}{$target};
my $tweets;
my $last_id = $id_map{__last_id}{$username}{$target};
- print $fh "type:debug get_timeline("
.
- "$fix_replies_index{$username}=$target > $last_id) started." .
-
" username = $username\n";
+ print $fh "type:debug get_timeline("
+ . "$fix_replies_index{$username}=$target > $last_id) started."
+
.
" username = $username\n";
eval {
$tweets = $obj->user_timeline(
{
id => $target,
eval {
$tweets = $obj->user_timeline(
{
id => $target,
- (
- $last_id ? (since_id => $last_id) : ()
- ),
+ ( $last_id ? ( since_id => $last_id ) : () ),
}
);
};
}
);
};
@@
-1199,7
+1195,7
@@
sub get_timeline {
$last_id = $t->{id} if $last_id < $t->{id};
}
printf $fh "id:%s account:%s type:last_id_fixreplies %s\n",
$last_id = $t->{id} if $last_id < $t->{id};
}
printf $fh "id:%s account:%s type:last_id_fixreplies %s\n",
-
$last_id, $username, $target;
+ $last_id, $username, $target;
return 1;
}
return 1;
}
@@
-1561,7
+1557,9
@@
sub sig_complete {
keys %{ $id_map{__indexes} };
}
keys %{ $id_map{__indexes} };
}
- if ( $linestart =~ /^\/(twitter_unfriend|twitter_add_follow_extra|twitter_del_follow_extra)\s*$/ )
+ if ( $linestart =~
+/^\/(twitter_unfriend|twitter_add_follow_extra|twitter_del_follow_extra)\s*$/
+ )
{ # /twitter_unfriend gets a nick
$word =~ s/^@//;
push @$complist, grep /^\Q$word/i,
{ # /twitter_unfriend gets a nick
$word =~ s/^@//;
push @$complist, grep /^\Q$word/i,