Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x

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

diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/TerryChay.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/TerryChay.php
index 611dfc9ef105d6a140cc9d6f85acbd82d76b352d..246cfc39860f3b09e0b3aa20d28cc65e030232a3 100644 (file)
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/TerryChay.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/TerryChay.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie_Plugin_TerryChay
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -21,9 +21,9 @@
 
 /**
  * Parses incoming messages for the words "Terry Chay" or tychay and responds
- * with a random Terry fact retrieved from the Chayism web service. 
+ * with a random Terry fact retrieved from the Chayism web service.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie_Plugin_TerryChay
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
@@ -53,21 +53,25 @@ class Phergie_Plugin_TerryChay extends Phergie_Plugin_Abstract
      */
     public function onLoad()
     {
-        $this->http = $this->getPluginHandler()->getPlugin('Http');
+        $this->getPluginHandler()->getPlugin('Http');
     }
 
     /**
      * Fetches a chayism.
      *
-     * @return string|bool Fetched chayism or FALSE if the operation failed 
+     * @return string|bool Fetched chayism or FALSE if the operation failed
      */
     public function getChayism()
     {
-        return $this->http->get(self::URL)->getContent();
+        return $this
+            ->getPluginHandler()
+            ->getPlugin('Http')
+            ->get(self::URL)
+            ->getContent();
     }
 
     /**
-     * Parses incoming messages for "Terry Chay" and related variations and 
+     * Parses incoming messages for "Terry Chay" and related variations and
      * responds with a chayism.
      *
      * @return void
@@ -77,33 +81,14 @@ class Phergie_Plugin_TerryChay extends Phergie_Plugin_Abstract
         $event = $this->getEvent();
         $source = $event->getSource();
         $message = $event->getText();
-        $pattern 
-            = '{^(' . preg_quote($this->getConfig('command.prefix')) . 
+        $pattern
+            = '{^(' . preg_quote($this->getConfig('command.prefix')) .
             '\s*)?.*(terry\s+chay|tychay)}ix';
 
-        if (preg_match($pattern, $message)
-            && $fact = $this->getChayism()
-        ) {
-            $this->doPrivmsg($source, 'Fact: ' . $fact);
-        }
-    }
-
-    /**
-     * Parses incoming CTCP request for "Terry Chay" and related variations 
-     * and responds with a chayism.
-     *
-     * @return void
-     */
-    public function onCtcp()
-    {
-        $event = $this->getEvent();
-        $source = $event->getSource();
-        $ctcp = $event->getArgument(1);
-
-        if (preg_match('({terry[\s_+-]*chay}|tychay)ix', $ctcp)
-            && $fact = $this->getChayism()
-        ) {
-            $this->doCtcpReply($source, 'TERRYCHAY', $fact);
+        if (preg_match($pattern, $message)) {
+            if($fact = $this->getChayism()) {
+                $this->doPrivmsg($source, 'Fact: ' . $fact);
+            }
         }
     }
 }