pluginified most of hasFave, getFaves and related calls

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

diff --git a/lib/apiaction.php b/lib/apiaction.php
index 55860efa554286d900191ff25076916f6261771d..36ccc82135f734299a586b9ef6cce226cdabe7a2 100644 (file)
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -295,13 +295,18 @@ class ApiAction extends Action
 
     function twitterStatusArray($notice, $include_user=true)
     {
+        // The event call to handle NoticeSimpleStatusArray lets plugins add data to the output array
         $base = $this->twitterSimpleStatusArray($notice, $include_user);
+        Event::handle('NoticeSimpleStatusArray', array($notice, &$base, $this->scoped,
+                                                       array('include_user'=>$include_user)));
 
         if (!empty($notice->repeat_of)) {
             $original = Notice::getKV('id', $notice->repeat_of);
-            if (!empty($original)) {
-                $original_array = $this->twitterSimpleStatusArray($original, $include_user);
-                $base['retweeted_status'] = $original_array;
+            if ($original instanceof Notice) {
+                $orig_array = $this->twitterSimpleStatusArray($original, $include_user);
+                Event::handle('NoticeSimpleStatusArray', array($original, &$orig_array, $this->scoped,
+                                                               array('include_user'=>$include_user)));
+                $base['retweeted_status'] = $orig_array;
             }
         }
 
@@ -369,10 +374,8 @@ class ApiAction extends Action
         }
 
         if (!is_null($this->scoped)) {
-            $twitter_status['favorited'] = $this->scoped->hasFave($notice);
             $twitter_status['repeated']  = $this->scoped->hasRepeated($notice);
         } else {
-            $twitter_status['favorited'] = false;
             $twitter_status['repeated'] = false;
         }