use File::Temp;
use LWP::Simple;
use Data::Dumper;
-use Net::Twitter;
$Data::Dumper::Indent = 1;
use vars qw($VERSION %IRSSI);
-$VERSION = "2.1.3beta";
-my ($REV) = '$Rev: 546 $' =~ /(\d+)/;
+$VERSION = "2.2.0";
+my ($REV) = '$Rev: 559 $' =~ /(\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-03-13 10:37:30 -0700 (Fri, 13 Mar 2009) $',
+ changed => '$Date: 2009-03-16 15:34:12 -0700 (Mon, 16 Mar 2009) $',
);
my $window;
my $twit;
my %twits;
my $user;
+my $defservice;
my $poll;
my $last_poll;
my %nicks;
return;
}
- return unless &valid_username($username);
+ return unless $username = &valid_username($username);
eval {
if ( $twits{$username}
return;
}
- &cmd_tweet_as( "$user $data", $server, $win );
+ &cmd_tweet_as( "$user\@$defservice $data", $server, $win );
}
sub cmd_tweet_as {
return;
}
- return unless &valid_username($username);
+ return unless $username = &valid_username($username);
$data = &shorten($data);
return;
}
- return unless &valid_username($username);
+ return unless $username = &valid_username($username);
my $nick;
$id =~ s/[^\w\d\-:]+//g;
my ( $data, $server, $win ) = @_;
$data =~ s/^\s+|\s+$//g;
+ $data = &normalize_username($data);
if ( exists $twits{$data} ) {
¬ice("Switching to $data");
$twit = $twits{$data};
- $user = $data;
+ if ( $data =~ /(.*)\@(.*)/ ) {
+ $user = $1;
+ $defservice = $2;
+ } else {
+ ¬ice("Couldn't figure out what service '$data' is on");
+ }
} else {
¬ice("Unknown user $data");
}
$data =~ s/^\s+|\s+$//g;
$data = $user unless $data;
- return unless &valid_username($data);
+ return unless $data = &valid_username($data);
¬ice("Logging out $data...");
$twits{$data}->end_session();
{
my @user = split /\s*,\s*/, $autouser;
my @pass = split /\s*,\s*/, $autopass;
-
+
# 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;
+ while ( $p =~ /\\$/ and @pass ) {
+ $p .= "," . shift @pass;
}
push @unescaped, $p;
}
%friends = %nicks = ();
- $twit = Net::Twitter->new(
+ my $service;
+ if ( $user =~ /^(.*)@(twitter|identica)$/ ) {
+ ( $user, $service ) = ( $1, $2 );
+ } else {
+ $service = Irssi::settings_get_str("twirssi_default_service");
+ }
+ $defservice = $service = ucfirst lc $service;
+
+ eval "use Net::$service";
+ if ($@) {
+ ¬ice(
+ "Failed to load Net::$service when trying to log in as $user: $@");
+ return;
+ }
+
+ $twit = "Net::$service"->new(
username => $user,
password => $pass,
source => "twirssi"
);
unless ( $twit->verify_credentials() ) {
- ¬ice("Login as $user failed");
+ ¬ice("Login as $user\@$service failed");
$twit = undef;
if ( keys %twits ) {
&cmd_switch( ( keys %twits )[0], $server, $win );
return;
}
- $twits{$user} = $twit;
+ $twits{"$user\@$service"} = $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...");
+ ¬ice("Logged in as $user\@$service, loading friends list...");
&load_friends();
¬ice( "loaded friends: ", scalar keys %friends );
if ( Irssi::settings_get_bool("twirssi_first_run") ) {
my $new_poll = time;
my $error = 0;
- $error += &do_updates( $fh, $user, $twit );
foreach ( keys %twits ) {
- next if $_ eq $user;
$error += &do_updates( $fh, $_, $twits{$_} );
}
printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
$context->{id}, $username,
$context->{user}{screen_name}, $ctext;
- if ($context->{truncated}) {
+ if ( $context->{truncated} and ref($obj) ne 'Net::Identica' ) {
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}";
+ $context->{id} . "-url", $username,
+ $context->{user}{screen_name},
+"http://twitter.com/$context->{user}{screen_name}/status/$context->{id}";
}
$reply = "reply";
} elsif ($@) {
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}) {
+ if ( $t->{truncated} and ref($obj) ne 'Net::Identica' ) {
printf $fh "id:%s account:%s nick:%s type:ellispis %s\n",
- $t->{id}."-url", $username,
- $t->{user}{screen_name},
+ $t->{id} . "-url", $username,
+ $t->{user}{screen_name},
"http://twitter.com/$t->{user}{screen_name}/status/$t->{id}";
}
}
$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}) {
+ if ( $t->{truncated} ) {
printf $fh "id:%s account:%s nick:%s type:ellispis %s\n",
- $t->{id}."-url", $username,
- $t->{user}{screen_name},
+ $t->{id} . "-url", $username,
+ $t->{user}{screen_name},
"http://twitter.com/$t->{user}{screen_name}/status/$t->{id}";
}
}
}
my $account = "";
- if ( $meta{account} ne $user ) {
- $account = "$meta{account}: ";
+ if ( lc $meta{account} ne lc "$user\@$defservice" ) {
+ $meta{account} =~ s/\@(\w+)$//;
+ my $service = $1;
+ if (
+ lc $service eq
+ lc Irssi::settings_get_str("twirssi_default_service") )
+ {
+ $account = "$meta{account}: ";
+ } else {
+ $account = "$meta{account}\@$service: ";
+ }
}
my $marker = "";
my $hilight_color =
$irssi_to_mirc_colors{ Irssi::settings_get_str("hilight_color") };
- if ( ( $_ =~ /\@$meta{account}\W/i )
- && Irssi::settings_get_bool("twirssi_hilights") )
+ my $nick =
+ '@' . substr( $meta{account}, 0, index( $meta{account}, "@" ) );
+ if ( $_ =~ /\Q$nick\E(?:\W|$)/i
+ and Irssi::settings_get_bool("twirssi_hilights") )
{
$meta{nick} = "\cC$hilight_color$meta{nick}\cO";
$hilight = MSGLEVEL_HILIGHT;
];
} elsif ( $meta{type} eq 'ellispis' ) {
push @lines,
- [
- MSGLEVEL_PUBLIC,
- "tweet", $account, $meta{nick}, "", $_
- ];
+ [ MSGLEVEL_PUBLIC, "tweet", $account, $meta{nick}, "", $_ ];
} elsif ( $meta{type} eq 'search' ) {
push @lines,
[
sub valid_username {
my $username = shift;
+ $username = &normalize_username($username);
+
unless ( exists $twits{$username} ) {
¬ice("Unknown username $username");
- return 0;
+ return undef;
}
- return 1;
+ return $username;
}
sub logged_in {
)
{ # /twitter_reply gets a nick:num
$word =~ s/^@//;
- @$complist = map { "$_:$id_map{__indexes}{$_}" }
- sort {$nicks{$b} <=> $nicks{$a}}
+ @$complist = map { "$_:$id_map{__indexes}{$_}" }
+ sort { $nicks{$b} <=> $nicks{$a} }
grep /^\Q$word/i,
keys %{ $id_map{__indexes} };
}
my $data = shift;
my $provider = Irssi::settings_get_str("short_url_provider");
- if ( &too_long( $data, 1 ) and $provider )
+ if (
+ (
+ Irssi::settings_get_bool("twirssi_always_shorten")
+ or &too_long( $data, 1 )
+ )
+ and $provider
+ )
{
my @args;
- if ($provider eq 'Bitly') {
- @args[1,2] = split ',', Irssi::settings_get_str("short_url_args"), 2;
- unless (@args == 3) {
- &ccrap("WWW::Shorten::Bitly requires a username and API key.",
- "Set short_url_args to username,API_key or change your",
- "short_url_provider.");
+ if ( $provider eq 'Bitly' ) {
+ @args[ 1, 2 ] = split ',',
+ Irssi::settings_get_str("short_url_args"), 2;
+ unless ( @args == 3 ) {
+ &ccrap(
+ "WWW::Shorten::Bitly requires a username and API key.",
+ "Set short_url_args to username,API_key or change your",
+ "short_url_provider."
+ );
return $data;
}
}
return $data;
}
+sub normalize_username {
+ my $user = shift;
+
+ my ( $username, $service ) = split /\@/, $user, 2;
+ if ($service) {
+ $service = ucfirst lc $service;
+ } else {
+ $service =
+ ucfirst lc Irssi::settings_get_str("twirssi_default_service");
+ unless ( exists $twits{"$username\@$service"} ) {
+ $service = undef;
+ foreach my $t ( sort keys %twits ) {
+ next unless $t =~ /^\Q$username\E\@(Twitter|Identica)/;
+ $service = $1;
+ last;
+ }
+
+ unless ($service) {
+ ¬ice("Can't find a logged in user '$user'");
+ }
+ }
+ }
+
+ return "$username\@$service";
+}
+
Irssi::signal_add( "send text", "event_send_text" );
Irssi::theme_register(
);
Irssi::settings_add_int( "twirssi", "twitter_poll_interval", 300 );
-Irssi::settings_add_str( "twirssi", "twitter_window", "twitter" );
-Irssi::settings_add_str( "twirssi", "bitlbee_server", "bitlbee" );
-Irssi::settings_add_str( "twirssi", "short_url_provider", "TinyURL" );
-Irssi::settings_add_str( "twirssi", "short_url_args", undef );
-Irssi::settings_add_str( "twirssi", "twitter_usernames", undef );
-Irssi::settings_add_str( "twirssi", "twitter_passwords", undef );
-Irssi::settings_add_str( "twirssi", "twirssi_nick_color", "%B" );
-Irssi::settings_add_str( "twirssi", "twirssi_topic_color", "%r" );
+Irssi::settings_add_str( "twirssi", "twitter_window", "twitter" );
+Irssi::settings_add_str( "twirssi", "bitlbee_server", "bitlbee" );
+Irssi::settings_add_str( "twirssi", "short_url_provider", "TinyURL" );
+Irssi::settings_add_str( "twirssi", "short_url_args", undef );
+Irssi::settings_add_str( "twirssi", "twitter_usernames", undef );
+Irssi::settings_add_str( "twirssi", "twitter_passwords", undef );
+Irssi::settings_add_str( "twirssi", "twirssi_default_service", "Twitter" );
+Irssi::settings_add_str( "twirssi", "twirssi_nick_color", "%B" );
+Irssi::settings_add_str( "twirssi", "twirssi_topic_color", "%r" );
Irssi::settings_add_str( "twirssi", "twirssi_location",
".irssi/scripts/twirssi.pl" );
Irssi::settings_add_str( "twirssi", "twirssi_replies_store",
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", "twirssi_always_shorten", 0 );
Irssi::settings_add_bool( "twirssi", "tweet_window_input", 0 );
$last_poll = time - &get_poll_time;
Irssi::command_bind( "twitter_unsubscribe", "cmd_del_search" );
Irssi::command_bind( "twitter_list_subscriptions", "cmd_list_search" );
Irssi::command_bind( "twirssi_upgrade", "cmd_upgrade" );
+ Irssi::command_bind( "twitter_updates", "get_updates" );
if ( Irssi::settings_get_bool("twirssi_use_reply_aliases") ) {
Irssi::command_bind( "reply", "cmd_reply" );
Irssi::command_bind( "reply_as", "cmd_reply_as" );
"twirssi_dump",
sub {
print "twits: ", join ", ",
- map { "u: $_->{username}" } values %twits;
+ map { "u: $_->{username}\@" . ref($_) } values %twits;
+ print "selected: $user\@$defservice";
print "friends: ", join ", ", sort keys %friends;
print "nicks: ", join ", ", sort keys %nicks;
print "searches: ", Dumper \%{ $id_map{__searches} };
sub { ¬ice("Stopped following $_[0]"); delete $nicks{ $_[0] }; }
)
);
- Irssi::command_bind( "twitter_updates", "get_updates" );
+ Irssi::command_bind(
+ "twitter_device_updates",
+ &gen_cmd(
+ "/twitter_device_updates none|im|sms",
+ "update_delivery_device",
+ sub { ¬ice("Device updated to $_[0]"); }
+ )
+ );
Irssi::signal_add_last( 'complete word' => \&sig_complete );
¬ice(" %Y<%C(%B^%C)%N TWIRSSI v%R$VERSION%N (r$REV)");
eval "use WWW::Shorten::$provider;";
if ($@) {
- ¬ice( "Failed to load WWW::Shorten::$provider - either clear",
- "short_url_provider or install the CPAN module");
+ ¬ice(
+ "Failed to load WWW::Shorten::$provider - either clear",
+ "short_url_provider or install the CPAN module"
+ );
}
}
projects / twirssi-net-twitter-lite.git / blobdiff