eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Simplify NoticeSimpleStatusArray inclusion in lib/apiaction.php

Browse Source
This commit is contained in:
Mikael Nordfeldth 2014-06-28 11:47:02 +02:00
parent 04f60fd1d9
commit f200d708bd
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/apiaction.php
View File

@ -295,17 +295,12 @@ class ApiAction extends Action
function twitterStatusArray($notice, $include_user=true) 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); $base = $this->twitterSimpleStatusArray($notice, $include_user);
Event::handle('NoticeSimpleStatusArray', array($notice, &$base, $this->scoped,
array('include_user'=>$include_user)));
if (!empty($notice->repeat_of)) { if (!empty($notice->repeat_of)) {
$original = Notice::getKV('id', $notice->repeat_of); $original = Notice::getKV('id', $notice->repeat_of);
if ($original instanceof Notice) { if ($original instanceof Notice) {
$orig_array = $this->twitterSimpleStatusArray($original, $include_user); $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; $base['retweeted_status'] = $orig_array;
} }
} }
@ -411,6 +406,10 @@ class ApiAction extends Action
$twitter_status['statusnet_html'] = $notice->rendered; $twitter_status['statusnet_html'] = $notice->rendered;
$twitter_status['statusnet_conversation_id'] = intval($notice->conversation); $twitter_status['statusnet_conversation_id'] = intval($notice->conversation);
// The event call to handle NoticeSimpleStatusArray lets plugins add data to the output array
Event::handle('NoticeSimpleStatusArray', array($notice, &$twitter_status, $this->scoped,
array('include_user'=>$include_user)));
return $twitter_status; return $twitter_status;
} }