use File::Temp;
use LWP::Simple;
use Data::Dumper;
-use Net::Twitter;
+use Net::Identica;
$Data::Dumper::Indent = 1;
use vars qw($VERSION %IRSSI);
-$VERSION = "2.0";
-my ($REV) = '$Rev: 443 $' =~ /(\d+)/;
+$VERSION = "2.0.6";
+my ($REV) = '$Rev: 483 $' =~ /(\d+)/;
%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-01-29 18:25:38 -0800 (Thu, 29 Jan 2009) $',
+ changed => '$Date: 2009-02-20 14:37:28 -0800 (Fri, 20 Feb 2009) $',
);
my $window;
return unless &valid_username($username);
eval {
- unless ( $twits{$username}
+ if ( $twits{$username}
->new_direct_message( { user => $target, text => $text } ) )
{
+ ¬ice("DM sent to $target");
+ $nicks{$target} = time;
+ } else {
+ my $error;
+ eval {
+ $error = JSON::Any->jsonToObj( $twits{$username}->get_error() );
+ $error = $error->{error};
+ };
+ die $error if $error;
¬ice("DM to $target failed");
- return;
}
};
if ($@) {
- ¬ice("DM caused an error. Aborted");
+ ¬ice("DM caused an error: $@");
return;
}
-
- ¬ice("DM sent to $target");
- $nicks{$target} = time;
}
sub cmd_tweet {
return unless &logged_in($twit);
$data =~ s/^\s+|\s+$//;
+ $data =~ s/\s\s+/ /g;
my ( $username, $data ) = split ' ', $data, 2;
unless ( $username and $data ) {
return unless &valid_username($username);
- if ( &too_long($data) and Irssi::settings_get_str("short_url_provider") ) {
+ if ( &too_long( $data, 1 )
+ and Irssi::settings_get_str("short_url_provider") )
+ {
foreach my $url ( $data =~ /(https?:\/\/\S+[\w\/])/g ) {
eval {
my $short = makeashorterlink($url);
return if &too_long($data);
+ my $success = 1;
eval {
unless ( $twits{$username}->update($data) )
{
¬ice("Update failed");
- return;
+ $success = 0;
}
};
+ return unless $success;
if ($@) {
- ¬ice("Update caused an error. Aborted.");
+ ¬ice("Update caused an error: $@. Aborted.");
return;
}
return;
}
- # remove any @nick at the beginning of the reply, as we'll add it anyway
- $data =~ s/^\s*\@?$nick\s*//;
- $data = "\@$nick " . $data;
+ if ( Irssi::settings_get_bool("twirssi_replies_autonick") ) {
- if ( Irssi::settings_get_str("short_url_provider") ) {
- foreach my $url ( $data =~ /(https?:\/\/\S+[\w\/])/g ) {
- eval {
- my $short = makeashorterlink($url);
- $data =~ s/\Q$url/$short/g;
- };
+ # remove any @nick at the beginning of the reply, as we'll add it anyway
+ $data =~ s/^\s*\@?$nick\s*//;
+ $data = "\@$nick " . $data;
+ }
+
+ if ( &too_long( $data, 1 ) ) {
+ if ( Irssi::settings_get_str("short_url_provider") ) {
+ foreach my $url ( $data =~ /(https?:\/\/\S+[\w\/])/g ) {
+ eval {
+ my $short = makeashorterlink($url);
+ $data =~ s/\Q$url/$short/g;
+ };
+ }
}
}
return if &too_long($data);
+ my $success = 1;
eval {
unless (
$twits{$username}->update(
)
{
¬ice("Update failed");
- return;
+ $success = 0;
}
};
+ return unless $success;
if ($@) {
- ¬ice("Update caused an error. Aborted");
+ ¬ice("Update caused an error: $@. Aborted");
return;
}
return;
}
+ my $success = 1;
eval {
unless ( $twit->$api_name($data) )
{
¬ice("$api_name failed");
- return;
+ $success = 0;
}
};
+ return unless $success;
if ($@) {
¬ice("$api_name caused an error. Aborted.");
my ( $data, $server, $win ) = @_;
$data =~ s/^\s+|\s+$//g;
+ $data = $user unless $data;
return unless &valid_username($data);
- if ($data) {
- ¬ice("Logging out $data...");
- $twits{$data}->end_session();
- delete $twits{$data};
+ ¬ice("Logging out $data...");
+ $twits{$data}->end_session();
+ delete $twits{$data};
+ undef $twit;
+ if ( keys %twits ) {
+ &cmd_switch( ( keys %twits )[0], $server, $win );
} else {
- ¬ice("Logging out $user...");
- $twit->end_session();
- undef $twit;
- delete $twits{$user};
- if ( keys %twits ) {
- &cmd_switch( ( keys %twits )[0], $server, $win );
- } else {
- Irssi::timeout_remove($poll) if $poll;
- undef $poll;
- }
+ Irssi::timeout_remove($poll) if $poll;
+ undef $poll;
}
}
%friends = %nicks = ();
- $twit = Net::Twitter->new(
+ $twit = Net::Identica->new(
username => $user,
password => $pass,
source => "twirssi"
my ( $data, $server, $win ) = @_;
unless ( $twit and $twit->can('search') ) {
- ¬ice("ERROR: Your version of Net::Twitter ($Net::Twitter::VERSION) "
+ ¬ice("ERROR: Your version of Net::Identica ($Net::Identica::VERSION) "
. "doesn't support searches." );
return;
}
$data =~ s/^\s+|\s+$//;
$data = lc $data;
+
+ unless ($data) {
+ ¬ice("Usage: /twitter_subscribe <topic>");
+ return;
+ }
+
if ( exists $id_map{__searches}{$user}{$data} ) {
¬ice("Already had a subscription for '$data'");
return;
my ( $data, $server, $win ) = @_;
unless ( $twit and $twit->can('search') ) {
- ¬ice("ERROR: Your version of Net::Twitter ($Net::Twitter::VERSION) "
+ ¬ice("ERROR: Your version of Net::Identica ($Net::Identica::VERSION) "
. "doesn't support searches." );
return;
}
$data =~ s/^\s+|\s+$//;
$data = lc $data;
+
+ unless ($data) {
+ ¬ice("Usage: /twitter_unsubscribe <topic>");
+ return;
+ }
+
unless ( exists $id_map{__searches}{$user}{$data} ) {
¬ice("No subscription found for '$data'");
return;
return;
}
- if ( not -x "/usr/bin/md5sum" and not $data ) {
- ¬ice(
-"/usr/bin/md5sum can't be found - try '/twirssi_upgrade nomd5' to skip MD5 verification"
- );
- return;
- }
-
my $md5;
unless ($data) {
eval { use Digest::MD5; };
};
if ($@) {
- print $fh "type:debug Error during friends_timeline call. Aborted.\n";
+ print $fh
+ "type:debug Error during friends_timeline call: $@. Aborted.\n";
return 1;
}
foreach my $t ( reverse @$tweets ) {
my $text = decode_entities( $t->{text} );
- $text =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cO/g;
- $text =~ s/[\n\r]/ /g;
+ $text = &hilight($text);
my $reply = "tweet";
if ( Irssi::settings_get_bool("show_reply_context")
and $t->{in_reply_to_screen_name} ne $username
if ($context) {
my $ctext = decode_entities( $context->{text} );
- $ctext =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cO/g;
- $ctext =~ s/[\n\r]/ /g;
+ $ctext = &hilight($ctext);
printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
$context->{id}, $username,
$context->{user}{screen_name}, $ctext;
print $fh "type:debug request to get context failed: $@";
} else {
print $fh
-"type:debug Failed to get context from $t->{in_reply_to_screen_name}"
+"type:debug Failed to get context from $t->{in_reply_to_screen_name}\n"
if &debug;
}
}
if exists $friends{ $t->{user}{screen_name} };
my $text = decode_entities( $t->{text} );
- $text =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cO/g;
- $text =~ s/[\n\r]/ /g;
+ $text = &hilight($text);
printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
$t->{id}, $username, $t->{user}{screen_name}, $text;
}
foreach my $t ( reverse @$tweets ) {
my $text = decode_entities( $t->{text} );
- $text =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cO/g;
- $text =~ s/[\n\r]/ /g;
+ $text = &hilight($text);
printf $fh "id:%d account:%s nick:%s type:dm %s\n",
$t->{id}, $username, $t->{sender_screen_name}, $text;
}
if ( $obj->can('search') and $id_map{__searches}{$username} ) {
my $search;
foreach my $topic ( sort keys %{ $id_map{__searches}{$username} } ) {
+ print $fh "type:debug searching for $topic since ",
+ "$id_map{__searches}{$username}{$topic}\n";
eval {
$search = $obj->search(
{
unless ( $search->{max_id} ) {
print $fh
-"type:debug Invalid search results when searching for $topic. Aborted.\n";
+"type:debug Invalid search results when searching for $topic.",
+ " Aborted.\n";
return 1;
}
foreach my $t ( reverse @{ $search->{results} } ) {
my $text = decode_entities( $t->{text} );
- $text =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cO/g;
- $text =~ s/(^|\W)\#([-\w]+)/$1\cC5\#$2\cO/g;
- $text =~ s/[\n\r]/ /g;
+ $text = &hilight($text);
printf $fh "id:%d account:%s nick:%s type:search topic:%s %s\n",
$t->{id}, $username, $t->{from_user}, $topic, $text;
}
}
}
- next if exists $meta{id} and exists $tweet_cache{ $meta{id} };
- $tweet_cache{ $meta{id} } = time;
+ if ( not $meta{type} or $meta{type} ne 'searchid' ) {
+ next if exists $meta{id} and exists $tweet_cache{ $meta{id} };
+ $tweet_cache{ $meta{id} } = time;
+ }
+
my $account = "";
if ( $meta{account} ne $user ) {
$account = "$meta{account}: ";
my $hilight_color =
$irssi_to_mirc_colors{ Irssi::settings_get_str("hilight_color") };
- if ( $_ =~ /\@($meta{account})\W/ ) {
+ if ( ( $_ =~ /\@$meta{account}\W/i )
+ && Irssi::settings_get_bool("twirssi_hilights") )
+ {
$meta{nick} = "\cC$hilight_color$meta{nick}\cO";
$hilight = MSGLEVEL_HILIGHT;
}
$meta{type}, $account, $meta{topic},
$meta{nick}, $marker, $_
];
+ if ( $meta{id} >
+ $id_map{__searches}{ $meta{account} }{ $meta{topic} } )
+ {
+ $id_map{__searches}{ $meta{account} }{ $meta{topic} } =
+ $meta{id};
+ }
} elsif ( $meta{type} eq 'dm' ) {
push @lines,
[
$meta{type}, $account, $meta{nick}, $_
];
} elsif ( $meta{type} eq 'searchid' ) {
- $id_map{__searches}{ $meta{account} }{ $meta{topic} } =
- $meta{id};
- print "Search '$meta{topic}' id set to $meta{id}" if &debug;
+ print "Search '$meta{topic}' returned id $meta{id}" if &debug;
+ if ( $meta{id} >=
+ $id_map{__searches}{ $meta{account} }{ $meta{topic} } )
+ {
+ $id_map{__searches}{ $meta{account} }{ $meta{topic} } =
+ $meta{id};
+ } elsif (&debug) {
+ print "Search '$meta{topic}' returned invalid id $meta{id}";
+ }
} elsif ( $meta{type} eq 'error' ) {
push @lines, [ MSGLEVEL_MSGS, $_ ];
} elsif ( $meta{type} eq 'debug' ) {
close FILE;
- if ( $attempt < 12 ) {
+ if ( $attempt < 24 ) {
Irssi::timeout_add_once( 5000, 'monitor_child',
[ $filename, $attempt + 1 ] );
} else {
- ¬ice("Giving up on polling $filename");
+ print "Giving up on polling $filename" if &debug;
unlink $filename unless &debug;
+
+ return unless Irssi::settings_get_bool("twirssi_notify_timeouts");
+
+ my $since;
+ my @time = localtime($last_poll);
+ if ( time - $last_poll < 24 * 60 * 60 ) {
+ $since = sprintf( "%d:%02d", @time[ 2, 1 ] );
+ } else {
+ $since = scalar localtime($last_poll);
+ }
+ ¬ice("Haven't been able to get updated tweets since $since");
}
}
return 60;
}
+sub hilight {
+ my $text = shift;
+
+ if ( Irssi::settings_get_str("twirssi_nick_color") ) {
+ my $c = Irssi::settings_get_str("twirssi_nick_color");
+ $c = $irssi_to_mirc_colors{$c};
+ $text =~ s/(^|\W)\@([-\w]+)/$1\cC$c\@$2\cO/g if $c;
+ }
+ if ( Irssi::settings_get_str("twirssi_topic_color") ) {
+ my $c = Irssi::settings_get_str("twirssi_topic_color");
+ $c = $irssi_to_mirc_colors{$c};
+ $text =~ s/(^|\W)\#([-\w]+)/$1\cC$c\#$2\cO/g if $c;
+ }
+ $text =~ s/[\n\r]/ /g;
+
+ return $text;
+}
+
Irssi::signal_add( "send text", "event_send_text" );
Irssi::theme_register(
Irssi::settings_add_str( "twirssi", "twitter_passwords", undef );
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::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", "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::settings_add_bool( "twirssi", "twirssi_hilights", 1 );
Irssi::settings_add_bool( "twirssi", "tweet_window_input", 0 );
$last_poll = time - &get_poll_time;
"twirssi_version",
sub {
¬ice("Twirssi v$VERSION (r$REV); "
- . "Net::Twitter v$Net::Twitter::VERSION. "
+ . "Net::Identica v$Net::Identica::VERSION. "
. "JSON in use: "
. JSON::Any::handler()
. ". See details at http://twirssi.com/" );
projects / twirssi-net-twitter-lite.git / blobdiff