Ensure APContact::getByUrl always returns an array

[friendica.git] / include / api.php

diff --git a/include/api.php b/include/api.php
index 8325e39b71442f6518054ac1293ea3657ae666ab..681515cc376cc0a9bfeb11bad6ad05521b972cb4 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -959,7 +959,7 @@ function api_account_verify_credentials($type)
        // - Adding last status
        if (!$skip_status) {
                $item = api_get_last_status($user_info['pid'], $user_info['uid']);
-               if ($item) {
+               if (!empty($item)) {
                        $user_info['status'] = api_format_item($item, $type);
                }
        }
@@ -1318,7 +1318,7 @@ function api_status_show($type, $item_id)
        $status_info = [];
 
        $item = api_get_item(['id' => $item_id]);
-       if ($item) {
+       if (!empty($item)) {
                $status_info = api_format_item($item, $type);
        }
 
@@ -1382,7 +1382,7 @@ function api_users_show($type)
        $user_info = api_get_user($a);
 
        $item = api_get_last_status($user_info['pid'], $user_info['uid']);
-       if ($item) {
+       if (!empty($item)) {
                $user_info['status'] = api_format_item($item, $type);
        }
 
@@ -2019,7 +2019,7 @@ function api_statuses_repeat($type)
 
        Logger::log('API: api_statuses_repeat: '.$id);
 
-       $fields = ['body', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink'];
+       $fields = ['body', 'title', 'attach', 'tag', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink'];
        $item = Item::selectFirst($fields, ['id' => $id, 'private' => false]);
 
        if (DBA::isResult($item) && $item['body'] != "") {
@@ -2029,10 +2029,16 @@ function api_statuses_repeat($type)
                } else {
                        $post = share_header($item['author-name'], $item['author-link'], $item['author-avatar'], $item['guid'], $item['created'], $item['plink']);
 
+                       if (!empty($item['title'])) {
+                               $post .= '[h3]' . $item['title'] . "[/h3]\n";
+                       }
+
                        $post .= $item['body'];
                        $post .= "[/share]";
                }
                $_REQUEST['body'] = $post;
+               $_REQUEST['tag'] = $item['tag'];
+               $_REQUEST['attach'] = $item['attach'];
                $_REQUEST['profile_uid'] = api_user();
                $_REQUEST['api_source'] = true;
 
@@ -2498,7 +2504,7 @@ function api_convert_item($item)
                $statustext = mb_substr($statustext, 0, 1000) . "... \n" . ($item['plink'] ?? '');
        }
 
-       $statushtml = BBCode::convert(api_clean_attachments($body), false);
+       $statushtml = BBCode::convert(BBCode::removeAttachment($body), false);
 
        // Workaround for clients with limited HTML parser functionality
        $search = ["<br>", "<blockquote>", "</blockquote>",
@@ -5150,99 +5156,30 @@ function api_share_as_retweet(&$item)
                }
        }
 
-       /// @TODO "$1" should maybe mean '$1' ?
-       $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "$1", $body);
-       /*
-        * Skip if there is no shared message in there
-        * we already checked this in diaspora::isReshare()
-        * but better one more than one less...
-        */
-       if (($body == $attributes) || empty($attributes)) {
+       $reshared = Item::getShareArray($item);
+       if (empty($reshared)) {
                return false;
        }
 
-       // build the fake reshared item
        $reshared_item = $item;
 
-       $author = "";
-       preg_match("/author='(.*?)'/ism", $attributes, $matches);
-       if (!empty($matches[1])) {
-               $author = html_entity_decode($matches[1], ENT_QUOTES, 'UTF-8');
-       }
-
-       preg_match('/author="(.*?)"/ism', $attributes, $matches);
-       if (!empty($matches[1])) {
-               $author = $matches[1];
-       }
-
-       $profile = "";
-       preg_match("/profile='(.*?)'/ism", $attributes, $matches);
-       if (!empty($matches[1])) {
-               $profile = $matches[1];
-       }
-
-       preg_match('/profile="(.*?)"/ism', $attributes, $matches);
-       if (!empty($matches[1])) {
-               $profile = $matches[1];
-       }
-
-       $avatar = "";
-       preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
-       if (!empty($matches[1])) {
-               $avatar = $matches[1];
-       }
-
-       preg_match('/avatar="(.*?)"/ism', $attributes, $matches);
-       if (!empty($matches[1])) {
-               $avatar = $matches[1];
-       }
-
-       $link = "";
-       preg_match("/link='(.*?)'/ism", $attributes, $matches);
-       if (!empty($matches[1])) {
-               $link = $matches[1];
-       }
-
-       preg_match('/link="(.*?)"/ism', $attributes, $matches);
-       if (!empty($matches[1])) {
-               $link = $matches[1];
-       }
-
-       $posted = "";
-       preg_match("/posted='(.*?)'/ism", $attributes, $matches);
-       if (!empty($matches[1])) {
-               $posted = $matches[1];
-       }
-
-       preg_match('/posted="(.*?)"/ism', $attributes, $matches);
-       if (!empty($matches[1])) {
-               $posted = $matches[1];
-       }
-
-       if (!preg_match("/(.*?)\[share.*?\]\s?(.*?)\s?\[\/share\]\s?(.*?)/ism", $body, $matches)) {
+       if (empty($reshared['shared']) || empty($reshared['profile']) || empty($reshared['author']) || empty($reshared['avatar']) || empty($reshared['posted'])) {
                return false;
        }
 
-       $pre_body = trim($matches[1]);
-       if ($pre_body != '') {
-               $item['body'] = $pre_body;
-       }
-
-       $shared_body = trim($matches[2]);
-
-       if (($shared_body == "") || ($profile == "") || ($author == "") || ($avatar == "") || ($posted == "")) {
-               return false;
+       if (!empty($reshared['comment'])) {
+               $item['body'] = $reshared['comment'];
        }
 
-       $reshared_item["share-pre-body"] = $pre_body;
-       $reshared_item["body"] = $shared_body;
-       $reshared_item["author-id"] = Contact::getIdForURL($profile, 0, true);
-       $reshared_item["author-name"] = $author;
-       $reshared_item["author-link"] = $profile;
-       $reshared_item["author-avatar"] = $avatar;
-       $reshared_item["plink"] = $link;
-       $reshared_item["created"] = $posted;
-       $reshared_item["edited"] = $posted;
+       $reshared_item["share-pre-body"] = $reshared['comment'];
+       $reshared_item["body"] = $reshared['shared'];
+       $reshared_item["author-id"] = Contact::getIdForURL($reshared['profile'], 0, true);
+       $reshared_item["author-name"] = $reshared['author'];
+       $reshared_item["author-link"] = $reshared['profile'];
+       $reshared_item["author-avatar"] = $reshared['avatar'];
+       $reshared_item["plink"] = $reshared['link'] ?? '';
+       $reshared_item["created"] = $reshared['posted'];
+       $reshared_item["edited"] = $reshared['posted'];
 
        return $reshared_item;
 }
@@ -5409,42 +5346,11 @@ function api_clean_plain_items($text)
        }
 
        // Simplify "attachment" element
-       $text = api_clean_attachments($text);
+       $text = BBCode::removeAttachment($text);
 
        return $text;
 }
 
-/**
- * @brief Removes most sharing information for API text export
- *
- * @param string $body The original body
- *
- * @return string Cleaned body
- * @throws InternalServerErrorException
- */
-function api_clean_attachments($body)
-{
-       $data = BBCode::getAttachmentData($body);
-
-       if (empty($data)) {
-               return $body;
-       }
-       $body = "";
-
-       if (isset($data["text"])) {
-               $body = $data["text"];
-       }
-       if (($body == "") && isset($data["title"])) {
-               $body = $data["title"];
-       }
-       if (isset($data["url"])) {
-               $body .= "\n".$data["url"];
-       }
-       $body .= $data["after"];
-
-       return $body;
-}
-
 /**
  *
  * @param array $contacts