Changeset feabce2 for perl/modules

Timestamp:

May 9, 2008, 8:01:05 PM (16 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

61abb18

Parents:

db0ac7e (diff), 0eaa488 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged revisions 1033-1037 via svnmerge from 
svn+ssh://lunatique.mit.edu/mit/barnowl/src/svn/trunk

........
  r1034 | geofft | 2008-05-05 14:56:52 -0400 (Mon, 05 May 2008) | 1 line
  
  IRC: /list, /who, and /stats commands
........
  r1035 | geofft | 2008-05-06 01:37:29 -0400 (Tue, 06 May 2008) | 1 line
  
  IRC: Make M-N mostly, rather than completely, useless.
........
  r1036 | nelhage | 2008-05-06 20:10:17 -0400 (Tue, 06 May 2008) | 2 lines
  
  Fix two small bugs in styling pointed out by broder
........
  r1037 | nelhage | 2008-05-06 20:32:23 -0400 (Tue, 06 May 2008) | 2 lines
  
  Document create_style
........

Location:

perl/modules

Files:

• IRC/lib/BarnOwl/Message/IRC.pm (modified) (1 diff)
• IRC/lib/BarnOwl/Module/IRC.pm (modified) (4 diffs)
• Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (4 diffs)
• Jabber/lib/BarnOwl/Module/Jabber/Connection.pm (modified) (1 diff)
• Jabber/lib/Net/XMPP/Debug.pm (modified) (1 diff)
• Jabber/lib/Net/XMPP/Message.pm (modified) (1 diff)
• Jabber/lib/XML/Stream.pm (modified) (1 diff)

perl/modules/IRC/lib/BarnOwl/Message/IRC.pm

@@ -39 +39 @@
         my $network = $self->network;
         my $channel = $self->channel;
-        my $filter = "irc-$network-channel-$channel";
-        my $ftext = qq{type ^irc\$ and network ^$network\$ and channel ^$channel\$};
+        my $sender = $self->sender;
+        my ($filter, $ftext);
+        if ($inst && $self->body =~ /^(\S+):/) {
+            $filter = "irc-$network-channel-$channel-$sender-$1";
+            $ftext = qq{type ^irc\$ and network ^$network\$ and channel ^$channel\$ and ( sender ^$sender\$ or sender ^$1\$ )};
+        } else {
+            $filter = "irc-$network-channel-$channel";
+            $ftext = qq{type ^irc\$ and network ^$network\$ and channel ^$channel\$};
+        }
         BarnOwl::filter("$filter $ftext");
         return $filter;

perl/modules/IRC/lib/BarnOwl/Module/IRC.pm

@@ -114 +114 @@
     BarnOwl::new_command('irc-whois'      => \&cmd_whois);
     BarnOwl::new_command('irc-motd'       => \&cmd_motd);
+    BarnOwl::new_command('irc-list'       => \&cmd_list);
+    BarnOwl::new_command('irc-who'        => \&cmd_who);
+    BarnOwl::new_command('irc-stats'      => \&cmd_stats);
 }
 
@@ -146 +149 @@
         $host = shift @ARGV or die("Usage: $cmd HOST\n");
         if(!$alias) {
-            if($host =~ /^(?:irc[.])?(\w+)[.]\w+$/) {
+            if($host =~ /^(?:irc[.])?([\w-]+)[.]\w+$/) {
                 $alias = $1;
             } else {
@@ -152 +155 @@
             }
         }
-        $port = shift @ARGV || 6667;
         $ssl ||= 0;
+        $port = shift @ARGV || ($ssl ? 6697 : 6667);
     }
 
@@ -275 +278 @@
 }
 
+sub cmd_list {
+    my $cmd = shift;
+    my $message = BarnOwl::Style::boldify('Current IRC networks:') . "\n";
+    while (my ($alias, $conn) = each %ircnets) {
+        $message .= '  ' . $alias . ' => ' . $conn->nick . '@' . $conn->server . "\n";
+    }
+    BarnOwl::popless_ztext($message);
+}
+
+sub cmd_who {
+    my $cmd = shift;
+    my $conn = get_connection(\@_);
+    my $who = shift || die("Usage: $cmd <user>\n");
+    $conn->conn->who($who);
+}
+
+sub cmd_stats {
+    my $cmd = shift;
+    my $conn = get_connection(\@_);
+    my $type = shift || die("Usage: $cmd <chiklmouy> [server] \n");
+    $conn->conn->stats($type, @_);
+}
+
 ################################################################################
 ########################### Utilities/Helpers ##################################

perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm

@@ -26 +26 @@
 use Getopt::Long;
 Getopt::Long::Configure(qw(no_getopt_compat prefix_pattern=-|--));
+
+use utf8;
 
 our $VERSION = 0.1;
@@ -378 +380 @@
                     $vars{jlogin_havepass} = 1;
                     $conn->removeConnection($jidStr);
-                    BarnOwl::start_password( "Password for $jidStr: ", \&do_login );
+                    BarnOwl::start_password("Password for $jidStr: ", \&do_login );
                     return "";
                 }
@@ -487 +489 @@
     }
     else {
-        $to = shift @ARGV;
+      $to = shift @ARGV;
     }
 
@@ -531 +533 @@
     $cmd .= " -t $jwrite_thread" if $jwrite_thread;
     $cmd .= " -s $jwrite_subject" if $jwrite_subject;
-    BarnOwl::start_edit_win( $cmd, \&process_owl_jwrite );
+
+    BarnOwl::start_edit_win($cmd, \&process_owl_jwrite );
 }
 

perl/modules/Jabber/lib/BarnOwl/Module/Jabber/Connection.pm

@@ -1 +1 @@
 use warnings;
 use strict;
+use utf8;
 
 =head1 NAME

perl/modules/Jabber/lib/Net/XMPP/Debug.pm

@@ -189 +189 @@
                         {
                             $self->{HANDLE}->autoflush(1);
+                            binmode $self->{HANDLE}, ":utf8";
                             $Net::XMPP::Debug::HANDLES{$args{file}} = $self->{HANDLE};
                         }

perl/modules/Jabber/lib/Net/XMPP/Message.pm

@@ -135 +135 @@
                             $Mess->SetMessage(TO=>"bob\@jabber.org",
                                               Subject=>"Lunch",
-                                              BoDy=>"Let's do lunch!");
+                                              Body=>"Let's do lunch!");
                             $Mess->SetMessage(to=>"bob\@jabber.org",
                                               from=>"jabber.org",

perl/modules/Jabber/lib/XML/Stream.pm

@@ -1659 +1659 @@
     {
         $self->debug(3,"Send: can_write");
-        
+
         $self->{SENDSTRING} = Encode::encode_utf8(join("",@_));