Add Drone CI

[friendica.git] / include / api.php

diff --git a/include/api.php b/include/api.php
index d8cd6d2e21e20456da00b827e1989bf0421d5d8e..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');
@@ -614,7 +614,7 @@ function api_get_user(App $a, $contact_id = null)
                                'name' => $contact["name"],
                                'screen_name' => (($contact['nick']) ? $contact['nick'] : $contact['name']),
                                'location' => ($contact["location"] != "") ? $contact["location"] : ContactSelector::networkToName($contact['network'], $contact['url']),
-                               'description' => HTML::toPlaintext(BBCode::toPlaintext($contact["about"])),
+                               'description' => BBCode::toPlaintext($contact["about"]),
                                'profile_image_url' => $contact["micro"],
                                'profile_image_url_https' => $contact["micro"],
                                'profile_image_url_profile_size' => $contact["thumb"],
@@ -693,7 +693,7 @@ function api_get_user(App $a, $contact_id = null)
                'name' => (($uinfo[0]['name']) ? $uinfo[0]['name'] : $uinfo[0]['nick']),
                'screen_name' => (($uinfo[0]['nick']) ? $uinfo[0]['nick'] : $uinfo[0]['name']),
                'location' => $location,
-               'description' => HTML::toPlaintext(BBCode::toPlaintext($description)),
+               'description' => BBCode::toPlaintext($description),
                'profile_image_url' => $uinfo[0]['micro'],
                'profile_image_url_https' => $uinfo[0]['micro'],
                'profile_image_url_profile_size' => $uinfo[0]["thumb"],
@@ -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]';
+                       }
                }
        }
 
@@ -2696,7 +2698,7 @@ function api_get_entitities(&$text, $bbcode)
        preg_match_all("/\[img\=(.*?)\](.*?)\[\/img\]/ism", $bbcode, $images, PREG_SET_ORDER);
        $ordered_images = [];
        foreach ($images as $image) {
-               $start = iconv_strpos($text, Photo::getGUID($image[1]), 0, "UTF-8");
+               $start = iconv_strpos($text, $image[1], 0, "UTF-8");
                if (!($start === false)) {
                        $ordered_images[$start] = ['url' => $image[1], 'alt' => $image[2]];
                }
@@ -2704,7 +2706,7 @@ function api_get_entitities(&$text, $bbcode)
 
        preg_match_all("/\[img](.*?)\[\/img\]/ism", $bbcode, $images);
        foreach ($images[1] as $image) {
-               $start = iconv_strpos($text, Photo::getGUID($image), 0, "UTF-8");
+               $start = iconv_strpos($text, $image, 0, "UTF-8");
                if (!($start === false)) {
                        $ordered_images[$start] = ['url' => $image, 'alt' => ''];
                }
@@ -2723,7 +2725,7 @@ function api_get_entitities(&$text, $bbcode)
                        $display_url = substr($display_url, 0, 25)."…";
                }
 
-               $start = iconv_strpos($text, Photo::getGUID($url), $offset, "UTF-8");
+               $start = iconv_strpos($text, $url, $offset, "UTF-8");
                if (!($start === false)) {
                        $image = Image::getInfoFromURL($url);
                        if ($image) {
@@ -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) {