Merge branch 'master' into social-master

[quix0rs-gnu-social.git] / lib / implugin.php

diff --git a/lib/implugin.php b/lib/implugin.php
index a6a9a3dad95fde75e94de6a7dca3f0b1b5242b68..9542d4d206d604633691360ad05cc391a26fc4b3 100644 (file)
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -84,7 +84,7 @@ abstract class ImPlugin extends Plugin
      *
      * @return boolean success value
      */
-    function sendNotice($screenname, $notice)
+    function sendNotice($screenname, Notice $notice)
     {
         return $this->sendMessage($screenname, $this->formatNotice($notice));
     }
@@ -370,19 +370,19 @@ abstract class ImPlugin extends Plugin
      * @return string plain-text version of the notice, with user nickname prefixed
      */
 
-    function formatNotice($notice)
+    protected function formatNotice(Notice $notice)
     {
         $profile = $notice->getProfile();
-        $nicknames = $profile->nickname;
-        if (!empty($notice->reply_to)) {
-            $orig_notice = $notice->getParent();
-            $orig_profile = $orig_notice->getProfile();
-            $nicknames = $nicknames . " => " . $orig_profile->nickname;
+
+        try {
+            $parent = $notice->getParent();
+            $orig_profile = $parent->getProfile();
+            $nicknames = sprintf('%1$s => %2$s', $profile->nickname, $orig_profile->nickname);
+        } catch (Exception $e) {
+            $nicknames = $profile->nickname;
         }
-        common_log(LOG_INFO, "Notice: " . $notice->content, __FILE__);
-        $data = $nicknames . ': ' . $notice->content . ' [' . $notice->id . ']';
-        return $data;
 
+        return sprintf('%1$s: %2$s [%3$u]', $nicknames, $notice->content, $notice->id);
     }
     //========================UTILITY FUNCTIONS USEFUL TO IMPLEMENTATIONS - RECEIVING ========================\
 
@@ -528,7 +528,7 @@ abstract class ImPlugin extends Plugin
      *
      * @return boolean hook return
      */
-    function onEndInitializeQueueManager($manager)
+    function onEndInitializeQueueManager(QueueManager $manager)
     {
         $manager->connect($this->transport . '-in', new ImReceiverQueueHandler($this), 'im');
         $manager->connect($this->transport, new ImQueueHandler($this));
@@ -542,7 +542,7 @@ abstract class ImPlugin extends Plugin
         return true;
     }
 
-    function onStartEnqueueNotice($notice, &$transports)
+    function onStartEnqueueNotice(Notice $notice, array &$transports)
     {
         $profile = Profile::getKV($notice->profile_id);