use File::Temp;
use LWP::Simple;
use Data::Dumper;
+use Net::Identica;
use Net::Twitter;
$Data::Dumper::Indent = 1;
use vars qw($VERSION %IRSSI);
-$VERSION = "2.0.2";
-my ($REV) = '$Rev: 452 $' =~ /(\d+)/;
+$VERSION = "2.0.6";
+my ($REV) = '$Rev: 483 $' =~ /(\d+)/;
%IRSSI = (
authors => 'Dan Boger',
contact => 'zigdon@gmail.com',
name => 'twirssi',
- description => 'Send twitter updates using /tweet. '
+ description => 'Send twitter/identica updates using /tweet or /dent. '
. 'Can optionally set your bitlbee /away message to same',
license => 'GNU GPL v2',
url => 'http://twirssi.com',
- changed => '$Date: 2009-02-03 10:38:51 -0800 (Tue, 03 Feb 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 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;
}
$data = "\@$nick " . $data;
}
- 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;
- };
+ 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.");
}
}
-sub cmd_logout {
+sub cmd_logout_twitter {
+ my ( $data, $server, $win ) = @_;
+
+ $data =~ s/^\s+|\s+$//g;
+ $data = $user unless $data;
+ return unless &valid_username($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 {
+ Irssi::timeout_remove($poll) if $poll;
+ undef $poll;
+ }
+}
+
+sub cmd_logout_identica {
my ( $data, $server, $win ) = @_;
$data =~ s/^\s+|\s+$//g;
}
}
-sub cmd_login {
+sub cmd_login_twitter {
my ( $data, $server, $win ) = @_;
my $pass;
if ($data) {
( $user, $pass ) = split ' ', $data, 2;
- } elsif ( my $autouser = Irssi::settings_get_str("twitter_usernames")
- and my $autopass = Irssi::settings_get_str("twitter_passwords") )
+ } elsif ( my $autouser = Irssi::settings_get_str("twitter_usernames_twitter")
+ and my $autopass = Irssi::settings_get_str("twitter_passwords_twitter") )
{
my @user = split /\s*,\s*/, $autouser;
my @pass = split /\s*,\s*/, $autopass;
while ( @user and @pass ) {
$u = shift @user;
$p = shift @pass;
- &cmd_login("$u $p");
+ &cmd_login_twitter("$u $p");
}
return;
}
} else {
¬ice("/twitter_login requires either a username and password "
- . "or twitter_usernames and twitter_passwords to be set." );
+ . "or twitter_usernames_twitter and twitter_passwords_twitter to be set." );
return;
}
}
}
-sub cmd_add_search {
+sub cmd_login_identica {
+ my ( $data, $server, $win ) = @_;
+ my $pass;
+ if ($data) {
+ ( $user, $pass ) = split ' ', $data, 2;
+ } elsif ( my $autouser = Irssi::settings_get_str("twitter_usernames_identica")
+ and my $autopass = Irssi::settings_get_str("twitter_passwords_identica") )
+ {
+ my @user = split /\s*,\s*/, $autouser;
+ my @pass = split /\s*,\s*/, $autopass;
+ if ( @user != @pass ) {
+ ¬ice("Number of usernames doesn't match "
+ . "the number of passwords - auto-login failed" );
+ } else {
+ my ( $u, $p );
+ while ( @user and @pass ) {
+ $u = shift @user;
+ $p = shift @pass;
+ &cmd_login_identica("$u $p");
+ }
+ return;
+ }
+ } else {
+ ¬ice("/identica_login requires either a username and password "
+ . "or twitter_usernames_identica and twitter_passwords_identica to be set." );
+ return;
+ }
+
+ %friends = %nicks = ();
+
+ $twit = Net::Identica->new(
+ username => $user,
+ password => $pass,
+ source => "twirssi"
+ );
+
+ unless ( $twit->verify_credentials() ) {
+ ¬ice("Login as $user failed");
+ $twit = undef;
+ if ( keys %twits ) {
+ &cmd_switch( ( keys %twits )[0], $server, $win );
+ }
+ return;
+ }
+
+ if ($twit) {
+ 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}"
+ );
+ $twit = undef;
+ return;
+ }
+
+ $twits{$user} = $twit;
+ Irssi::timeout_remove($poll) if $poll;
+ $poll = Irssi::timeout_add( &get_poll_time * 1000, \&get_updates, "" );
+ ¬ice("Logged in as $user, loading friends list...");
+ &load_friends();
+ ¬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_friend twirssi." );
+ }
+ }
+ %nicks = %friends;
+ $nicks{$user} = 0;
+ &get_updates;
+ } else {
+ ¬ice("Login failed");
+ }
+}
+
+sub cmd_add_search_twitter {
my ( $data, $server, $win ) = @_;
unless ( $twit and $twit->can('search') ) {
¬ice("Added subscription for '$data'");
}
-sub cmd_del_search {
+sub cmd_add_search_identica {
+ my ( $data, $server, $win ) = @_;
+
+ unless ( $twit and $twit->can('search') ) {
+ ¬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;
+ }
+
+ $id_map{__searches}{$user}{$data} = 1;
+ ¬ice("Added subscription for '$data'");
+}
+
+sub cmd_del_search_twitter {
my ( $data, $server, $win ) = @_;
unless ( $twit and $twit->can('search') ) {
¬ice("Removed subscription for '$data'");
}
+sub cmd_del_search_identica {
+ my ( $data, $server, $win ) = @_;
+
+ unless ( $twit and $twit->can('search') ) {
+ ¬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: /identica_unsubscribe <topic>");
+ return;
+ }
+
+ unless ( exists $id_map{__searches}{$user}{$data} ) {
+ ¬ice("No subscription found for '$data'");
+ return;
+ }
+
+ delete $id_map{__searches}{$user}{$data};
+ ¬ice("Removed subscription for '$data'");
+}
+
sub cmd_list_search {
my ( $data, $server, $win ) = @_;
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;
}
}
}
- 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/i ) {
+ 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,
[
} elsif (&debug) {
print "Search '$meta{topic}' returned invalid id $meta{id}";
}
- print "Search '$meta{topic}' id set to $meta{id}" if &debug;
} 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");
}
}
sub hilight {
my $text = shift;
- $text =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cO/g;
- $text =~ s/(^|\W)\#([-\w]+)/$1\cC5\#$2\cO/g;
+ 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::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_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;
Irssi::command_bind( "dm", "cmd_direct" );
Irssi::command_bind( "dm_as", "cmd_direct_as" );
Irssi::command_bind( "tweet", "cmd_tweet" );
+ Irssi::command_bind( "dent", "cmd_tweet" );
Irssi::command_bind( "tweet_as", "cmd_tweet_as" );
+ Irssi::command_bind( "dent_as", "cmd_tweet_as" );
Irssi::command_bind( "twitter_reply", "cmd_reply" );
+ Irssi::command_bind( "identica_reply", "cmd_reply" );
Irssi::command_bind( "twitter_reply_as", "cmd_reply_as" );
- Irssi::command_bind( "twitter_login", "cmd_login" );
- Irssi::command_bind( "twitter_logout", "cmd_logout" );
+ Irssi::command_bind( "identica_reply_as", "cmd_reply_as" );
+ Irssi::command_bind( "twitter_login", "cmd_login_twitter" );
+ Irssi::command_bind( "twitter_logout", "cmd_logout_twitter" );
+ Irssi::command_bind( "identica_login", "cmd_login_identica" );
+ Irssi::command_bind( "identica_logout", "cmd_logout_identica" );
Irssi::command_bind( "twitter_switch", "cmd_switch" );
- Irssi::command_bind( "twitter_subscribe", "cmd_add_search" );
- Irssi::command_bind( "twitter_unsubscribe", "cmd_del_search" );
+ Irssi::command_bind( "twitter_subscribe", "cmd_add_search_twitter" );
+ Irssi::command_bind( "identica_subscribe", "cmd_add_search_identica" );
+ Irssi::command_bind( "twitter_unsubscribe", "cmd_del_search_twitter" );
+ Irssi::command_bind( "identica_unsubscribe", "cmd_del_search_identica" );
Irssi::command_bind( "twitter_list_subscriptions", "cmd_list_search" );
Irssi::command_bind( "twirssi_upgrade", "cmd_upgrade" );
if ( Irssi::settings_get_bool("twirssi_use_reply_aliases") ) {
"twirssi_version",
sub {
¬ice("Twirssi v$VERSION (r$REV); "
- . "Net::Twitter v$Net::Twitter::VERSION. "
+ . "Net::Identica v$Net::Identica::VERSION. "
+ . "Net::Twitter v$Net::Twitter::VERSION."
. "JSON in use: "
. JSON::Any::handler()
. ". See details at http://twirssi.com/" );
¬ice(" %Y<%C(%B^%C)%N TWIRSSI v%R$VERSION%N (r$REV)");
¬ice(" %C(_(\\%N http://twirssi.com/ for full docs");
¬ice(
- " %Y||%C `%N Log in with /twitter_login, send updates with /tweet");
+ " %Y||%C `%N Log in with /twitter_login or /identica_login, send updates with /tweet or /dent");
my $file = Irssi::settings_get_str("twirssi_replies_store");
if ( $file and -r $file ) {
}
}
- if ( my $autouser = Irssi::settings_get_str("twitter_usernames")
- and my $autopass = Irssi::settings_get_str("twitter_passwords") )
+ if ( my $autouser = Irssi::settings_get_str("twitter_usernames_twitter")
+ and my $autopass = Irssi::settings_get_str("twitter_passwords_twitter") )
{
- &cmd_login();
+ &cmd_login_twitter();
+ }
+
+ if ( my $autouser = Irssi::settings_get_str("twitter_usernames_identica")
+ and my $autopass = Irssi::settings_get_str("twitter_passwords_identica") )
+ {
+ &cmd_login_identica();
}
} else {
->print( "Create a window named "
. Irssi::settings_get_str('twitter_window')
. " or change the value of twitter_window. Then, reload twirssi." );
-}
-
-# vim: set sts=4 expandtab:
+}
\ No newline at end of file
projects / twirssi-net-twitter-lite.git / blobdiff