From: Brian S. Stephan <bss@emptymatter.org>
Date: Wed, 14 Jan 2009 06:31:09 +0000 (-0600)
Subject: merge master 1.7.4 into working branch
X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/commitdiff_plain/4f42bf923dfe388f4e07af3bc3d78518a1192679?ds=inline;hp=-c

merge master 1.7.4 into working branch
---

4f42bf923dfe388f4e07af3bc3d78518a1192679
diff --combined twirssi.pl
index 6358591,282113c..1b78253
--- a/twirssi.pl
+++ b/twirssi.pl
@@@ -6,20 -6,13 +6,13 @@@ use HTML::Entities
  use File::Temp;
  use LWP::Simple;
  use Data::Dumper;
+ use Net::Twitter;
  $Data::Dumper::Indent = 1;
  
- BEGIN {
-     $ENV{JSON_ANY_ORDER} = "JSON Syck DWIW";
-     require JSON::Any;
-     import JSON::Any;
-     require Net::Twitter;
-     import Net::Twitter;
- }
- 
  use vars qw($VERSION %IRSSI);
  
- $VERSION = "1.7.3";
- my ($REV) = '$Rev: 354 $' =~ /(\d+)/;
+ $VERSION = "1.7.4";
+ my ($REV) = '$Rev: 358 $' =~ /(\d+)/;
  %IRSSI = (
      authors     => 'Dan Boger',
      contact     => 'zigdon@gmail.com',
@@@ -28,7 -21,7 +21,7 @@@
        . 'Can optionally set your bitlbee /away message to same',
      license => 'GNU GPL v2',
      url     => 'http://tinyurl.com/twirssi',
-     changed => '$Date: 2009-01-08 14:46:04 -0800 (Thu, 08 Jan 2009) $',
+     changed => '$Date: 2009-01-13 21:02:17 -0800 (Tue, 13 Jan 2009) $',
  );
  
  my $window;
@@@ -615,7 -608,8 +608,7 @@@ sub do_updates 
  
      foreach my $t ( reverse @$tweets ) {
          my $text = decode_entities( $t->{text} );
 -        $text =~ s/%/%%/g;
 -        $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
 +        $text =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cC/g;
          $text =~ s/[\n\r]/ /g;
          my $reply = "tweet";
          if (    Irssi::settings_get_bool("show_reply_context")
@@@ -631,7 -625,8 +624,7 @@@
  
              if ($context) {
                  my $ctext = decode_entities( $context->{text} );
 -                $ctext =~ s/%/%%/g;
 -                $ctext =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
 +                $ctext =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cC/g;
                  $ctext =~ s/[\n\r]/ /g;
                  printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
                    $context->{id}, $username,
@@@ -668,7 -663,8 +661,7 @@@
            if exists $friends{ $t->{user}{screen_name} };
  
          my $text = decode_entities( $t->{text} );
 -        $text =~ s/%/%%/g;
 -        $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
 +        $text =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cC/g;
          $text =~ s/[\n\r]/ /g;
          printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
            $t->{id}, $username, $t->{user}{screen_name}, $text;
@@@ -688,7 -684,8 +681,7 @@@
  
      foreach my $t ( reverse @$tweets ) {
          my $text = decode_entities( $t->{text} );
 -        $text =~ s/%/%%/g;
 -        $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
 +        $text =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cC/g;
          $text =~ s/[\n\r]/ /g;
          printf $fh "id:%d account:%s nick:%s type:dm %s\n",
            $t->{id}, $username, $t->{sender_screen_name}, $text;
@@@ -738,16 -735,13 +731,16 @@@ sub monitor_child 
              }
  
              if ( $meta{type} eq 'tweet' ) {
 -                push @lines, "[$account%B\@$meta{nick}%n$marker] $_\n",;
 +                $window->printformat(MSGLEVEL_PUBLIC, 'twirssi_tweet',
 +                  $account, $meta{nick}, $marker, $_);
              } elsif ( $meta{type} eq 'reply' ) {
 -                push @lines, "[$account\\--> %B\@$meta{nick}%n$marker] $_\n",;
 +                $window->printformat(MSGLEVEL_PUBLIC, 'twirssi_reply',
 +                  $account, $meta{nick}, $marker, $_);
              } elsif ( $meta{type} eq 'dm' ) {
 -                push @lines, "[$account%B\@$meta{nick}%n (%WDM%n)] $_\n",;
 +                $window->printformat(MSGLEVEL_PUBLIC, 'twirssi_dm',
 +                  $account, $meta{nick}, $_);
              } elsif ( $meta{type} eq 'error' ) {
 -                push @lines, "ERROR: $_\n";
 +                $window->print("ERROR: $_", MSGLEVEL_PUBLIC);
              } elsif ( $meta{type} eq 'debug' ) {
                  print "$_" if &debug,;
              } else {
@@@ -767,6 -761,13 +760,6 @@@
  
          if ($new_last_poll) {
              print "new last_poll = $new_last_poll" if &debug;
 -            foreach my $line (@lines) {
 -                chomp $line;
 -                $window->print( $line, MSGLEVEL_PUBLIC );
 -                foreach ( $line =~ /\@([-\w]+)/ ) {
 -                    $nicks{$1} = time;
 -                }
 -            }
  
              close FILE;
              unlink $filename
@@@ -899,20 -900,15 +892,21 @@@ sub event_send_text 
  
      # if the window where we got our text was the twitter window, and the user
      # wants to be lazy, tweet away!
-     if ( ($awin->get_active_name() eq $window->{name})
-          and Irssi::settings_get_bool("tweet_window_input") ) {
-         &cmd_tweet($line, $server, $win);
+     if ( ( $awin->get_active_name() eq $window->{name} )
+         and Irssi::settings_get_bool("tweet_window_input") )
+     {
+         &cmd_tweet( $line, $server, $win );
      }
  }
  
  Irssi::signal_add( "send text", "event_send_text" );
  
 +Irssi::theme_register([
 +    'twirssi_tweet', '[$0%B@$1%n$2] $3',
 +    'twirssi_reply', '[$0\--> %B@$1%n$2] $3',
 +    'twirssi_dm',    '[$0%B@$1%n (%WDM%n)] $2',
 +]);
 +
  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" );