Bot responds to channel commands via PM

[quix0rs-gnu-social.git] / plugins / Irc / extlib / phergie / Phergie / Plugin / Statusnet.php

diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
index 3da5fdf4fc7b1f1405698b533e3e9fd323504f33..ec2b427466119bd07556484a46f94432655b0e45 100644 (file)
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
@@ -72,13 +72,10 @@ class Phergie_Plugin_Statusnet extends Phergie_Plugin_Abstract {
         if ($this->messageCallback !== NULL) {\r
             $event = $this->getEvent();\r
             $source = $event->getSource();\r
+            $sender = $event->getNick();\r
             $message = trim($event->getText());\r
 \r
-            if ($source == '#statustest') {\r
-                $this->doPrivmsg('#statustest', "\001Line1\020nLine2");\r
-            }\r
-\r
-            call_user_func($this->messageCallback, array('sender' => $source, 'message' => $message));\r
+            call_user_func($this->messageCallback, array('source' => $source, 'sender' => $sender, 'message' => $message));\r
         }\r
     }\r
 \r
@@ -88,20 +85,18 @@ class Phergie_Plugin_Statusnet extends Phergie_Plugin_Abstract {
      * @return void\r
      */\r
     public function onNotice() {\r
-        $event = $this->getEvent();\r
-        if ($event->getNick() == 'NickServ') {\r
-            $message = $event->getArgument(1);\r
-            if (preg_match($this->unregRegexp, $message, $groups)) {\r
-                $screenname = $groups[1];\r
-                call_user_func($this->regCallback, array('screenname' => $screenname, 'registered' => false));\r
-            } elseif (preg_match($this->regRegexp, $message, $groups)) {\r
-                $screenname = $groups[1];\r
-                call_user_func($this->regCallback, array('screenname' => $screenname, 'registered' => true));\r
+        if ($this->regCallback !== NULL) {\r
+            $event = $this->getEvent();\r
+            if ($event->getNick() == 'NickServ') {\r
+                $message = $event->getArgument(1);\r
+                if (preg_match($this->unregRegexp, $message, $groups)) {\r
+                    $screenname = $groups[1];\r
+                    call_user_func($this->regCallback, array('screenname' => $screenname, 'registered' => false));\r
+                } elseif (preg_match($this->regRegexp, $message, $groups)) {\r
+                    $screenname = $groups[1];\r
+                    call_user_func($this->regCallback, array('screenname' => $screenname, 'registered' => true));\r
+                }\r
             }\r
         }\r
     }\r
-\r
-    public function onTick() {\r
-        echo "\nTICK!\n";\r
-    }\r
 }\r