Use the new function to fetch shared information

diff --git a/include/api.php b/include/api.php
index a603f6cc872fdbbc9b21b79412240e0af40b8160..b086655c529e39aca79f8cd57f8d9c33fcd18687 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -5156,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;
 }

diff --git a/mod/display.php b/mod/display.php
index 175616f98d9c4ef77a292773d67b95dbc0d25c80..ba339b918519cea5018db041f628e0934fecb56a 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -133,51 +133,20 @@ function display_fetchauthor($a, $item)
        $profiledata['network'] = $author['network'];
 
        // Check for a repeated message
-       $skip = false;
-       $body = trim($item["body"]);
-
-       // Skip if it isn't a pure repeated messages
-       // Does it start with a share?
-       if (!$skip && strpos($body, "[share") > 0) {
-               $skip = true;
-       }
-       // Does it end with a share?
-       if (!$skip && (strlen($body) > (strrpos($body, "[/share]") + 8))) {
-               $skip = true;
-       }
-       if (!$skip) {
-               $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
-               // Skip if there is no shared message in there
-               if ($body == $attributes) {
-                       $skip = true;
+       $shared = Item::getShareArray($item);
+       if (!empty($shared) && empty($shared['comment'])) {
+               if (!empty($shared['author'])) {
+                       $profiledata['name'] = $shared['author'];
                }
-       }
 
-       if (!$skip) {
-               preg_match("/author='(.*?)'/ism", $attributes, $matches);
-               if (!empty($matches[1])) {
-                       $profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
-               }
-               preg_match('/author="(.*?)"/ism', $attributes, $matches);
-               if (!empty($matches[1])) {
-                       $profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
+               if (!empty($shared['profile'])) {
+                       $profiledata['url'] = $shared['profile'];
                }
-               preg_match("/profile='(.*?)'/ism", $attributes, $matches);
-               if (!empty($matches[1])) {
-                       $profiledata["url"] = $matches[1];
-               }
-               preg_match('/profile="(.*?)"/ism', $attributes, $matches);
-               if (!empty($matches[1])) {
-                       $profiledata["url"] = $matches[1];
-               }
-               preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
-               if (!empty($matches[1])) {
-                       $profiledata["photo"] = $matches[1];
-               }
-               preg_match('/avatar="(.*?)"/ism', $attributes, $matches);
-               if (!empty($matches[1])) {
-                       $profiledata["photo"] = $matches[1];
+
+               if (!empty($shared['avatar'])) {
+                       $profiledata['photo'] = $shared['avatar'];
                }
+
                $profiledata["nickname"] = $profiledata["name"];
                $profiledata["network"] = Protocol::matchByProfileUrl($profiledata["url"]);