Changeset 72

Timestamp:

02/25/08 06:55:08 (5 years ago)

Author:

Seldaek

Message:

* Acronym : allowed <Nick>: ACRO?
* Daddy : added "I am your daddy, bitch!" 10% chance response (if curses is on)
* Logging : fixed "heard foo bar" triggering false positive heard answers, same for seen
* Url : caches 5 URLs now to avoid cross-bot flood
* phergie.ini : added global curses switch

Location:

trunk/Phergie

Files:

• Plugin/Acronym.php (modified) (1 diff)
• Plugin/Daddy.php (modified) (1 diff)
• Plugin/Logging.php (modified) (2 diffs)
• Plugin/Url.php (modified) (3 diffs)
• phergie.ini (modified) (1 diff)

trunk/Phergie/Plugin/Acronym.php

@@ -99 +99 @@
         $message = $this->event->getArgument(1);
 
-        if (!preg_match('/((?:[A-Z]\.?){2,})\?/AD', $message, $acronym)) {
+                // Matches an optional "Nick: " followed by an acronym formatted as A.B.C. or ABC
+        if (!preg_match('/^(?:[A-Za-z0-9\[\]`|{}_-]+: )?((?:[A-Z]\.?){2,})\?$/', $message, $acronym)) {
             return;
         }

trunk/Phergie/Plugin/Daddy.php

@@ -23 +23 @@
         $text = $this->event->getArgument(1);
         if (preg_match('/' . $bot . '\s*:?\s+?who\'?s your daddy\??/iAD', $text)) {
-            $this->doPrivmsg($this->event->getSource(), 'You\'re my daddy, ' . $this->event->getNick() . '!');
+                if($this->getIni('curses') === 'true' && rand(0,10) === 10) {
+                    $this->doPrivmsg($this->event->getSource(), $this->event->getNick() . ': I am your daddy, bitch!');
+                } else {
+                    $this->doPrivmsg($this->event->getSource(), 'You\'re my daddy, ' . $this->event->getNick() . '!');
+                }
         }
     }

trunk/Phergie/Plugin/Logging.php

@@ -491 +491 @@
     public function onDoSeen($user)
     {
+        // Don't match if user has a space (obviously it's not a nick)
+        if (strpos($user, ' ') !== false) {
+                return;
+        }
+
         $source = $this->event->getSource();
         $target = $this->event->getNick();
@@ -553 +558 @@
     public function onDoHeard($user)
     {
+        // Don't match if user has a space (obviously it's not a nick)
+        if (strpos($user, ' ') !== false) {
+                return;
+        }
+
         $source = $this->event->getSource();
         $target = $this->event->getNick();

trunk/Phergie/Plugin/Url.php

@@ -23 +23 @@
 
         /**
-         * Saves the last url parsed to avoid spamming/looping with multiple bots
+         * Saves the last urls parsed to avoid spamming/looping with multiple bots
          *
-         * It's saved in an array containing (url, tinyurl) so both are checked
+         * It's saved in a flat array containing (url, tinyurl) couples so both are checked
          *
          * @var array
          */
-        protected $lastUrl = array();
+        protected $lastUrls = array();
 
     /**
@@ -57 +57 @@
             $url = rtrim($m[1], '), ]');
             // Spam check on base URL
-                        if(array_search($url, $this->lastUrl) !== false)
+                        if(array_search($url, $this->lastUrls) !== false)
                                 return;
             // Convert url
             $tinyUrl = $this->tinyUrl($url);
                         // Spam check on tinyURL
-                        if(array_search($tinyUrl, $this->lastUrl) !== false)
+                        if(array_search($tinyUrl, $this->lastUrls) !== false)
                                 return;
 
@@ -114 +114 @@
             );
 
-                        $this->lastUrl = array($url, $tinyUrl);
+                        // Remove one url couple if it exceeds 5 couples
+                        if (count($this->lastUrls) > 10) {
+                                array_shift($this->lastUrls);
+                                array_shift($this->lastUrls);
+                        }
+
+                        // Add the latest couple
+                        $this->lastUrls[] = $url;
+                        $this->lastUrls[] = $tinyUrl;
         }
     }

trunk/Phergie/phergie.ini

@@ -33 +33 @@
 ;   refer to itself in the third person for actions
 gender =
+
+; curses :
+;   boolean flag indicating whether or not the bot is allowed to use curses,
+;   bad words, etc. defaults to false.
+curses =
 
 ; plugins :