Add Drone CI

[friendica.git] / include / api.php

diff --git a/include/api.php b/include/api.php
index a7d25c83f0b8e7ed22207d56911d49f2ab1a64ac..8b938508bd64283943cbaeada6ff0fd15e40bab7 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -48,9 +48,9 @@ use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
-require_once 'mod/share.php';
-require_once 'mod/item.php';
-require_once 'mod/wall_upload.php';
+require_once __DIR__ . '/../mod/share.php';
+require_once __DIR__ . '/../mod/item.php';
+require_once __DIR__ . '/../mod/wall_upload.php';
 
 define('API_METHOD_ANY', '*');
 define('API_METHOD_GET', 'GET');
@@ -1157,19 +1157,21 @@ function api_statuses_update($type)
                }
        }
 
-       // To-Do: Multiple IDs
        if (requestdata('media_ids')) {
-               $r = q(
-                       "SELECT `resource-id`, `scale`, `nickname`, `type`, `desc` FROM `photo` INNER JOIN `user` ON `user`.`uid` = `photo`.`uid` WHERE `resource-id` IN (SELECT `resource-id` FROM `photo` WHERE `id` = %d) AND `scale` > 0 AND `photo`.`uid` = %d ORDER BY `photo`.`width` DESC LIMIT 1",
-                       intval(requestdata('media_ids')),
-                       api_user()
-               );
-               if (DBA::isResult($r)) {
-                       $phototypes = Image::supportedTypes();
-                       $ext = $phototypes[$r[0]['type']];
-                       $description = $r[0]['desc'] ?? '';
-                       $_REQUEST['body'] .= "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $r[0]['nickname'] . '/image/' . $r[0]['resource-id'] . ']';
-                       $_REQUEST['body'] .= '[img=' . System::baseUrl() . '/photo/' . $r[0]['resource-id'] . '-' . $r[0]['scale'] . '.' . $ext . ']' . $description . '[/img][/url]';
+               $ids = explode(',', requestdata('media_ids'));
+               foreach ($ids as $id) {
+                       $r = q(
+                               "SELECT `resource-id`, `scale`, `nickname`, `type`, `desc` FROM `photo` INNER JOIN `user` ON `user`.`uid` = `photo`.`uid` WHERE `resource-id` IN (SELECT `resource-id` FROM `photo` WHERE `id` = %d) AND `scale` > 0 AND `photo`.`uid` = %d ORDER BY `photo`.`width` DESC LIMIT 1",
+                               intval($id),
+                               api_user()
+                       );
+                       if (DBA::isResult($r)) {
+                               $phototypes = Image::supportedTypes();
+                               $ext = $phototypes[$r[0]['type']];
+                               $description = $r[0]['desc'] ?? '';
+                               $_REQUEST['body'] .= "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $r[0]['nickname'] . '/image/' . $r[0]['resource-id'] . ']';
+                               $_REQUEST['body'] .= '[img=' . System::baseUrl() . '/photo/' . $r[0]['resource-id'] . '-' . $r[0]['scale'] . '.' . $ext . ']' . $description . '[/img][/url]';
+                       }
                }
        }
 
@@ -3038,6 +3040,8 @@ function api_format_item($item, $type = "json", $status_user = null, $author_use
                'statusnet_conversation_id' => $item['parent'],
                'external_url' => System::baseUrl() . "/display/" . $item['guid'],
                'friendica_activities' => api_format_items_activities($item, $type),
+               'friendica_title' => $item['title'],
+               'friendica_html' => BBCode::convert($item['body'], false)
        ];
 
        if (count($converted["attachments"]) > 0) {