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
2.2.7 - Updated to continue working correctly on 32bit machines, past the twitpocolypse2
[twirssi-net-twitter-lite.git]
/
twirssi.pl
diff --git
a/twirssi.pl
b/twirssi.pl
index 1adc3179dd515ca64b7c4e966e6c14cd62d3926e..ac201572944291a1d2d18596a7fcac0b14f45488 100644
(file)
--- a/
twirssi.pl
+++ b/
twirssi.pl
@@
-11,7
+11,7
@@
$Data::Dumper::Indent = 1;
use vars qw($VERSION %IRSSI);
use vars qw($VERSION %IRSSI);
-$VERSION = "2.2.
5beta
";
+$VERSION = "2.2.
7
";
my ($REV) = '$Rev: 687 $' =~ /(\d+)/;
%IRSSI = (
authors => 'Dan Boger',
my ($REV) = '$Rev: 687 $' =~ /(\d+)/;
%IRSSI = (
authors => 'Dan Boger',
@@
-38,6
+38,7
@@
my %tweet_cache;
my %id_map;
my $failwhale = 0;
my $first_call = 1;
my %id_map;
my $failwhale = 0;
my $first_call = 1;
+my $child_pid;
my %irssi_to_mirc_colors = (
'%k' => '01',
my %irssi_to_mirc_colors = (
'%k' => '01',
@@
-504,12
+505,23
@@
sub cmd_login {
return;
}
return;
}
- if ( my $timeout = Irssi::settings_get_int("twitter_timeout") and $twit->can('ua')) {
+ if ( my $timeout = Irssi::settings_get_int("twitter_timeout")
+ and $twit->can('ua') )
+ {
$twit->ua->timeout($timeout);
}
unless ( $twit->verify_credentials() ) {
¬ice("Login as $user\@$service failed");
$twit->ua->timeout($timeout);
}
unless ( $twit->verify_credentials() ) {
¬ice("Login as $user\@$service failed");
+
+ if ( not Irssi::settings_get_bool("twirssi_avoid_ssl") ) {
+ ¬ice(
+ "It's possible you're missing one of the modules required for "
+ . "SSL logins. Try setting twirssi_avoid_ssl to on. See "
+ . "http://cpansearch.perl.org/src/GAAS/libwww-perl-5.831/README.SSL "
+ . "for the detailed requirements." );
+ }
+
$twit = undef;
if ( keys %twits ) {
&cmd_switch( ( keys %twits )[0], $server, $win );
$twit = undef;
if ( keys %twits ) {
&cmd_switch( ( keys %twits )[0], $server, $win );
@@
-535,12
+547,6
@@
sub cmd_login {
¬ice( "loaded friends: ", scalar keys %friends );
if ( Irssi::settings_get_bool("twirssi_first_run") ) {
Irssi::settings_set_bool( "twirssi_first_run", 0 );
¬ice( "loaded friends: ", scalar keys %friends );
if ( Irssi::settings_get_bool("twirssi_first_run") ) {
Irssi::settings_set_bool( "twirssi_first_run", 0 );
- unless ( exists $friends{twirssi} ) {
- ¬ice("Welcome to twirssi!"
- . " Perhaps you should add \@twirssi to your friends list,"
- . " so you can be notified when a new version is release?"
- . " Just type /twitter_follow twirssi." );
- }
}
%nicks = %friends;
$nicks{$user} = 0;
}
%nicks = %friends;
$nicks{$user} = 0;
@@
-774,13
+780,13
@@
sub get_updates {
my ( $fh, $filename ) = File::Temp::tempfile();
binmode( $fh, ":utf8" );
my ( $fh, $filename ) = File::Temp::tempfile();
binmode( $fh, ":utf8" );
-
my $
pid = fork();
+
$child_
pid = fork();
- if ($pid) { # parent
+ if ($
child_
pid) { # parent
Irssi::timeout_add_once( 5000, 'monitor_child',
[ "$filename.done", 0 ] );
Irssi::timeout_add_once( 5000, 'monitor_child',
[ "$filename.done", 0 ] );
- Irssi::pidwait_add($pid);
- } elsif ( defined $pid ) { # child
+ Irssi::pidwait_add($
child_
pid);
+ } elsif ( defined $
child_
pid ) { # child
close STDIN;
close STDOUT;
close STDERR;
close STDIN;
close STDOUT;
close STDERR;
@@
-899,9
+905,8
@@
sub do_updates {
" -- http://twitter.com/$context->{user}{screen_name}"
. "/status/$context->{id}";
}
" -- http://twitter.com/$context->{user}{screen_name}"
. "/status/$context->{id}";
}
- printf $fh "id:%u account:%s nick:%s type:tweet %s\n",
- $context->{id}, $username,
- $context->{user}{screen_name}, $ctext;
+ printf $fh "id:$context->{id} account:%s nick:%s type:tweet %s\n",
+ $username, $context->{user}{screen_name}, $ctext;
$reply = "reply";
}
}
$reply = "reply";
}
}
@@
-912,12
+917,12
@@
sub do_updates {
$text .= " -- http://twitter.com/$t->{user}{screen_name}"
. "/status/$t->{id}";
}
$text .= " -- http://twitter.com/$t->{user}{screen_name}"
. "/status/$t->{id}";
}
- printf $fh "id:
%u
account:%s nick:%s type:%s %s\n",
- $
t->{id}, $
username, $t->{user}{screen_name}, $reply, $text;
+ printf $fh "id:
$t->{id}
account:%s nick:%s type:%s %s\n",
+ $username, $t->{user}{screen_name}, $reply, $text;
$new_poll_id = $t->{id} if $new_poll_id < $t->{id};
}
$new_poll_id = $t->{id} if $new_poll_id < $t->{id};
}
- printf $fh "id:
%u
account:%s type:last_id timeline\n",
-
$new_poll_id,
$username;
+ printf $fh "id:
$new_poll_id
account:%s type:last_id timeline\n",
+ $username;
print scalar localtime, " - Polling for replies since ",
$id_map{__last_id}{$username}{reply}
print scalar localtime, " - Polling for replies since ",
$id_map{__last_id}{$username}{reply}
@@
-949,11
+954,11
@@
sub do_updates {
$text .= " -- http://twitter.com/$t->{user}{screen_name}"
. "/status/$t->{id}";
}
$text .= " -- http://twitter.com/$t->{user}{screen_name}"
. "/status/$t->{id}";
}
- printf $fh "id:
%u
account:%s nick:%s type:tweet %s\n",
-
$t->{id},
$username, $t->{user}{screen_name}, $text;
+ printf $fh "id:
$t->{id}
account:%s nick:%s type:tweet %s\n",
+ $username, $t->{user}{screen_name}, $text;
$new_poll_id = $t->{id} if $new_poll_id < $t->{id};
}
$new_poll_id = $t->{id} if $new_poll_id < $t->{id};
}
- printf $fh "id:
%u account:%s type:last_id reply\n", $new_poll_id
, $username;
+ printf $fh "id:
$new_poll_id account:%s type:last_id reply\n"
, $username;
print scalar localtime, " - Polling for DMs" if &debug;
$new_poll_id = 0;
print scalar localtime, " - Polling for DMs" if &debug;
$new_poll_id = 0;
@@
-976,11
+981,11
@@
sub do_updates {
foreach my $t ( reverse @$tweets ) {
my $text = decode_entities( $t->{text} );
$text =~ s/[\n\r]/ /g;
foreach my $t ( reverse @$tweets ) {
my $text = decode_entities( $t->{text} );
$text =~ s/[\n\r]/ /g;
- printf $fh "id:
%u
account:%s nick:%s type:dm %s\n",
- $
t->{id}, $
username, $t->{sender_screen_name}, $text;
+ printf $fh "id:
$t->{id}
account:%s nick:%s type:dm %s\n",
+ $username, $t->{sender_screen_name}, $text;
$new_poll_id = $t->{id} if $new_poll_id < $t->{id};
}
$new_poll_id = $t->{id} if $new_poll_id < $t->{id};
}
- printf $fh "id:
%u account:%s type:last_id dm\n", $new_poll_id
, $username;
+ printf $fh "id:
$new_poll_id account:%s type:last_id dm\n"
, $username;
print scalar localtime, " - Polling for subscriptions" if &debug;
if ( $obj->can('search') and $id_map{__searches}{$username} ) {
print scalar localtime, " - Polling for subscriptions" if &debug;
if ( $obj->can('search') and $id_map{__searches}{$username} ) {
@@
-1010,14
+1015,14
@@
sub do_updates {
}
$id_map{__searches}{$username}{$topic} = $search->{max_id};
}
$id_map{__searches}{$username}{$topic} = $search->{max_id};
- printf $fh "id:
%u
account:%s type:searchid topic:%s\n",
- $
search->{max_id}, $
username, $topic;
+ printf $fh "id:
$search->{max_id}
account:%s type:searchid topic:%s\n",
+ $username, $topic;
foreach my $t ( reverse @{ $search->{results} } ) {
my $text = decode_entities( $t->{text} );
$text =~ s/[\n\r]/ /g;
foreach my $t ( reverse @{ $search->{results} } ) {
my $text = decode_entities( $t->{text} );
$text =~ s/[\n\r]/ /g;
- printf $fh "id:
%u
account:%s nick:%s type:search topic:%s %s\n",
- $
t->{id}, $
username, $t->{from_user}, $topic, $text;
+ printf $fh "id:
$t->{id}
account:%s nick:%s type:search topic:%s %s\n",
+ $username, $t->{from_user}, $topic, $text;
$new_poll_id = $t->{id}
if not $new_poll_id
or $t->{id} < $new_poll_id;
$new_poll_id = $t->{id}
if not $new_poll_id
or $t->{id} < $new_poll_id;
@@
-1221,6
+1226,9
@@
sub monitor_child {
}
$last_poll = $new_last_poll;
}
$last_poll = $new_last_poll;
+ # make sure the pid is removed from the waitpid list
+ Irssi::pidwait_remove($child_pid);
+
# save id_map hash
if ( keys %id_map
and my $file =
# save id_map hash
if ( keys %id_map
and my $file =
@@
-1444,7
+1452,7
@@
sub shorten {
"Set short_url_args to username,API_key or change your",
"short_url_provider."
);
"Set short_url_args to username,API_key or change your",
"short_url_provider."
);
- return $data;
+ return
decode "utf8",
$data;
}
}
}
}
@@
-1520,7
+1528,7
@@
Irssi::settings_add_str( "twirssi", "twirssi_replies_store",
".irssi/scripts/twirssi.json" );
Irssi::settings_add_int( "twirssi", "twitter_friends_poll", 600 );
".irssi/scripts/twirssi.json" );
Irssi::settings_add_int( "twirssi", "twitter_friends_poll", 600 );
-Irssi::settings_add_int( "twirssi", "twitter_timeout", 30 );
+Irssi::settings_add_int( "twirssi", "twitter_timeout",
30 );
Irssi::settings_add_bool( "twirssi", "twirssi_upgrade_beta", 0 );
Irssi::settings_add_bool( "twirssi", "tweet_to_away", 0 );
Irssi::settings_add_bool( "twirssi", "twirssi_upgrade_beta", 0 );
Irssi::settings_add_bool( "twirssi", "tweet_to_away", 0 );
@@
-1592,11
+1600,22
@@
if ($window) {
Irssi::command_bind(
"twirssi_version",
sub {
Irssi::command_bind(
"twirssi_version",
sub {
- ¬ice("Twirssi v$VERSION (r$REV); "
- . "Net::Twitter v$Net::Twitter::VERSION. "
+ ¬ice(
+ "Twirssi v$VERSION (r$REV); "
+ . (
+ $Net::Twitter::VERSION
+ ? "Net::Twitter v$Net::Twitter::VERSION. "
+ : ""
+ )
+ . (
+ $Net::Identica::VERSION
+ ? "Net::Identica v$Net::Identica::VERSION. "
+ : ""
+ )
. "JSON in use: "
. JSON::Any::handler()
. "JSON in use: "
. JSON::Any::handler()
- . ". See details at http://twirssi.com/" );
+ . ". See details at http://twirssi.com/"
+ );
}
);
Irssi::command_bind(
}
);
Irssi::command_bind(
@@
-1623,6
+1642,22
@@
if ($window) {
sub { ¬ice("Device updated to $_[0]"); }
)
);
sub { ¬ice("Device updated to $_[0]"); }
)
);
+ Irssi::command_bind(
+ "twitter_block",
+ &gen_cmd(
+ "/twitter_block <username>",
+ "create_block",
+ sub { ¬ice("Blocked $_[0]"); }
+ )
+ );
+ Irssi::command_bind(
+ "twitter_unblock",
+ &gen_cmd(
+ "/twitter_unblock <username>",
+ "destroy_block",
+ sub { ¬ice("Unblock $_[0]"); }
+ )
+ );
Irssi::signal_add_last( 'complete word' => \&sig_complete );
¬ice(" %Y<%C(%B^%C)%N TWIRSSI v%R$VERSION%N (r$REV)");
Irssi::signal_add_last( 'complete word' => \&sig_complete );
¬ice(" %Y<%C(%B^%C)%N TWIRSSI v%R$VERSION%N (r$REV)");