Merge pull request #211 from tobiasd/20140622

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

diff --git a/fbsync/fbsync.php b/fbsync/fbsync.php
index e558cb9ac4d2daf035668fe168ff53a4e7759d29..51d2747f93d8640570032d8eda81f575c796b412 100644 (file)
--- a/fbsync/fbsync.php
+++ b/fbsync/fbsync.php
@@ -345,6 +345,13 @@ function fbsync_createpost($a, $uid, $self, $contacts, $applications, $post, $cr
                        $type = "link";
 
                $content = "[bookmark=".$post->attachment->href."]".$post->attachment->name."[/bookmark]";
+
+               // If a link is not only attached but also added in the body, look if it can be removed in the body.
+               $removedlink = trim(str_replace($post->attachment->href, "", $postarray["body"]));
+
+               if (($removedlink == "") OR strstr($postarray["body"], $removedlink))
+                       $postarray["body"] = $removedlink;
+
        } elseif (isset($post->attachment->name) AND ($post->attachment->name != ""))
                $content = "[b]" . $post->attachment->name."[/b]";
 
@@ -373,13 +380,14 @@ function fbsync_createpost($a, $uid, $self, $contacts, $applications, $post, $cr
 
                                if (isset($media->photo->fbid)) {
                                        logger('fbsync_createpost: fetching fbid '.$media->photo->fbid, LOGGER_DEBUG);
-                                       $url = "https://graph.facebook.com/v2.0/".$media->photo->fbid."/?access_token=".$access_token;
+                                       $url = "https://graph.facebook.com/".$media->photo->fbid."?access_token=".$access_token;
                                        $feed = fetch_url($url);
                                        $data = json_decode($feed);
                                        if (isset($data->images)) {
                                                $preview = $data->images[0]->source;
-                                               logger('fbsync_createpost: got fbid image '.$preview, LOGGER_DEBUG);
-                                       }
+                                               logger('fbsync_createpost: got fbid '.$media->photo->fbid.' image '.$preview, LOGGER_DEBUG);
+                                       } else
+                                               logger('fbsync_createpost: error fetching fbid '.$media->photo->fbid.' '.print_r($data, true), LOGGER_DEBUG);
                                }
                        }
 
@@ -624,8 +632,7 @@ function fbsync_createcomment($a, $uid, $self_id, $self, $user, $contacts, $appl
                                        'to_email'     => $user[0]['email'],
                                        'uid'          => $user[0]['uid'],
                                        'item'         => $postarray,
-                                       //'link'         => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $item,
-                                       'link'         => $a->get_baseurl().'/display/'.get_item_guid($item),
+                                       'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)),
                                        'source_name'  => $postarray['author-name'],
                                        'source_link'  => $postarray['author-link'],
                                        'source_photo' => $postarray['author-avatar'],