Removed Statusnet from the counting of contacts for scrape/noscrape

[friendica.git] / include / api.php

diff --git a/include/api.php b/include/api.php
index 1cfada7f64f89c271c1942f0293ff6e570c13a76..c8a313ce198e764187d505ca3d61c6f077001b3e 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -848,7 +848,7 @@
                // get last public wall message
                $lastwall = q("SELECT `item`.*, `i`.`contact-id` as `reply_uid`, `i`.`author-link` AS `item-author`
                                FROM `item`, `item` as `i`
-                               WHERE `item`.`contact-id` = %d
+                               WHERE `item`.`contact-id` = %d AND `item`.`uid` = %d
                                        AND ((`item`.`author-link` IN ('%s', '%s')) OR (`item`.`owner-link` IN ('%s', '%s')))
                                        AND `i`.`id` = `item`.`parent`
                                        AND `item`.`type`!='activity'
@@ -856,6 +856,7 @@
                                ORDER BY `item`.`created` DESC
                                LIMIT 1",
                                intval($user_info['cid']),
+                               intval(api_user()),
                                dbesc($user_info['url']),
                                dbesc(normalise_link($user_info['url'])),
                                dbesc($user_info['url']),
@@ -1643,7 +1644,8 @@
 
 
                $user_info = api_get_user($a);
-               $ret = api_format_items($item,$user_info)[0];
+               $rets = api_format_items($item,$user_info);
+               $ret = $rets[0];
 
                $data = array('$status' => $ret);
                switch($type){
@@ -2067,7 +2069,7 @@
                $ret = Array();
 
                foreach($r as $item) {
-                       api_share_as_retweet($a, api_user(), $item);
+                       api_share_as_retweet($item);
 
                        localize_item($item);
                        $status_user = api_item_get_user($a,$item);
@@ -2619,7 +2621,7 @@
 
 
 
-function api_share_as_retweet($a, $uid, &$item) {
+function api_share_as_retweet(&$item) {
        $body = trim($item["body"]);
 
        // Skip if it isn't a pure repeated messages
@@ -2663,6 +2665,15 @@ function api_share_as_retweet($a, $uid, &$item) {
        if ($matches[1] != "")
                $avatar = $matches[1];
 
+       $link = "";
+       preg_match("/link='(.*?)'/ism", $attributes, $matches);
+       if ($matches[1] != "")
+               $link = $matches[1];
+
+       preg_match('/link="(.*?)"/ism', $attributes, $matches);
+       if ($matches[1] != "")
+               $link = $matches[1];
+
        $shared_body = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$2",$body);
 
        if (($shared_body == "") OR ($profile == "") OR ($author == "") OR ($avatar == ""))
@@ -2672,6 +2683,7 @@ function api_share_as_retweet($a, $uid, &$item) {
        $item["author-name"] = $author;
        $item["author-link"] = $profile;
        $item["author-avatar"] = $avatar;
+       $item["plink"] = $link;
 
        return(true);