The gcontact table will now be filled instead of the unique_contacts

diff --git a/appnet/appnet.php b/appnet/appnet.php
index 10deb96d06eb11baeb245fabbe81df3f6d1e7dbb..be90ec3ab582d70c65b514a290776f3116b86c86 100644 (file)
--- a/appnet/appnet.php
+++ b/appnet/appnet.php
@@ -1097,6 +1097,14 @@ function appnet_expand_annotations($a, $annotations) {
 
 function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) {
 
+       if (function_exists("update_gcontact"))
+               update_gcontact($contact["canonical_url"],
+                               NETWORK_APPNET, $contact["avatar_image"]["url"],
+                               $contact["name"], $contact["username"],
+                               "", $contact["description"]["text"],
+                               $contact["username"]."@app.net");
+
+       // Old Code
        $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
                        dbesc(normalise_link($contact["canonical_url"])));
 

diff --git a/buffer/buffer.php b/buffer/buffer.php
index ebd3c37c1f5fcd47d997246ee75fb640d3735720..162600d649c2facbfeec604ac743cba43365c20a 100644 (file)
--- a/buffer/buffer.php
+++ b/buffer/buffer.php
@@ -377,6 +377,7 @@ function buffer_send(&$a,&$b) {
                                        $message["media[thumbnail]"] = $post["preview"];
 
                                //print_r($message);
+                               logger("buffer_send: data for message ".$b["id"].": ".print_r($message, true), LOGGER_DEBUG);
                                $ret = $buffer->go('/updates/create', $message);
                                logger("buffer_send: send message ".$b["id"]." result: ".print_r($ret, true), LOGGER_DEBUG);
                        }

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 08668e15a4d62e6b09844398706a2178b653b220..b90d8b608dfa4cf10ed017404a48c086ed89d71b 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -944,6 +944,13 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru
 
 function pumpio_get_contact($uid, $contact) {
 
+       if (function_exists("update_gcontact"))
+               update_gcontact($contact->url,
+                               NETWORK_PUMPIO, $contact->image->url,
+                               $contact->displayName, $contact->preferredUsername,
+                               $contact->location->displayName, $contact->summary,
+                               str_replace("acct:", "", $contact->id));
+
        $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
                dbesc(normalise_link($contact->url)));
 

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 12c26e470255eaad31f6f704934cd5f2ec4a1d88..7f5cfe179d0f578b9f905c6fe517da15f3bc62e8 100644 (file)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -908,6 +908,13 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
        if ($contact->statusnet_profile_url == "")
                return(-1);
 
+       if (function_exists("update_gcontact"))
+               update_gcontact($contact->statusnet_profile_url,
+                               NETWORK_STATUSNET, $contact->profile_image_url,
+                               $contact->name, $contact->screen_name,
+                               $contact->location, $contact->description,
+                               statusnet_address($contact));
+
        // Check if the unique contact is existing
        // To-Do: only update once a while
         $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",

diff --git a/twitter/twitter.php b/twitter/twitter.php
index a6a27ea844f025a81a66cede29e346fd60cff54b..9533f6d1417f3bf9f3edc7d40a00eafada1ac9dd 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -925,18 +925,38 @@ function twitter_queue_hook(&$a,&$b) {
        }
 }
 
+function twitter_fix_avatar($avatar) {
+       $new_avatar = str_replace("_normal.", ".", $avatar);
+
+       $info = get_photo_info($new_avatar);
+       if (!$info)
+               $new_avatar = $avatar;
+
+       return $new_avatar;
+}
+
 function twitter_fetch_contact($uid, $contact, $create_user) {
        require_once("include/Photo.php");
 
        if ($contact->id_str == "")
                return(-1);
 
-       $avatar = str_replace("_normal.", ".", $contact->profile_image_url_https);
+       $avatar = twitter_fix_avatar($contact->profile_image_url_https);
 
-       $info = get_photo_info($avatar);
-       if (!$info)
-               $avatar = $contact->profile_image_url_https;
+       //$avatar = str_replace("_normal.", ".", $contact->profile_image_url_https);
+
+       //$info = get_photo_info($avatar);
+       //if (!$info)
+       //      $avatar = $contact->profile_image_url_https;
+
+       if (function_exists("update_gcontact"))
+               update_gcontact("https://twitter.com/".$contact->screen_name,
+                               NETWORK_TWITTER, $avatar,
+                               $contact->name, $contact->screen_name,
+                               $contact->location, $contact->description,
+                               $contact->screen_name."@twitter.com");
 
+       // Old stuff - will be removed later
        // Check if the unique contact is existing
        // To-Do: only update once a while
        $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
@@ -1220,6 +1240,8 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $picture) {
 
                if (($footer == "") AND ($picture != ""))
                        $body .= "\n\n[img]".$picture."[/img]\n";
+               elseif (($footer == "") AND ($picture == ""))
+                       $body = add_page_info_to_body($body);
 
                if ($no_tags)
                        return(array("body" => $body, "tags" => ""));
@@ -1360,7 +1382,7 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
 
                $postarray['owner-name'] = $post->user->name;
                $postarray['owner-link'] = "https://twitter.com/".$post->user->screen_name;
-               $postarray['owner-avatar'] = $post->user->profile_image_url_https;
+               $postarray['owner-avatar'] = twitter_fix_avatar($post->user->profile_image_url_https);
        }
 
        if(($contactid == 0) AND !$only_existing_contact)
@@ -1464,7 +1486,7 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
                        // Let retweets look like wall-to-wall posts
                        $postarray['author-name'] = $post->retweeted_status->user->name;
                        $postarray['author-link'] = "https://twitter.com/".$post->retweeted_status->user->screen_name;
-                       $postarray['author-avatar'] = $post->retweeted_status->user->profile_image_url_https;
+                       $postarray['author-avatar'] = twitter_fix_avatar($post->retweeted_status->user->profile_image_url_https);
                        //if (($post->retweeted_status->user->screen_name != "") AND ($post->retweeted_status->id_str != "")) {
                        //      $postarray['plink'] = "https://twitter.com/".$post->retweeted_status->user->screen_name."/status/".$post->retweeted_status->id_str;
                        //      $postarray['uri'] = "twitter::".$post->retweeted_status->id_str;