]> git.mxchange.org Git - friendica.git/blobdiff - addon/facebook/facebook.php
fixed a few feed problems affecting activity objects/targets
[friendica.git] / addon / facebook / facebook.php
index e3b15c528455ef3263282b8ae68161602950fabe..545779cd5fc2f513bf540a8acc14b63ece13a499 100644 (file)
@@ -1,17 +1,13 @@
 <?php
 
 /**
- * This module still needs a lot of work, but is functional today.
- * Please review this section if you upgrade because things will change.
- * If you have issues upgrading, remove facebook from the addon list, 
- * view a page on your site, then add it back to the list. This will reset
- * all of the plugin 'hooks'. 
+ * Installing the Friendika/Facebook connector
  *
  * 1. register an API key for your site from developer.facebook.com
  *   a. We'd be very happy if you include "Friendika" in the application name
  *      to increase name recognition. The Friendika icons are also present
  *      in the images directory and may be uploaded as a Facebook app icon.
- *      Use images/ff-16.jpg for the Icon and images/ff-128.jpg for the Logo.
+ *      Use images/friendika-16.jpg for the Icon and images/friendika-128.jpg for the Logo.
  *   b. The url should be your site URL with a trailing slash.
  *      You may use http://portal.friendika.com/privacy as the privacy policy
  *      URL unless your site has different requirements, and 
  *      Replace with the settings Facebook gives you.
  * 2. Enable the facebook plugin by including it in .htconfig.php - e.g. 
  *     $a->config['system']['addon'] = 'plugin1,plugin2,facebook';
- * 3. Visit your site url + '/facebook' (e.g. http://example.com/facebook)
- *    and click 'Install Facebook posting'.
+ * 3. Visit the Facebook Settings section of the "Settings->Plugin Settings" page.
+ *    and click 'Install Facebook Connector'.
  * 4. This will ask you to login to Facebook and grant permission to the 
  *    plugin to do its stuff. Allow it to do so. 
- * 5. You're done. To turn it off visit your site's /facebook page again and
+ * 5. You're done. To turn it off visit the Plugin Settings page again and
  *    'Remove Facebook posting'.
  *
- * Turn logging on (see the github Friendika wiki page 'Settings') and 
- * repeat these steps if you have trouble.
  * Vidoes and embeds will not be posted if there is no other content. Links 
- * and images will be converted to text and long posts truncated - with a link
- * to view the full post. Posts with permission settings and comments will
- * not be posted to Facebook. 
+ * and images will be converted to a format suitable for the Facebook API and 
+ * long posts truncated - with a link to view the full post. 
  *
+ * Facebook contacts will not be able to view private photos, as they are not able to
+ * authenticate to your site to establish identity. We will address this 
+ * in a future release.
  */
 
 define('FACEBOOK_MAXPOSTLEN', 420);
