diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-04-11 19:31:01 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-04-11 19:31:01 +0200 |
| commit | c88c2515e43f7a446a9b358fb657290a8a6c847a (patch) | |
| tree | d3be51f9fc24d2a735b55cf4f32fece22b9ceb6b /include/api.php | |
| parent | fe257a20324fe68838e5829e19d18777045a41b4 (diff) | |
| download | volse-hubzilla-c88c2515e43f7a446a9b358fb657290a8a6c847a.tar.gz volse-hubzilla-c88c2515e43f7a446a9b358fb657290a8a6c847a.tar.bz2 volse-hubzilla-c88c2515e43f7a446a9b358fb657290a8a6c847a.zip | |
API: Improved the timeline. Several (disabled) tests with caching of photos.
Diffstat (limited to 'include/api.php')
| -rw-r--r-- | include/api.php | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/include/api.php b/include/api.php index ab83d63be..0885a1434 100644 --- a/include/api.php +++ b/include/api.php @@ -1233,8 +1233,17 @@ $in_reply_to_status_id = 0; } + // Workaround for ostatus messages where the title is identically to the body + $statusbody = trim(html2plain(bbcode($item['body']), 0)); + $statustitle = trim($item['title']); + + if (($statustitle != '') and (strpos($statusbody, $statustitle) !== false)) + $statustext = trim($statusbody); + else + $statustext = trim($statustitle."\n\n".$statusbody); + $status = array( - 'text' => trim($item['title']." \n".html2plain(bbcode($item['body']), 0)), + 'text' => $statustext, 'truncated' => False, 'created_at'=> api_date($item['created']), 'in_reply_to_status_id' => $in_reply_to_status_id, @@ -1245,8 +1254,8 @@ 'geo' => '', 'favorited' => $item['starred'] ? true : false, 'user' => $status_user , - 'statusnet_html' => bbcode($item['body']), - 'statusnet_conversation_id' => 0, + 'statusnet_html' => trim(bbcode($item['body'])), + 'statusnet_conversation_id' => $item['parent'], ); // Seesmic doesn't like the following content |