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
r523 - release v2.1.2
[twirssi-net-twitter-lite.git]
/
twirssi.pl
diff --git
a/twirssi.pl
b/twirssi.pl
index 069d8cd8e02375aeacd28206cdfdf5c605d018db..3cb6df87d5ba9633f50e55c6f360e82a66a4f957 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.
0.6
";
-my ($REV) = '$Rev:
488
$' =~ /(\d+)/;
+$VERSION = "2.
1.2
";
+my ($REV) = '$Rev:
523
$' =~ /(\d+)/;
%IRSSI = (
authors => 'Dan Boger',
contact => 'zigdon@gmail.com',
%IRSSI = (
authors => 'Dan Boger',
contact => 'zigdon@gmail.com',
@@
-21,7
+21,7
@@
my ($REV) = '$Rev: 488 $' =~ /(\d+)/;
. 'Can optionally set your bitlbee /away message to same',
license => 'GNU GPL v2',
url => 'http://twirssi.com',
. 'Can optionally set your bitlbee /away message to same',
license => 'GNU GPL v2',
url => 'http://twirssi.com',
- changed => '$Date: 2009-0
2-24 13:57:57 -0800 (Tue, 24 Feb
2009) $',
+ changed => '$Date: 2009-0
3-07 14:09:03 -0800 (Sat, 07 Mar
2009) $',
);
my $window;
);
my $window;
@@
-354,14
+354,26
@@
sub cmd_login {
{
my @user = split /\s*,\s*/, $autouser;
my @pass = split /\s*,\s*/, $autopass;
{
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 );
¬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;
$u = shift @user;
- $p = shift @
pass
;
+ $p = shift @
unescaped
;
&cmd_login("$u $p");
}
return;
&cmd_login("$u $p");
}
return;
@@
-505,7
+517,7
@@
sub cmd_upgrade {
}
my $md5;
}
my $md5;
- unless (
$data
) {
+ unless (
$data or Irssi::settings_get_bool("twirssi_upgrade_beta")
) {
eval { use Digest::MD5; };
if ($@) {
eval { use Digest::MD5; };
if ($@) {
@@
-539,11
+551,14
@@
sub cmd_upgrade {
}
}
}
}
- 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" );
¬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."
unless ( open( NEW, "$loc.upgrade" ) ) {
¬ice(
"Failed to read $loc.upgrade. Check that /set twirssi_location is set to the correct location."
@@
-734,6
+749,12
@@
sub do_updates {
printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
$context->{id}, $username,
$context->{user}{screen_name}, $ctext;
printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
$context->{id}, $username,
$context->{user}{screen_name}, $ctext;
+ if ($context->{truncated}) {
+ printf $fh "id:%s account:%s nick:%s type:ellispis %s\n",
+ $context->{id}."-url", $username,
+ $context->{user}{screen_name},
+ "http://twitter.com/$context->{user}{screen_name}/status/$context->{id}";
+ }
$reply = "reply";
} elsif ($@) {
print $fh "type:debug request to get context failed: $@";
$reply = "reply";
} elsif ($@) {
print $fh "type:debug request to get context failed: $@";
@@
-748,6
+769,12
@@
sub do_updates {
and not Irssi::settings_get_bool("show_own_tweets");
printf $fh "id:%d account:%s nick:%s type:%s %s\n",
$t->{id}, $username, $t->{user}{screen_name}, $reply, $text;
and not Irssi::settings_get_bool("show_own_tweets");
printf $fh "id:%d account:%s nick:%s type:%s %s\n",
$t->{id}, $username, $t->{user}{screen_name}, $reply, $text;
+ if ($t->{truncated}) {
+ printf $fh "id:%s account:%s nick:%s type:ellispis %s\n",
+ $t->{id}."-url", $username,
+ $t->{user}{screen_name},
+ "http://twitter.com/$t->{user}{screen_name}/status/$t->{id}";
+ }
}
print scalar localtime, " - Polling for replies" if &debug;
}
print scalar localtime, " - Polling for replies" if &debug;
@@
-769,6
+796,12
@@
sub do_updates {
$text = &hilight($text);
printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
$t->{id}, $username, $t->{user}{screen_name}, $text;
$text = &hilight($text);
printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
$t->{id}, $username, $t->{user}{screen_name}, $text;
+ if ($t->{truncated}) {
+ printf $fh "id:%s account:%s nick:%s type:ellispis %s\n",
+ $t->{id}."-url", $username,
+ $t->{user}{screen_name},
+ "http://twitter.com/$t->{user}{screen_name}/status/$t->{id}";
+ }
}
print scalar localtime, " - Polling for DMs" if &debug;
}
print scalar localtime, " - Polling for DMs" if &debug;
@@
-865,6
+898,10
@@
sub monitor_child {
}
if ( not $meta{type} or $meta{type} ne 'searchid' ) {
}
if ( not $meta{type} or $meta{type} ne 'searchid' ) {
+ 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} } ) {
$new_cache{ $meta{id} } = time;
if ( exists $meta{id} and exists $tweet_cache{ $meta{id} } ) {
@@
-904,6
+941,12
@@
sub monitor_child {
( MSGLEVEL_PUBLIC | $hilight ),
$meta{type}, $account, $meta{nick}, $marker, $_
];
( MSGLEVEL_PUBLIC | $hilight ),
$meta{type}, $account, $meta{nick}, $marker, $_
];
+ } elsif ( $meta{type} eq 'ellispis' ) {
+ push @lines,
+ [
+ MSGLEVEL_PUBLIC,
+ "tweet", $account, $meta{nick}, "", $_
+ ];
} elsif ( $meta{type} eq 'search' ) {
push @lines,
[
} elsif ( $meta{type} eq 'search' ) {
push @lines,
[
@@
-911,7
+954,9
@@
sub monitor_child {
$meta{type}, $account, $meta{topic},
$meta{nick}, $marker, $_
];
$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} } =
$id_map{__searches}{ $meta{account} }{ $meta{topic} } )
{
$id_map{__searches}{ $meta{account} }{ $meta{topic} } =
@@
-925,7
+970,9
@@
sub monitor_child {
];
} elsif ( $meta{type} eq 'searchid' ) {
print "Search '$meta{topic}' returned id $meta{id}" if &debug;
];
} 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} } =
$id_map{__searches}{ $meta{account} }{ $meta{topic} } )
{
$id_map{__searches}{ $meta{account} }{ $meta{topic} } =
@@
-991,7
+1038,7
@@
sub monitor_child {
print JSON JSON::Any->objToJson( \%id_map );
close JSON;
} else {
print JSON JSON::Any->objToJson( \%id_map );
close JSON;
} else {
- &
notice
("Failed to write replies to $file: $!");
+ &
ccrap
("Failed to write replies to $file: $!");
}
}
$failwhale = 0;
}
}
$failwhale = 0;
@@
-1030,11
+1077,11
@@
sub monitor_child {
q{ '--/_.'----'`}
)
{
q{ '--/_.'----'`}
)
{
- &
notice
($whale);
+ &
ccrap
($whale);
}
$failwhale = 1;
}
}
$failwhale = 1;
}
- &
notice
("Haven't been able to get updated tweets since $since");
+ &
ccrap
("Haven't been able to get updated tweets since $since");
}
}
}
}
@@
-1046,6
+1093,10
@@
sub notice {
$window->print( "%R***%n @_", MSGLEVEL_PUBLIC );
}
$window->print( "%R***%n @_", MSGLEVEL_PUBLIC );
}
+sub ccrap {
+ $window->print( "%R***%n @_", MSGLEVEL_CLIENTCRAP );
+}
+
sub update_away {
my $data = shift;
sub update_away {
my $data = shift;
@@
-1059,7
+1110,7
@@
sub update_away {
$server->send_raw("away :$data");
return 1;
} else {
$server->send_raw("away :$data");
return 1;
} else {
- &
notice
( "Can't find bitlbee server.",
+ &
ccrap
( "Can't find bitlbee server.",
"Update bitlbee_server or disable tweet_to_away" );
return 0;
}
"Update bitlbee_server or disable tweet_to_away" );
return 0;
}
@@
-1112,8
+1163,10
@@
sub sig_complete {
)
{ # /twitter_reply gets a nick:num
$word =~ s/^@//;
)
{ # /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
}
# /tweet, /tweet_as, /dm, /dm_as - complete @nicks (and nicks as the first
@@
-1188,6
+1241,7
@@
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/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", "tweet_to_away", 0 );
Irssi::settings_add_bool( "twirssi", "show_reply_context", 0 );
Irssi::settings_add_bool( "twirssi", "show_own_tweets", 1 );
@@
-1203,6
+1257,10
@@
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 ) {
$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 );
$window =
Irssi::Windowitem::window_create(
Irssi::settings_get_str('twitter_window'), 1 );
@@
-1289,6
+1347,7
@@
if ($window) {
my $num = keys %{ $id_map{__indexes} };
¬ice( sprintf "Loaded old replies from %d contact%s.",
$num, ( $num == 1 ? "" : "s" ) );
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: $!");
};
} else {
¬ice("Failed to load old replies from $file: $!");