Merge pull request #165 from annando/master

fromgplus: doubled text and avoiding first time spam

diff --git a/appnetpost/appnetpost.php b/appnetpost/appnetpost.php
index ca6d5d27ed02cd6347decfad5e0d7a0207c1f0e1..c1b1f175816fea0234ac032753e5a35db28e70d8 100644 (file)
--- a/appnetpost/appnetpost.php
+++ b/appnetpost/appnetpost.php
@@ -371,7 +371,7 @@ function appnetpost_feeditem($pid, $uid) {
                        $title = substr($title, 0, -3)."...";
                }
 
-               if (!strstr($title, $msglink))
+               if (($msglink != "") AND !strstr($title, $msglink))
                        $title = trim($title." ".$msglink);
                else
                        $title = trim($title);

diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index 058c6e406ac3450608ed23ea667d990f9a82fe9c..97213d38e992b68e7ee11d29fe2bffb39c733493 100644 (file)
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -101,6 +101,10 @@ function fromgplus_post($a, $uid, $source, $body, $location) {
 
        //$uid = 2;
 
+       // Don't know what it is. Maybe some trash from the mobile client
+       $trash = html_entity_decode("", ENT_QUOTES, 'UTF-8');
+       $body = str_replace($trash, "", $body);
+
        $body = trim($body);
 
         if (substr($body, 0, 3) == "[b]") {
@@ -223,10 +227,14 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) {
 }
 
 function fromgplus_cleantext($text) {
+
+       // Don't know what it is. But it is added to the text.
+       $trash = html_entity_decode("", ENT_QUOTES, 'UTF-8');
+
        $text = strip_tags($text);
        $text = html_entity_decode($text);
        $text = trim($text);
-       $text = str_replace(array("\n", "\r", " "), array("", "", ""), $text);
+       $text = str_replace(array("\n", "\r", " ", $trash), array("", "", "", ""), $text);
        return($text);
 }
 
@@ -322,6 +330,8 @@ function fromgplus_fetch($a, $uid) {
 
        $initiallastdate = get_pconfig($uid,'fromgplus','lastdate');
 
+       $first_time = ($initiallastdate == "");
+
        $lastdate = 0;
 
        if (!is_array($activities->items))
@@ -336,6 +346,9 @@ function fromgplus_fetch($a, $uid) {
                if ($lastdate < strtotime($item->published))
                        $lastdate = strtotime($item->published);
 
+               if ($first_time)
+                       continue;
+
                if ($item->access->description == "Public")
 
                        // Loop prevention - ignore postings from HootSuite