From c3fd01caeec3f44ceee072f83b67a322bd95addd Mon Sep 17 00:00:00 2001
From: "ian%hixie.ch" <ian%hixie.ch@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 19 Feb 2002 21:42:04 +0000
Subject: [PATCH] Stop private messages to the bot from being logged. b=123956,
 r=kerz. Rename the default command from uris to links. b=72957, r=kerz.

git-svn-id: svn://10.0.0.236/trunk@114954 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../webtools/mozbot/BotModules/MiniLogger.bm  | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/mozilla/webtools/mozbot/BotModules/MiniLogger.bm b/mozilla/webtools/mozbot/BotModules/MiniLogger.bm
index c9f7f08d434..084c883496c 100644
--- a/mozilla/webtools/mozbot/BotModules/MiniLogger.bm
+++ b/mozilla/webtools/mozbot/BotModules/MiniLogger.bm
@@ -31,7 +31,7 @@ sub RegisterConfig {
       # [ name, save?, settable? ]
         ['log', 0, 0, {}], # log -> channel -> patternName -> [<who> text]
         ['bufferSize', 1, 1, 20], # number of comments to remember, per channel/pattern combination
-        ['patterns', 1, 1, {'uris'=>'<?(:?[Uu][Rr][LlIi]:)?\s*(?:https?|ftp)://[^\s>"]+>?'}], # list of patternNames and patterns (regexp)
+        ['patterns', 1, 1, {'links'=>'<?(:?[Uu][Rr][LlIi]:)?\s*(?:https?|ftp)://[^\s>"]+>?'}], # list of patternNames and patterns (regexp)
         ['blockedPatterns', 1, 1, []], # list of patterns (regexp) to ignore
     );
 }
@@ -66,15 +66,20 @@ sub Log {
 sub DoLog {
     my $self = shift;
     my ($event, $message) = @_;
-    foreach my $pattern (keys %{$self->{'patterns'}}) {
-        my $regexp = $self->sanitizeRegexp($self->{'patterns'}->{$pattern});
-        if ($message =~ /$regexp/s) {
-            # wohay, we have a candidate!
-            # now check for possible blockers...
-            unless ($self->isBlocked($message)) {
-                $self->debug("LOGGING: $message");
-                push(@{$self->{'log'}->{$event->{'channel'}}->{$pattern}}, $message);
-                shift(@{$self->{'log'}->{$event->{'channel'}}->{$pattern}}) if (@{$self->{'log'}->{$event->{'channel'}}->{$pattern}} > $self->{'bufferSize'});
+    if ($event->{'channel'} ne '') {
+        # don't log private messages
+        foreach my $pattern (keys %{$self->{'patterns'}}) {
+            my $regexp = $self->sanitizeRegexp($self->{'patterns'}->{$pattern});
+            if ($message =~ /$regexp/s) {
+                # wohay, we have a candidate!
+                # now check for possible blockers...
+                unless ($self->isBlocked($message)) {
+                    $self->debug("LOGGING: $message");
+                    push(@{$self->{'log'}->{$event->{'channel'}}->{$pattern}}, $message);
+                    if (@{$self->{'log'}->{$event->{'channel'}}->{$pattern}} > $self->{'bufferSize'}) {
+                        shift(@{$self->{'log'}->{$event->{'channel'}}->{$pattern}});
+                    }
+                }
             }
         }
     }