X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/blobdiff_plain/e0574a5736ac56d23dc3fa2402fd5b632b795687..4ef79707e421b14b5cb40a33ed78fdf9da4ed2c7:/twirssi.pl diff --git a/twirssi.pl b/twirssi.pl index 2a1965e..7099013 100644 --- a/twirssi.pl +++ b/twirssi.pl @@ -8,12 +8,12 @@ use LWP::Simple; use Data::Dumper; use Encode; use POSIX qw/:sys_wait_h/; -use Net::Twitter qw/3.05/; +use Net::Twitter::Lite $Data::Dumper::Indent = 1; use vars qw($VERSION %IRSSI); -$VERSION = "2.4.2beta"; +$VERSION = "2.4.2"; %IRSSI = ( authors => 'Dan Boger', contact => 'zigdon@gmail.com', @@ -497,75 +497,10 @@ sub cmd_login { } $defservice = $service = ucfirst lc $service; - if ( $service eq 'Twitter' - and Irssi::settings_get_bool("twirssi_use_oauth") ) - { - print "Attempting OAuth for $user\@$service" if &debug; - eval { - if ( $service eq 'Identica' ) - { - $twit = Net::Twitter->new( - identica => 1, - traits => [ 'API::REST', 'API::Search' ], - source => "twirssi", - ssl => !Irssi::settings_get_bool("twirssi_avoid_ssl"), - ); - } else { - $twit = Net::Twitter->new( - traits => [ 'API::REST', 'OAuth', 'API::Search' ], - consumer_key => 'BZVAvBma4GxdiRwXIvbnw', - consumer_secret => - '0T5kahwLyb34vciGZsgkA9lsjtGCQ05vxVE2APXM', - source => "twirssi", - ssl => !Irssi::settings_get_bool("twirssi_avoid_ssl"), - ); - } - }; - - if ($twit) { - if ( open( OAUTH, Irssi::settings_get_str("twirssi_oauth_store") ) ) - { - while () { - chomp; - next unless m/$user\@$service (\S+) (\S+)/i; - print "Trying cached oauth creds for $user\@$service" - if &debug; - $twit->access_token($1); - $twit->access_token_secret($2); - last; - } - close OAUTH; - } - - unless ( $twit->authorized ) { - my $url; - eval { $url = $twit->get_authorization_url; }; - - if ($@) { - ¬ice( "ERROR: Failed to get OAuth authorization_url. " . - "Try again later."); - return; - } - ¬ice( "Twirssi not autorized to access $service for $user.", - "Please authorize at the following url, then enter the pin", - "supplied with /twirssi_oauth $user\@$service ", - $url - ); - - $oauth{pending}{"$user\@$service"} = $twit; - return; - } - } - } else { - $twit = Net::Twitter->new( - $service eq 'Identica' ? ( identica => 1 ) : (), - username => $user, - password => $pass, - source => "twirssi", - ssl => Irssi::settings_get_bool("twirssi_avoid_ssl") ? 0 : 1, - ); - } - + $twit = Net::Twitter::Lite->new( + username => $user, + password => $pass, + ); unless ($twit) { ¬ice("Failed to create object! Aborting."); return; @@ -678,7 +613,7 @@ sub verify_twitter_object { $poll = Irssi::timeout_add( &get_poll_time * 1000, \&get_updates, "" ); ¬ice("Logged in as $user\@$service, loading friends list..."); &load_friends(); - ¬ice( "loaded friends: ". scalar keys %friends ); + ¬ice( "loaded friends: " . scalar keys %friends ); if ( Irssi::settings_get_bool("twirssi_first_run") ) { Irssi::settings_set_bool( "twirssi_first_run", 0 ); } @@ -1093,9 +1028,31 @@ sub do_updates { return undef; } + my @ignore_tags = + Irssi::settings_get_str("twirssi_ignored_tags") + ? split /\s*,\s*/, Irssi::settings_get_str("twirssi_ignored_tags") + : (); + my @strip_tags = + Irssi::settings_get_str("twirssi_stripped_tags") + ? split /\s*,\s*/, Irssi::settings_get_str("twirssi_stripped_tags") + : (); foreach my $t ( reverse @$tweets ) { my $text = &get_text( $t, $obj ); my $reply = "tweet"; + + my $match = 0; + foreach my $tag (@ignore_tags) { + next unless $text =~ /\b\Q$tag\E\b/i; + $match = 1; + $text = "(ignored: $tag) $text" if &debug; + last; + } + next if not &debug and $match; + + foreach my $tag (@strip_tags) { + $text =~ s/\b\Q$tag\E\b//gi; + } + if ( Irssi::settings_get_bool("show_reply_context") and $t->{in_reply_to_screen_name} ne $username and $t->{in_reply_to_screen_name} @@ -1216,7 +1173,7 @@ sub do_updates { } $id_map{__searches}{$username}{$topic} = $search->{max_id}; - $topic =~ s/ /\\ /g; + $topic =~ s/ /%20/g; printf $fh "id:%s account:%s type:searchid topic:%s\n", $search->{max_id}, $username, $topic; @@ -1335,7 +1292,7 @@ sub monitor_child { foreach my $key (qw/id account nick type topic/) { if (s/^$key:((?:\S|\\ )+)\s*//) { $meta{$key} = $1; - $meta{$key} =~ s/\\ / /g; + $meta{$key} =~ s/%20/ /g; } } @@ -1373,8 +1330,7 @@ sub monitor_child { } my $marker = ""; - if ($meta{type} ne 'dm' and $meta{nick} and $meta{id} ) - { + if ( $meta{type} ne 'dm' and $meta{nick} and $meta{id} ) { $marker = ( $id_map{__indexes}{ $meta{nick} } + 1 ) % 100; $id_map{ lc $meta{nick} }[$marker] = $meta{id}; $id_map{__indexes}{ $meta{nick} } = $marker; @@ -1562,7 +1518,7 @@ sub monitor_child { q{ \\ a |}, q{ ',.__. ,__.-'/}, q{ '--/_.'----'`} - ); + ); $failwhale = 1; } @@ -1801,7 +1757,7 @@ sub get_text { if ( exists $tweet->{retweeted_status} ) { $text = "RT \@$tweet->{retweeted_status}{user}{screen_name}: " . "$tweet->{retweeted_status}{text}"; - } elsif ( $object->isa('Net::Twitter') ) { + } elsif ( $object->isa('Net::Twitter::Lite') ) { $text .= " -- http://twitter.com/$tweet->{user}{screen_name}" . "/status/$tweet->{id}"; } @@ -1835,6 +1791,8 @@ 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_ignored_tags", "" ); +Irssi::settings_add_str( "twirssi", "twirssi_stripped_tags", "" ); Irssi::settings_add_str( "twirssi", "twirssi_retweet_format", 'RT $n: "$t" ${-- $c$}' ); Irssi::settings_add_str( "twirssi", "twirssi_location", @@ -1924,8 +1882,8 @@ if ($window) { ¬ice( "Twirssi v$VERSION; " . ( - $Net::Twitter::VERSION - ? "Net::Twitter v$Net::Twitter::VERSION. " + $Net::Twitter::Lite::VERSION + ? "Net::Twitter v$Net::Twitter::Lite::VERSION. " : "" ) . ( @@ -1981,9 +1939,11 @@ if ($window) { ); Irssi::signal_add_last( 'complete word' => \&sig_complete ); - ¬ice(" %Y<%C(%B^%C)%N TWIRSSI v%R$VERSION%N", - " %C(_(\\%N http://twirssi.com/ for full docs", - " %Y||%C `%N Log in with /twitter_login, send updates with /tweet"); + ¬ice( + " %Y<%C(%B^%C)%N TWIRSSI v%R$VERSION%N", + " %C(_(\\%N http://twirssi.com/ for full docs", + " %Y||%C `%N Log in with /twitter_login, send updates with /tweet" + ); my $file = Irssi::settings_get_str("twirssi_replies_store"); if ( $file and -r $file ) {