From d68c09e428d5da9b4109be48ccd65f113bb56b6f Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Fri, 15 Jul 2016 12:22:35 +0200 Subject: [PATCH] API: use `diaspora::is_reshare()` --- include/api.php | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/include/api.php b/include/api.php index 5a3e92bb88..832240f716 100644 --- a/include/api.php +++ b/include/api.php @@ -3034,26 +3034,19 @@ function api_share_as_retweet(&$item) { $body = trim($item["body"]); - // Skip if it isn't a pure repeated messages - // Does it start with a share? - if (strpos($body, "[share") > 0) - return false; - - // Does it end with a share? - if (strlen($body) > (strrpos($body, "[/share]") + 8)) + if (diaspora::is_reshare($body, false)===false) { return false; + } $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::is_reshare() + // but better one more than one less... if ($body == $attributes) return false; - // NOTE: we could check te guid="" attribute and then try to load original post - // from database given the guid: we can see the original post via web under - // /display/, but all the logic to fetch an item from db based on guid - // looks like is in display_init() and would need a big refractor to be usable here. - // so, we build the original item starting from the reshare. + // build the fake reshared item $reshared_item = $item; $author = ""; -- 2.39.5