@@ -116,11 +112,16 @@ function fb_get_self($uid) {
 function fb_get_friends($uid) {
 
        $access_token = get_pconfig($uid,'facebook','access_token');
+
+       $no_linking = get_pconfig($uid,'facebook','no_linking');
+       if($no_linking)
+               return;
+
        if(! $access_token)
                return;
        $s = fetch_url('https://graph.facebook.com/me/friends?access_token=' . $access_token);
        if($s) {
-               logger('facebook: fb_get_friends: ' . $s);
+               logger('facebook: fb_get_friends: ' . $s, LOGGER_DATA);
                $j = json_decode($s);
                logger('facebook: fb_get_friends: json: ' . print_r($j,true), LOGGER_DATA);
                foreach($j->data as $person) {
@@ -141,6 +142,31 @@ function fb_get_friends($uid) {
                                );                      
 
                                if(count($r)) {
+
+                                       // check that we have all the photos, this has been known to fail on occasion
+
+                                       if((! $r[0]['photo']) || (! $r[0]['thumb']) || (! $r[0]['micro'])) {  
+                                               require_once("Photo.php");
+
+                                               $photos = import_profile_photo('https://graph.facebook.com/' . $jp->id . '/picture', $uid, $r[0]['id']);
+
+                                               $r = q("UPDATE `contact` SET `photo` = '%s', 
+                                                       `thumb` = '%s',
+                                                       `micro` = '%s', 
+                                                       `name-date` = '%s', 
+                                                       `uri-date` = '%s', 
+                                                       `avatar-date` = '%s'
+                                                       WHERE `id` = %d LIMIT 1
+                                               ",
+                                                       dbesc($photos[0]),
+                                                       dbesc($photos[1]),
+                                                       dbesc($photos[2]),
+                                                       dbesc(datetime_convert()),
+                                                       dbesc(datetime_convert()),
+                                                       dbesc(datetime_convert()),
+                                                       intval($r[0]['id'])
+                                               );                      
+                                       }       
                                        continue;
                                }
                                else {
@@ -208,10 +234,40 @@ function fb_get_friends($uid) {
 
 function facebook_post(&$a) {
 
-       if(local_user()){
+       $uid = local_user();
+       if($uid){
+
                $value = ((x($_POST,'post_by_default')) ? intval($_POST['post_by_default']) : 0);
-               set_pconfig(local_user(),'facebook','post_by_default', $value);
+               set_pconfig($uid,'facebook','post_by_default', $value);
+
+               $no_linking = get_pconfig($uid,'facebook','no_linking');
+
+               $linkvalue = ((x($_POST,'facebook_linking')) ? intval($_POST['facebook_linking']) : 0);
+               set_pconfig($uid,'facebook','no_linking', (($linkvalue) ? 0 : 1));
+
+               // FB linkage was allowed but has just been turned off - remove all FB contacts and posts
+
+               if((! intval($no_linking)) && (! intval($linkvalue))) {
+                       $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s' ",
+                               intval($uid),
+                               dbesc(NETWORK_FACEBOOK)
+                       );
+                       if(count($r)) {
+                               require_once('include/Contact.php');
+                               foreach($r as $rr)
+                                       contact_remove($rr['id']);
+                       }
+               }
+               elseif(intval($no_linking) && intval($linkvalue)) {
+                       // FB linkage is now allowed - import stuff.
+                       fb_get_self($uid);
+                       fb_get_friends($uid);
+                       fb_consume_all($uid);
+               }
+
+               info( t('Settings updated.') . EOL);
        } 
+
        return;         
 }
 
@@ -224,9 +280,15 @@ function facebook_content(&$a) {
 
        if($a->argc > 1 && $a->argv[1] === 'remove') {
                del_pconfig(local_user(),'facebook','post');
-               notice( t('Facebook disabled') . EOL);
+               info( t('Facebook disabled') . EOL);
        }
 
+       if($a->argc > 1 && $a->argv[1] === 'friends') {
+               fb_get_friends(local_user());
+               info( t('Updating contacts') . EOL);
+       }
+
+
        $fb_installed = get_pconfig(local_user(),'facebook','post');
 
        $appid = get_config('facebook','appid');
@@ -245,20 +307,27 @@ function facebook_content(&$a) {
                $o .= '<div id="facebook-enable-wrapper">';
 
                $o .= '<a href="https://www.facebook.com/dialog/oauth?client_id=' . $appid . '&redirect_uri=' 
-                       . $a->get_baseurl() . '/facebook/' . $a->user['nickname'] . '&scope=publish_stream,read_stream,offline_access">' . t('Install Facebook post connector') . '</a>';
+                       . $a->get_baseurl() . '/facebook/' . $a->user['nickname'] . '&scope=publish_stream,read_stream,offline_access">' . t('Install Facebook connector for this account.') . '</a>';
                $o .= '</div>';
        }
 
        if($fb_installed) {
                $o .= '<div id="facebook-disable-wrapper">';
 
-               $o .= '<a href="' . $a->get_baseurl() . '/facebook/remove' . '">' . t('Remove Facebook post connector') . '</a></div>';
+               $o .= '<a href="' . $a->get_baseurl() . '/facebook/remove' . '">' . t('Remove Facebook connector') . '</a></div>';
        
                $o .= '<div id="facebook-post-default-form">';
                $o .= '<form action="facebook" method="post" >';
                $post_by_default = get_pconfig(local_user(),'facebook','post_by_default');
                $checked = (($post_by_default) ? ' checked="checked" ' : '');
                $o .= '<input type="checkbox" name="post_by_default" value="1"' . $checked . '/>' . ' ' . t('Post to Facebook by default') . '<br />';
+
+               $no_linking = get_pconfig(local_user(),'facebook','no_linking');
+               $checked = (($no_linking) ? '' : ' checked="checked" ');
+               $o .= '<input type="checkbox" name="facebook_linking" value="1"' . $checked . '/>' . ' ' . t('Link all your Facebook friends and conversations') . '<br />';
+
+
+
                $o .= '<input type="submit" name="submit" value="' . t('Submit') . '" /></form></div>';
        }
 
@@ -266,18 +335,20 @@ function facebook_content(&$a) {
 }
 
 function facebook_install() {
-       register_hook('post_local_end',  'addon/facebook/facebook.php', 'facebook_post_hook');
-       register_hook('jot_networks',    'addon/facebook/facebook.php', 'facebook_jot_nets');
-       register_hook('plugin_settings', 'addon/facebook/facebook.php', 'facebook_plugin_settings');
-       register_hook('cron',            'addon/facebook/facebook.php', 'facebook_cron');
+       register_hook('post_local_end',   'addon/facebook/facebook.php', 'facebook_post_hook');
+       register_hook('jot_networks',     'addon/facebook/facebook.php', 'facebook_jot_nets');
+       register_hook('plugin_settings',  'addon/facebook/facebook.php', 'facebook_plugin_settings');
+       register_hook('cron',             'addon/facebook/facebook.php', 'facebook_cron');
+       register_hook('queue_predeliver', 'addon/facebook/facebook.php', 'fb_queue_hook');
 }
 
 
 function facebook_uninstall() {
-       unregister_hook('post_local_end',  'addon/facebook/facebook.php', 'facebook_post_hook');
-       unregister_hook('jot_networks',    'addon/facebook/facebook.php', 'facebook_jot_nets');
-       unregister_hook('plugin_settings', 'addon/facebook/facebook.php', 'facebook_plugin_settings');
-       unregister_hook('cron',            'addon/facebook/facebook.php', 'facebook_cron');
+       unregister_hook('post_local_end',   'addon/facebook/facebook.php', 'facebook_post_hook');
+       unregister_hook('jot_networks',     'addon/facebook/facebook.php', 'facebook_jot_nets');
+       unregister_hook('plugin_settings',  'addon/facebook/facebook.php', 'facebook_plugin_settings');
+       unregister_hook('cron',             'addon/facebook/facebook.php', 'facebook_cron');
+       unregister_hook('queue_predeliver', 'addon/facebook/facebook.php', 'fb_queue_hook');
 }
 
 
@@ -285,8 +356,12 @@ function facebook_cron($a,$b) {
 
        $last = get_config('facebook','last_poll');
        
+       $poll_interval = intval(get_config('facebook','poll_interval'));
+       if(! $poll_interval)
+               $poll_interval = 3600;
+
        if($last) {
-               $next = $last + 3600;
+               $next = $last + $poll_interval;
                if($next > time()) 
                        return;
        }
@@ -299,12 +374,12 @@ function facebook_cron($a,$b) {
        if(count($r)) {
                foreach($r as $rr) {
                        // check for new friends once a day
-                       $last_friend_check = get_pconfig($uid,'facebook','friend_check');
+                       $last_friend_check = get_pconfig($rr['uid'],'facebook','friend_check');
                        if($last_friend_check) 
                                $next_friend_check = $last_friend_check + 86400;
                        if($next_friend_check <= time()) {
-                               fb_get_friends($uid);
-                               set_pconfig($uid,'facebook','friend_check',time());
+                               fb_get_friends($rr['uid']);
+                               set_pconfig($rr['uid'],'facebook','friend_check',time());
                        }
                        fb_consume_all($rr['uid']);
                }
@@ -358,12 +433,14 @@ function facebook_post_hook(&$a,&$b) {
                        );
                        if(count($r) && substr($r[0]['uri'],0,4) === 'fb::')
                                $reply = substr($r[0]['uri'],4);
+                       elseif(count($r) && substr($r[0]['extid'],0,4) === 'fb::')
+                               $reply = substr($r[0]['extid'],4);
                        else
                                return;
                        logger('facebook reply id=' . $reply);
                }
 
-               if($b['private'] && $reply == false) {
+               if($b['private'] && $reply === false) {
                        $allow_people = expand_acl($b['allow_cid']);
                        $allow_groups = expand_groups(expand_acl($b['allow_gid']));
                        $deny_people  = expand_acl($b['deny_cid']);
@@ -373,18 +450,38 @@ function facebook_post_hook(&$a,&$b) {
                        $deny = array_unique(array_merge($deny_people,$deny_groups));
 
                        $allow_str = dbesc(implode(', ',$recipients));
-                       $r = q("SELECT `notify` FROM `contact` WHERE `id` IN ( $allow_str ) AND `network` = 'face'"); 
-                       $allow_arr = array();
-                       if(count($r)) 
-                               foreach($r as $rr)
-                                       $allow_arr[] = $rr['notify'];
+                       if($allow_str) {
+                               $r = q("SELECT `notify` FROM `contact` WHERE `id` IN ( $allow_str ) AND `network` = 'face'"); 
+                               $allow_arr = array();
+                               if(count($r)) 
+                                       foreach($r as $rr)
+                                               $allow_arr[] = $rr['notify'];
+                       }
 
                        $deny_str = dbesc(implode(', ',$deny));
-                       $r = q("SELECT `notify` FROM `contact` WHERE `id` IN ( $deny_str ) AND `network` = 'face'"); 
-                       $deny_arr = array();
-                       if(count($r)) 
-                               foreach($r as $rr)
-                                       $deny_arr[] = $rr['notify'];
+                       if($deny_str) {
+                               $r = q("SELECT `notify` FROM `contact` WHERE `id` IN ( $deny_str ) AND `network` = 'face'"); 
+                               $deny_arr = array();
+                               if(count($r)) 
+                                       foreach($r as $rr)
+                                               $deny_arr[] = $rr['notify'];
+                       }
+
+                       if(count($deny_arr) && (! count($allow_arr))) {
+
+                               // One or more FB folks were denied access but nobody on FB was specifically allowed access.
+                               // This might cause the post to be open to public on Facebook, but only to selected members
+                               // on another network. Since this could potentially leak a post to somebody who was denied, 
+                               // we will skip posting it to Facebook with a slightly vague but relevant message that will 
+                               // hopefully lead somebody to this code comment for a better explanation of what went wrong.
+
+                               notice( t('Post to Facebook cancelled because of multi-network access permission conflict.') . EOL);
+                               return;
+                       }
+
+
+                       // if it's a private message but no Facebook members are allowed or denied, skip Facebook post
+
                        if((! count($allow_arr)) && (! count($deny_arr)))
                                return;
                }
@@ -405,7 +502,12 @@ function facebook_post_hook(&$a,&$b) {
                        $fb_token  = get_pconfig(local_user(),'facebook','access_token');
 
                        logger('facebook: $fb_post: ' . $fb_post . ' $fb_enable: ' . $fb_enable . ' $fb_token: ' . $fb_token,LOGGER_DEBUG); 
-                       if($fb_post && $fb_token && ($fb_enable || $b['private'])) {
+
+                       // post to facebook if it's a public post and we've ticked the 'post to Facebook' box, 
+                       // or it's a private message with facebook participants
+                       // or it's a reply or likes action to an existing facebook post                 
+
+                       if($fb_post && $fb_token && ($fb_enable || $b['private'] || $reply)) {
                                logger('facebook: able to post');
                                require_once('library/facebook.php');
                                require_once('include/bbcode.php');     
@@ -416,13 +518,52 @@ function facebook_post_hook(&$a,&$b) {
 
                                // make links readable before we strip the code
 
-                               $msg = preg_replace("/\[url=(.+?)\](.+?)\[\/url\]/is",'$2 $1',$msg);
+                               // unless it's a dislike - just send the text as a comment
+
+                               if($b['verb'] == ACTIVITY_DISLIKE)
+                                       $msg = trim(strip_tags(bbcode($msg)));
+
+                               $search_str = $a->get_baseurl() . '/search';
+
+                               if(preg_match("/\[url=(.*?)\](.*?)\[\/url\]/is",$msg,$matches)) {
 
-                               $msg = preg_replace("/\[img\](.+?)\[\/img\]/is", t('Image: ') . '$1',$msg);
+                                       // don't use hashtags for message link
+
+                                       if(strpos($matches[2],$search_str) === false) {
+                                               $link = $matches[1];
+                                               if(substr($matches[2],0,5) != '[img]')
+                                                       $linkname = $matches[2];
+                                       }
+                               }
+
+                               $msg = preg_replace("/\[url=(.*?)\](.*?)\[\/url\]/is",'$2 $1',$msg);
+
+                               if(preg_match("/\[img\](.*?)\[\/img\]/is",$msg,$matches))
+                                       $image = $matches[1];
+
+                               $msg = preg_replace("/\[img\](.*?)\[\/img\]/is", t('Image: ') . '$1', $msg);
+
+                               if((strpos($link,$a->get_baseurl()) !== false) && (! $image))
+                                       $image = $a->get_baseurl() . '/images/friendika-64.jpg';
 
                                $msg = trim(strip_tags(bbcode($msg)));
                                $msg = html_entity_decode($msg,ENT_QUOTES,'UTF-8');
 
+                               // add any attachments as text urls
+
+                           $arr = explode(',',$b['attach']);
+
+                           if(count($arr)) {
+                                       $msg .= "\n";
+                               foreach($arr as $r) {
+                               $matches = false;
+                                               $cnt = preg_match('|\[attach\]href=\"(.*?)\" size=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches);
+                                               if($cnt) {
+                                                       $msg .= $matches[1];
+                                               }
+                                       }
+                               }
+
                                if (strlen($msg) > FACEBOOK_MAXPOSTLEN) {
                                        $shortlink = "";
                                        require_once('library/slinky.php');
@@ -444,10 +585,21 @@ function facebook_post_hook(&$a,&$b) {
 
                                logger('Facebook post: msg=' . $msg, LOGGER_DATA);
 
-                               $postvars = array(
-                                       'access_token' => $fb_token, 
-                                       'message' => $msg
-                               );
+                               if($likes) { 
+                                       $postvars = array('access_token' => $fb_token);
+                               }
+                               else {
+                                       $postvars = array(
+                                               'access_token' => $fb_token, 
+                                               'message' => $msg
+                                       );
+                                       if(isset($image))
+                                               $postvars['picture'] = $image;
+                                       if(isset($link))
+                                               $postvars['link'] = $link;
+                                       if(isset($linkname))
+                                               $postvars['name'] = $linkname;
+                               }
 
                                if(($b['private']) && (! $b['parent'])) {
                                        $postvars['privacy'] = '{"value": "CUSTOM", "friends": "SOME_FRIENDS"';
@@ -459,30 +611,113 @@ function facebook_post_hook(&$a,&$b) {
 
                                }
 
-                               if(! $reply) { 
-                                       if($b['plink'])
-                                               $postvars['actions'] = '{"name": "' . t('View on Friendika') . '", "link": "' .  $b['plink'] . '"}';
-                               }
-
                                if($reply) {
                                        $url = 'https://graph.facebook.com/' . $reply . '/' . (($likes) ? 'likes' : 'comments');
                                }
                                else { 
                                        $url = 'https://graph.facebook.com/me/feed';
+                                       if($b['plink'])
+                                               $postvars['actions'] = '{"name": "' . t('View on Friendika') . '", "link": "' .  $b['plink'] . '"}';
                                }
+
                                logger('facebook: post to ' . $url);
                                logger('facebook: postvars: ' . print_r($postvars,true));
 
-                               $x = post_url($url, $postvars);
-                               
-                               logger('Facebook post returns: ' . $x, LOGGER_DEBUG);
-
+                               // "test_mode" prevents anything from actually being posted.
+                               // Otherwise, let's do it. 
+
+                               if(! get_config('facebook','test_mode')) {
+                                       $x = post_url($url, $postvars);
+
+                                       $retj = json_decode($x);
+                                       if($retj->id) {
+                                               q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d LIMIT 1",
+                                                       dbesc('fb::' . $retj->id),
+                                                       intval($b['id'])
+                                               );
+                                       }
+                                       else {
+                                               if(! $likes) {
+                                                       $s = serialize(array('url' => $url, 'item' => $b['id'], 'post' => $postvars));
+                                                       q("INSERT INTO `queue` ( `network`, `cid`, `created`, `last`, `content`)
+                                                               VALUES ( '%s', %d, '%s', '%s', '%s') ",
+                                                               dbesc(NETWORK_FACEBOOK),
+                                                               intval($a->contact),
+                                                               dbesc(datetime_convert()),
+                                                               dbesc(datetime_convert()),
+                                                               dbesc($s)
+                                                       );                                                              
+
+                                                       notice( t('Facebook post failed. Queued for retry.') . EOL);
+                                               }
+                                       }
+                                       
+                                       logger('Facebook post returns: ' . $x, LOGGER_DEBUG);
+                               }
                        }
                }
        }
 }
 
 
+function fb_queue_hook(&$a,&$b) {
+
+       $qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
+               dbesc(NETWORK_FACEBOOK)
+       );
+       if(! count($qi))
+               return;
+
+       require_once('include/queue_fn.php');
+
+       foreach($qi as $x) {
+               if($x['network'] !== NETWORK_FACEBOOK)
+                       continue;
+
+               logger('facebook_queue: run');
+
+               $r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid` 
+                       WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1",
+                       intval($x['cid'])
+               );
+               if(! count($r))
+                       continue;
+
+               $user = $r[0];
+
+               $appid  = get_config('facebook', 'appid'  );
+               $secret = get_config('facebook', 'appsecret' );
+
+               if($appid && $secret) {
+                       $fb_post   = intval(get_pconfig($user['uid'],'facebook','post'));
+                       $fb_token  = get_pconfig($user['uid'],'facebook','access_token');
+
+                       if($fb_post && $fb_token) {
+                               logger('facebook_queue: able to post');
+                               require_once('library/facebook.php');
+
+                               $z = unserialize($x['content']);
+                               $item = $z['item'];
+                               $j = post_url($z['url'],$z['post']);
+
+                               $retj = json_decode($j);
+                               if($retj->id) {
+                                       q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d LIMIT 1",
+                                               dbesc('fb::' . $retj->id),
+                                               intval($item)
+                                       );
+                                       logger('facebook_queue: success: ' . $j); 
+                                       remove_queue_item($x['id']);
+                               }
+                               else {
+                                       logger('facebook_queue: failed: ' . $j);
+                                       update_queue_time($x['id']);
+                               }
+                       }
+               }
+       }
+}
+
 function fb_consume_all($uid) {
 
        require_once('include/items.php');
@@ -508,6 +743,10 @@ function fb_consume_all($uid) {
 function fb_consume_stream($uid,$j,$wall = false) {
        $a = get_app();
 
+       $no_linking = get_pconfig($uid,'facebook','no_linking');
+       if($no_linking)
+               return;
+
        $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
                intval($uid)
        );
@@ -526,24 +765,12 @@ function fb_consume_stream($uid,$j,$wall = false) {
        foreach($j->data as $entry) {
                logger('fb_consume: entry: ' . print_r($entry,true), LOGGER_DATA);
                $datarray = array();
-               $we_posted = false;
-               $app = $entry->application;
-               if($app->id == get_config('facebook','appid') && $wall)
-                       $we_posted = true;
 
-               if($we_posted) {
-                       $r = q("SELECT * FROM `item` WHERE `wall` = 1 AND `uid` = %d AND `created` > '%s' AND `created` < '%s' AND `deleted` = 0 LIMIT 1",
-                               intval($uid),
-                               dbesc(datetime_convert('UTC','UTC',$entry->created_time . ' - 1 minute')),
-                               dbesc(datetime_convert('UTC','UTC',$entry->created_time . ' + 1 minute'))
-                       );
-               }
-               else {
-                       $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `deleted` = 0 LIMIT 1",
+               $r = q("SELECT * FROM `item` WHERE ( `uri` = '%s' OR `extid` = '%s') AND `uid` = %d LIMIT 1",
+                               dbesc('fb::' . $entry->id),
                                dbesc('fb::' . $entry->id),
                                intval($uid)
-                       );
-               }
+               );
                if(count($r)) {
                        $post_exists = true;
                        $orig_post = $r[0];
@@ -563,22 +790,32 @@ function fb_consume_stream($uid,$j,$wall = false) {
                        if($from->id == $self_id)
                                $datarray['contact-id'] = $self[0]['id'];
                        else {
-                               $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d LIMIT 1",
+                               $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
                                        dbesc($from->id),
                                        intval($uid)
                                );
                                if(count($r))
                                        $datarray['contact-id'] = $r[0]['id'];
                        }
+
+                       // don't store post if we don't have a contact
+
+                       if(! x($datarray,'contact-id')) {
+                               logger('no contact: post ignored');
+                               continue; 
+                       }
+
                        $datarray['verb'] = ACTIVITY_POST;                                              
                        if($wall) {
                                $datarray['owner-name'] = $self[0]['name'];
-                               $datarray['author-link'] = $self[0]['url'];
-                               $datarray['author-avatar'] = $self[0]['thumb'];
+                               $datarray['owner-link'] = $self[0]['url'];
+                               $datarray['owner-avatar'] = $self[0]['thumb'];
                        }
                        $datarray['author-name'] = $from->name;
                        $datarray['author-link'] = 'http://facebook.com/profile.php?id=' . $from->id;
                        $datarray['author-avatar'] = 'https://graph.facebook.com/' . $from->id . '/picture';
+                       $datarray['plink'] = $datarray['author-link'] . '&v=wall&story_fbid=' . substr($entry->id,strpos($entry->id,'_') + 1);
+
                        $datarray['body'] = $entry->message;
                        if($entry->picture)
                                $datarray['body'] .= "\n\n" . '[img]' . $entry->picture . '[/img]';
@@ -599,40 +836,56 @@ function fb_consume_stream($uid,$j,$wall = false) {
                                intval($top_item),
                                intval($uid)
                        );                      
-                       if(count($r))
+                       if(count($r)) {
                                $orig_post = $r[0];
-
+                               logger('fb: new top level item posted');
+                       }
                }
-               $likers = $entry->likes->data;
-               $comments = $entry->comments->data;
+
+               if(isset($entry->likes) && isset($entry->likes->data))
+                       $likers = $entry->likes->data;
+               else
+                       $likers = null;
+
+               if(isset($entry->comments) && isset($entry->comments->data))
+                       $comments = $entry->comments->data;
+               else
+                       $comments = null;
 
                if(is_array($likers)) {
                        foreach($likers as $likes) {
 
-                               $r = q("SELECT * FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `verb` = '%s' AND `author-link` = '%s'
-                                       LIMIT 1",
-                                       dbesc('fb::' . $entry->id),
+                               if(! $orig_post)
+                                       continue;
+
+                               // If we posted the like locally, it will be found with our url, not the FB url.
+
+                               $second_url = (($likes->id == $self_id) ? $self[0]['url'] : 'http://facebook.com/profile.php?id=' . $likes->id); 
+
+                               $r = q("SELECT * FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `verb` = '%s' 
+                                       AND ( `author-link` = '%s' OR `author-link` = '%s' ) LIMIT 1",
+                                       dbesc($orig_post['uri']),
                                        intval($uid),
                                        dbesc(ACTIVITY_LIKE),
-                                       dbesc('http://facebook.com/profile.php?id=' . $likes->id)
+                                       dbesc('http://facebook.com/profile.php?id=' . $likes->id),
+                                       dbesc($second_url)
                                );
+
                                if(count($r))
                                        continue;
                                        
                                $likedata = array();
                                $likedata['parent'] = $top_item;
                                $likedata['verb'] = ACTIVITY_LIKE;
-
-
                                $likedata['gravity'] = 3;
                                $likedata['uid'] = $uid;
                                $likedata['wall'] = (($wall) ? 1 : 0);
                                $likedata['uri'] = item_new_uri($a->get_baseurl(), $uid);
-                               $likedata['parent-uri'] = 'fb::' . $entry->id;
+                               $likedata['parent-uri'] = $orig_post['uri'];
                                if($likes->id == $self_id)
                                        $likedata['contact-id'] = $self[0]['id'];
                                else {
-                                       $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d LIMIT 1",
+                                       $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
                                                dbesc($likes->id),
                                                intval($uid)
                                        );
@@ -655,7 +908,7 @@ function fb_consume_stream($uid,$j,$wall = false) {
 
                                $likedata['body'] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
                                $likedata['object'] = '<object><type>' . ACTIVITY_OBJ_NOTE . '</type><local>1</local>' . 
-                                       '<id>' . $orig_post['uri'] . '</id><link>' . xmlify('<link rel="alternate" type="text/html" href="' . $orig_post['plink'] . '">') . '</link><title>' . $orig_post['title'] . '</title><content>' . $orig_post['body'] . '</content></object>';  
+                                       '<id>' . $orig_post['uri'] . '</id><link>' . xmlify('<link rel="alternate" type="text/html" href="' . xmlify($orig_post['plink']) . '" />') . '</link><title>' . $orig_post['title'] . '</title><content>' . $orig_post['body'] . '</content></object>';  
 
                                $item = item_store($likedata);                  
                        }
@@ -663,8 +916,12 @@ function fb_consume_stream($uid,$j,$wall = false) {
                if(is_array($comments)) {
                        foreach($comments as $cmnt) {
 
-                               $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
+                               if(! $orig_post)
+                                       continue;
+
+                               $r = q("SELECT * FROM `item` WHERE `uid` = %d AND ( `uri` = '%s' OR `extid` = '%s' ) LIMIT 1",
                                        intval($uid),
+                                       dbesc('fb::' . $cmnt->id),
                                        dbesc('fb::' . $cmnt->id)
                                );
                                if(count($r))
@@ -677,31 +934,26 @@ function fb_consume_stream($uid,$j,$wall = false) {
                                $cmntdata['uid'] = $uid;
                                $cmntdata['wall'] = (($wall) ? 1 : 0);
                                $cmntdata['uri'] = 'fb::' . $cmnt->id;
-                               $cmntdata['parent-uri'] = 'fb::' . $entry->id;
+                               $cmntdata['parent-uri'] = $orig_post['uri'];
                                if($cmnt->from->id == $self_id) {
                                        $cmntdata['contact-id'] = $self[0]['id'];
-                                       // see if I already posted it here locally and we're now getting it back from FB
-                                       $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `created` > '%s' AND `created` < '%s' 
-                                               AND `parent-uri` = '%s' AND `author-link` = '%s' LIMIT 1",
-                                               intval($uid),
-                                               dbesc(datetime_convert('UTC','UTC',$cmnt->created_time . ' - 1 minute')),
-                                               dbesc(datetime_convert('UTC','UTC',$cmnt->created_time . ' + 1 minute')),
-                                               dbesc('fb::' . $entry->id),
-                                               dbesc($my_local_url)
-                                       );
-                                       if(count($r))
-                                               continue;
                                }
-                               elseif(is_array($orig_post) && (x($orig_post,'contact-id')))
-                                       $cmntdata['contact-id'] = $orig_post['contact-id'];
                                else {
                                        $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d LIMIT 1",
                                                dbesc($cmnt->from->id),
                                                intval($uid)
                                        );
-                                       if(count($r))
+                                       if(count($r)) {
                                                $cmntdata['contact-id'] = $r[0]['id'];
+                                               if($r[0]['blocked'] || $r[0]['readonly'])
+                                                       continue;
+                                       }
                                }
+                               if(! x($cmntdata,'contact-id'))
+                                       $cmntdata['contact-id'] = $orig_post['contact-id'];
+
+                               $cmntdata['created'] = datetime_convert('UTC','UTC',$cmnt->created_time);
+                               $cmntdata['edited']  = datetime_convert('UTC','UTC',$cmnt->created_time);
                                $cmntdata['verb'] = ACTIVITY_POST;                                              
                                $cmntdata['author-name'] = $cmnt->from->name;
                                $cmntdata['author-link'] = 'http://facebook.com/profile.php?id=' . $cmnt->from->id;
@@ -709,14 +961,7 @@ function fb_consume_stream($uid,$j,$wall = false) {
                                $cmntdata['body'] = $cmnt->message;
                                $item = item_store($cmntdata);                  
                        }
-
-
                }
-
        }
+}
 
-
-
-
-
-}
\ No newline at end of file