Changeset 76

Timestamp:

02/25/08 21:55:17 (5 years ago)

Author:

Seldaek

Message:

* Streams: parameter parsing bug fixed
* Karma: supports multi-word items using (grouped by parenthesis)
* Quit: added 'die' command, same effect with different quit message
* Tld: added easter eggs (and spoons)

Location:

trunk/Phergie

Files:

• Driver/Streams.php (modified) (1 diff)
• Plugin/Karma.php (modified) (3 diffs)
• Plugin/Quit.php (modified) (1 diff)
• Plugin/Tld.php (modified) (1 diff)

trunk/Phergie/Driver/Streams.php

@@ -199 +199 @@
                         array_unshift($args, $target);
                     } else {
-                        $args = explode(' :', $args);
+                        $args = explode(' :', $args, 2);
                     }
                     break;

trunk/Phergie/Plugin/Karma.php

@@ -74 +74 @@
             'mc2' => 'mc2 has karma of e',
             'mc²' => 'mc² has karma of e',
+            'i' => 'I haz big karma',
         );
 
@@ -118 +119 @@
         $source = $this->event->getSource();
         $message = $this->event->getArgument(1);
-            // Karma status request
-        if (preg_match('#^karma (\S+?)$#i', $message, $m)) {
+
+                // Karma status request
+        if (preg_match('#^karma (.+)$#i', $message, $m)) {
             $term = strtolower($m[1]);
+            // Replaces multiple spaces by one
+            $term = preg_replace('#\s+#', ' ', $term);
             // Return fixed value if set
             if (isset ($this->fixedKarma[$term])) {
@@ -134 +138 @@
             }
         // Incrementation/decrementation request
-        } elseif (preg_match('#^(\S+?)(\+\+|--)\s*(.*)$#i', $message, $m)) {
+        } elseif (preg_match('#^(\S+?|\(.+?\)+)(\+{2,}|-{2,})(?: \s+(.*))?$#i', $message, $m)) {
             $word = strtolower($m[1]);
-            // Do nothing if the karma fixed
+            // Strip parenthesis grouping multiple words
+            if(substr($word, 0, 1) === '(' && substr($word, -1) === ')') {
+                $word = substr($word, 1, -1);
+            } else { // Add trailing + or -'s
+                if(strlen($m[2]) > 2) {
+                        $word .= substr($m[2], 2);
+                        $m[2] = substr($m[2], -2);
+                }
+            }
+            // Replaces multiple spaces by one
+            $word = preg_replace('#\s+#', ' ', $word);
+            // Do nothing if the karma is fixed
             if (isset($this->fixedKarma[$word])) {
                 return;

trunk/Phergie/Plugin/Quit.php

@@ -27 +27 @@
         $this->doQuit('by request of ' . $this->event->getNick());
     }
+
+    public function onDoDie()
+    {
+        $this->doQuit('bows to ' . $this->event->getNick() .' and commits seppuku');
+    }
 }

trunk/Phergie/Plugin/Tld.php

@@ -296 +296 @@
         'zm' => 'Zambia',
         'zw' => 'Zimbabwe',
+        // Pranks
+        'spoon' => 'Don\'t you know ? There is no spoon !',
+        'poo' => 'Do you really think that\'s funny ?',
     );