From e12967f01425466111483936dc139aa2389cdc78 Mon Sep 17 00:00:00 2001 From: Dan Boger Date: Sat, 14 Mar 2009 14:06:19 -0700 Subject: [PATCH] r549 - Initial support for Net::Identica --- twirssi.pl | 116 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 86 insertions(+), 30 deletions(-) diff --git a/twirssi.pl b/twirssi.pl index ced5f95..9d88cad 100644 --- a/twirssi.pl +++ b/twirssi.pl @@ -6,13 +6,12 @@ use HTML::Entities; 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: 548 $' =~ /(\d+)/; +my ($REV) = '$Rev: 549 $' =~ /(\d+)/; %IRSSI = ( authors => 'Dan Boger', contact => 'zigdon@gmail.com', @@ -21,13 +20,14 @@ my ($REV) = '$Rev: 548 $' =~ /(\d+)/; . 'Can optionally set your bitlbee /away message to same', license => 'GNU GPL v2', url => 'http://twirssi.com', - changed => '$Date: 2009-03-13 10:45:47 -0700 (Fri, 13 Mar 2009) $', + changed => '$Date: 2009-03-14 14:06:07 -0700 (Sat, 14 Mar 2009) $', ); my $window; my $twit; my %twits; my $user; +my $defservice; my $poll; my $last_poll; my %nicks; @@ -79,7 +79,7 @@ sub cmd_direct_as { return; } - return unless &valid_username($username); + return unless $username = &valid_username($username); eval { if ( $twits{$username} @@ -115,7 +115,7 @@ sub cmd_tweet { return; } - &cmd_tweet_as( "$user $data", $server, $win ); + &cmd_tweet_as( "$user\@$defservice $data", $server, $win ); } sub cmd_tweet_as { @@ -132,7 +132,7 @@ sub cmd_tweet_as { return; } - return unless &valid_username($username); + return unless $username = &valid_username($username); $data = &shorten($data); @@ -203,7 +203,7 @@ sub cmd_reply_as { return; } - return unless &valid_username($username); + return unless $username = &valid_username($username); my $nick; $id =~ s/[^\w\d\-:]+//g; @@ -298,10 +298,16 @@ sub cmd_switch { 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"); } @@ -312,7 +318,7 @@ sub cmd_logout { $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(); @@ -368,14 +374,29 @@ sub cmd_login { %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 ); @@ -393,10 +414,10 @@ sub cmd_login { 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") ) { @@ -646,9 +667,7 @@ sub get_updates { 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{$_} ); } @@ -731,7 +750,7 @@ sub do_updates { 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}, @@ -751,7 +770,7 @@ 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; - 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}, @@ -892,8 +911,17 @@ sub monitor_child { } 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 = ""; @@ -1114,12 +1142,14 @@ sub too_long { 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 { @@ -1238,6 +1268,30 @@ sub shorten { return $data; } +sub normalize_username { + my $user = shift; + + my ( $username, $service ) = split /\@/, $user, 2; + unless ($service) { + $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( @@ -1251,14 +1305,15 @@ 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", @@ -1312,7 +1367,8 @@ if ($window) { "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} }; -- 2.39.5