Changeset 66

Timestamp:

02/17/08 19:53:26 (5 years ago)

Author:

tobias382

Message:

* Added missing onKick handler method to the base plugin class
* Reverted Pong plugin to return hostname specified by the server
* Moved alternate nick functionality from the Nickserv plugin into its own plugin, Altnick

Location:

trunk/Phergie

Files:

• Event/Handler.php (modified) (1 diff)
• Plugin/Altnick.php (added)
• Plugin/Karma.php (modified) (4 diffs)
• Plugin/Nickserv.php (modified) (4 diffs)
• Plugin/Pong.php (modified) (2 diffs)
• phergie.ini (modified) (2 diffs)

trunk/Phergie/Event/Handler.php

@@ -255 +255 @@
 
     /**
+    * Handler for when a user is kicked from a channel.
+    *
+    * @return void
+    */
+    public function onKick() { }
+
+    /**
     * Handler for when the server checks the client connection to ensure
     * activity.

trunk/Phergie/Plugin/Karma.php

@@ -2 +2 @@
 
 /**
-* @see Phergie_Event_Handler
+* @see Phergie_Plugin_Abstract_Command
 */
-require_once 'Phergie/Event/Handler.php';
+require_once 'Phergie/Plugin/Abstract/Command.php';
 
 /**
@@ -11 +11 @@
 * inflation or depression of counters by any single individual.
 */
-class Phergie_Plugin_Karma extends Phergie_Event_Handler
+class Phergie_Plugin_Karma extends Phergie_Plugin_Abstract_Command
 {
     /**
@@ -74 +74 @@
             'mc2' => 'mc2 has karma of e',
             'mc²' => 'mc² has karma of e',
+            'the meaning of life' => 'the meaning of life has a karma of 42'
         );
 
@@ -116 +117 @@
             return;
         }
+
         $source = $this->event->getSource();
         $message = $this->event->getArgument(1);
-            // Karma status request
+        // Karma status request
         if (preg_match('#^karma (\S+?)$#i', $message, $m)) {
             $term = strtolower($m[1]);

trunk/Phergie/Plugin/Nickserv.php

@@ -16 +16 @@
 {
     /**
-    * Index of the last alternate nick that the bot attempted to use
-    *
-    * @var int
-    */
-    protected $index;
-
-    /**
     * Primary nick for the bot
     *
@@ -37 +30 @@
     {
         $this->nick = $this->getIni('nick');
-        $this->index = -1;
     }
 
@@ -58 +50 @@
             } elseif (preg_match('/^.*' . $this->nick . '.* has been killed/', $message)) {
                 $this->doNick($this->nick);
-                $this->setIni('nick', $this->nick);
             }
         }
@@ -64 +55 @@
 
     /**
-    * Switches to alternate nicks as needed when nick collisions occur.
+    * Changes the in-memory configuration setting for the bot nick if it is
+    * successfully changed.
     *
     * @return void
     */
-    public function onResponse()
+    public function onNick()
     {
-        if ($this->event->getCode() == Phergie_Event_Response::ERR_NICKNAMEINUSE) {
-            $this->index++;
-            $altnick = $this->getIni('altnick' . $this->index);
-            if ($altnick) {
-                $this->doNick($altnick);
-                $this->setIni('nick', $altnick);
-            }
+        if ($this->event->getSource() == $this->getIni('nick')) {
+            $this->setIni('nick', $this->event->getArgument(0));
         }
     }

trunk/Phergie/Plugin/Pong.php

@@ -13 +13 @@
 {
     /**
-    * Hostname for the bot
-    *
-    * @var string
-    */
-    protected $hostname;
-
-    /**
-    * Stores the hostname for the bot to use in PONG responses.
-    *
-    * @return void
-    */
-    public function init()
-    {
-        $this->hostname = gethostbyaddr(file_get_contents('http://whatismyip.com/automation/n09230945.asp'));
-    }
-
-    /**
     * Responds to PING requests from the server to indicate that the client
     * connection is still active.
@@ -37 +20 @@
     public function onPing()
     {
-        $this->doPong($this->hostname);
+        $this->doPong($this->event->getArgument(0));
     }
 }

trunk/Phergie/phergie.ini

@@ -19 +19 @@
 ;    nick to use for the bot
 nick =
-
-; altnick0 :
-;    alternate nicks to use for the bot in the event that the preferred nick
-;    is unavailable; this setting may be repeated with a different number
-;    (i. e. altnick1, altnick2, etc.)
-altnick0 =
 
 ; realname :
@@ -79 +73 @@
 ;    if set to true, chan operators are given admin rights
 admincommand.ops = true
+
+;-----------------------------------------------------------------------------
+; Alternate Nick
+;-----------------------------------------------------------------------------
+
+; altnick.altnick0 :
+;    alternate nicks to use for the bot in the event that the preferred nick
+;    is unavailable; this setting may be repeated with a different number
+;    (i. e. altnick1, altnick2, etc.)
+altnick.altnick0 =
 
 ;-----------------------------------------------------------------------------