Merge pull request #335 from annando/1601-gcontact

[friendica-addons.git] / twitter / twitter.php

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 704f6193b4aaa29740a9ba9db954e9e4a24d4589..3469cafc574e1aa7d11c06f62aec3d394777ba8c 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -475,7 +475,7 @@ function twitter_post_hook(&$a,&$b) {
 
                $image = "";
 
-               if (isset($msgarr["url"]))
+               if (isset($msgarr["url"]) AND ($msgarr["type"] != "photo"))
                        $msg .= "\n".$msgarr["url"];
                elseif (isset($msgarr["image"]) AND ($msgarr["type"] != "video"))
                        $image = $msgarr["image"];
@@ -707,7 +707,7 @@ function twitter_prepare_body(&$a,&$b) {
                $msgarr = plaintext($a, $item, $max_char, true, 8);
                $msg = $msgarr["text"];
 
-               if (isset($msgarr["url"]))
+               if (isset($msgarr["url"]) AND ($msgarr["type"] != "photo"))
                        $msg .= " ".$msgarr["url"];
 
                if (isset($msgarr["image"]))
@@ -925,41 +925,55 @@ function twitter_queue_hook(&$a,&$b) {
        }
 }
 
-function twitter_fetch_contact($uid, $contact, $create_user) {
+function twitter_fix_avatar($avatar) {
        require_once("include/Photo.php");
 
-       if ($contact->id_str == "")
-               return(-1);
-
-       $avatar = str_replace("_normal.", ".", $contact->profile_image_url_https);
+       $new_avatar = str_replace("_normal.", ".", $avatar);
 
-       $info = get_photo_info($avatar);
+       $info = get_photo_info($new_avatar);
        if (!$info)
-               $avatar = $contact->profile_image_url_https;
+               $new_avatar = $avatar;
 
-       // 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",
-                       dbesc(normalise_link("https://twitter.com/".$contact->screen_name)));
+       return $new_avatar;
+}
 
-       if (count($r) == 0)
-               q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')",
-                       dbesc(normalise_link("https://twitter.com/".$contact->screen_name)),
-                       dbesc($contact->name),
-                       dbesc($contact->screen_name),
-                       dbesc($avatar));
-       else
-               q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'",
-                       dbesc($contact->name),
-                       dbesc($contact->screen_name),
-                       dbesc($avatar),
-                       dbesc(normalise_link("https://twitter.com/".$contact->screen_name)));
+function twitter_fetch_contact($uid, $contact, $create_user) {
+
+       if ($contact->id_str == "")
+               return(-1);
 
-       if (DB_UPDATE_VERSION >= "1177")
-               q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'",
-                       dbesc($contact->location),
-                       dbesc($contact->description),
-                       dbesc(normalise_link("https://twitter.com/".$contact->screen_name)));
+       $avatar = twitter_fix_avatar($contact->profile_image_url_https);
+
+       if (function_exists("update_gcontact"))
+               update_gcontact(array("url" => "https://twitter.com/".$contact->screen_name,
+                               "network" => NETWORK_TWITTER, "photo" => $avatar,  "hide" => true,
+                               "name" => $contact->name, "nick" => $contact->screen_name,
+                               "location" => $contact->location, "about" => $contact->description,
+                               "addr" => $contact->screen_name."@twitter.com", "generation" => 2));
+       else {
+               // Old Code
+               $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
+                               dbesc(normalise_link("https://twitter.com/".$contact->screen_name)));
+
+               if (count($r) == 0)
+                       q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')",
+                               dbesc(normalise_link("https://twitter.com/".$contact->screen_name)),
+                               dbesc($contact->name),
+                               dbesc($contact->screen_name),
+                               dbesc($avatar));
+               else
+                       q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'",
+                               dbesc($contact->name),
+                               dbesc($contact->screen_name),
+                               dbesc($avatar),
+                               dbesc(normalise_link("https://twitter.com/".$contact->screen_name)));
+
+               if (DB_UPDATE_VERSION >= "1177")
+                       q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'",
+                               dbesc($contact->location),
+                               dbesc($contact->description),
+                               dbesc(normalise_link("https://twitter.com/".$contact->screen_name)));
+       }
 
        $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
                intval($uid), dbesc("twitter::".$contact->id_str));
@@ -1220,6 +1234,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 +1376,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 +1480,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;