]> git.mxchange.org Git - friendica-addons.git/blobdiff - facebook/facebook.php
Merge pull request #272 from tobiasd/20150706-mods
[friendica-addons.git] / facebook / facebook.php
index d36daf8a8d56c9958e34f46ce6cced3535dfe109..66f52af37742940ac9fe0475f7646f57f13bca08 100644 (file)
@@ -1,9 +1,10 @@
 <?php
 /**
  * Name: Facebook Connector
- * Version: 1.2
+ * Version: 1.3
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
- *         Tobias Hößl <https://github.com/CatoTH/>
+ * Author: Tobias Hößl <https://github.com/CatoTH/>
+ * Status: Unsupported
  */
 
 /**
@@ -33,6 +34,7 @@ define('FACEBOOK_MAXPOSTLEN', 63206);
 define('FACEBOOK_SESSION_ERR_NOTIFICATION_INTERVAL', 259200); // 3 days
 define('FACEBOOK_DEFAULT_POLL_INTERVAL', 60); // given in minutes
 define('FACEBOOK_MIN_POLL_INTERVAL', 5);
+define('FACEBOOK_RTU_ERR_MAIL_AFTER_MINUTES', 180); // 3 hours
 
 require_once('include/security.php');
 
@@ -78,38 +80,38 @@ function facebook_init(&$a) {
 
        if (x($_REQUEST, "realtime_cb") && x($_REQUEST, "realtime_cb")) {
                logger("facebook_init: Facebook Real-Time callback called", LOGGER_DEBUG);
-               
+
                if (x($_REQUEST, "hub_verify_token")) {
                        // this is the verification callback while registering for real time updates
-                       
+
                        $verify_token = get_config('facebook', 'cb_verify_token');
                        if ($verify_token != $_REQUEST["hub_verify_token"]) {
                                logger('facebook_init: Wrong Facebook Callback Verifier - expected ' . $verify_token . ', got ' . $_REQUEST["hub_verify_token"]);
                                return;
                        }
-                       
+
                        if (x($_REQUEST, "hub_challenge")) {
                                logger('facebook_init: Answering Challenge: ' . $_REQUEST["hub_challenge"], LOGGER_DATA);
                                echo $_REQUEST["hub_challenge"];
                                die();
                        }
                }
-               
+
                require_once('include/items.php');
-               
+
                // this is a status update
                $content = file_get_contents("php://input");
                if (is_numeric($content)) $content = file_get_contents("php://input");
                $js = json_decode($content);
                logger(print_r($js, true), LOGGER_DATA);
-               
+
                if (!isset($js->object) || $js->object != "user" || !isset($js->entry)) {
                        logger('facebook_init: Could not parse Real-Time Update data', LOGGER_DEBUG);
                        return;
                }
-               
+
                $affected_users = array("feed" => array(), "friends" => array());
-               
+
                foreach ($js->entry as $entry) {
                        $fbuser = $entry->uid;
                        foreach ($entry->changed_fields as $field) {
@@ -118,20 +120,20 @@ function facebook_init(&$a) {
                                        continue;
                                }
                                if (in_array($fbuser, $affected_users[$field])) continue;
-                               
+
                                $r = q("SELECT `uid` FROM `pconfig` WHERE `cat` = 'facebook' AND `k` = 'self_id' AND `v` = '%s' LIMIT 1", dbesc($fbuser));
                                if(! count($r))
                                        continue;
                                $uid = $r[0]['uid'];
-                               
+
                                $access_token = get_pconfig($uid,'facebook','access_token');
                                if(! $access_token)
                                        return;
-                               
+
                                switch ($field) {
                                        case "feed":
                                                logger('facebook_init: FB-User ' . $fbuser . ' / feed', LOGGER_DEBUG);
-                                               
+
                                                if(! get_pconfig($uid,'facebook','no_wall')) {
                                                        $private_wall = intval(get_pconfig($uid,'facebook','private_wall'));
                                                        $s = fetch_url('https://graph.facebook.com/me/feed?access_token=' . $access_token);
@@ -145,11 +147,11 @@ function facebook_init(&$a) {
                                                                }
                                                        }
                                                }
-                                               
+
                                        break;
                                        case "friends":
                                                logger('facebook_init: FB-User ' . $fbuser . ' / friends', LOGGER_DEBUG);
-                                               
+
                                                fb_get_friends($uid, false);
                                                set_pconfig($uid,'facebook','friend_check',time());
                                        break;
@@ -161,10 +163,11 @@ function facebook_init(&$a) {
                }
        }
 
-       
        if($a->argc != 2)
                return;
+
        $nick = $a->argv[1];
+
        if(strlen($nick))
                $r = q("SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1",
                                dbesc($nick)
@@ -187,7 +190,7 @@ function facebook_init(&$a) {
 
                $x = fetch_url('https://graph.facebook.com/oauth/access_token?client_id='
                        . $appid . '&client_secret=' . $appsecret . '&redirect_uri='
-                       . urlencode($a->get_baseurl() . '/facebook/' . $nick) 
+                       . urlencode($a->get_baseurl() . '/facebook/' . $nick)
                        . '&code=' . $auth_code);
 
                logger('facebook_init: returned access token: ' . $x, LOGGER_DATA);
@@ -269,9 +272,13 @@ function fb_get_friends_sync_parsecontact($uid, $contact) {
 
     if(count($r)) {
 
+               // update profile photos once every two weeks as we have no notification of when they change.
+
+               $update_photo = (($r[0]['avatar-date'] < datetime_convert('','','now -14 days')) ? true : false);
+
         // 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'])) {
+        if((! $r[0]['photo']) || (! $r[0]['thumb']) || (! $r[0]['micro']) || ($update_photo)) {
             require_once("Photo.php");
 
             $photos = import_profile_photo('https://graph.facebook.com/' . $contact->id . '/picture', $uid, $r[0]['id']);
@@ -282,7 +289,7 @@ function fb_get_friends_sync_parsecontact($uid, $contact) {
                                         `name-date` = '%s',
                                         `uri-date` = '%s',
                                         `avatar-date` = '%s'
-                                        WHERE `id` = %d LIMIT 1
+                                        WHERE `id` = %d
                                 ",
                 dbesc($photos[0]),
                 dbesc($photos[1]),
@@ -311,7 +318,7 @@ function fb_get_friends_sync_parsecontact($uid, $contact) {
             dbesc($contact->id),
             dbesc('facebook ' . $contact->id),
             dbesc($contact->name),
-            dbesc(($contact->nickname) ? $contact->nickname : strtolower($contact->first_name)),
+            dbesc(($contact->nickname) ? $contact->nickname : mb_convert_case($contact->first_name, MB_CASE_LOWER, "UTF-8")),
             dbesc('https://graph.facebook.com/' . $contact->id . '/picture'),
             dbesc(NETWORK_FACEBOOK),
             intval(CONTACT_IS_FRIEND),
@@ -331,6 +338,14 @@ function fb_get_friends_sync_parsecontact($uid, $contact) {
 
     $contact_id  = $r[0]['id'];
 
+       $g = q("select def_gid from user where uid = %d limit 1",
+               intval($uid)
+       );
+       if($g && intval($g[0]['def_gid'])) {
+               require_once('include/group.php');
+               group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
+       }
+
     require_once("Photo.php");
 
     $photos = import_profile_photo($r[0]['photo'],$uid,$contact_id);
@@ -341,7 +356,7 @@ function fb_get_friends_sync_parsecontact($uid, $contact) {
                         `name-date` = '%s',
                         `uri-date` = '%s',
                         `avatar-date` = '%s'
-                        WHERE `id` = %d LIMIT 1
+                        WHERE `id` = %d
                 ",
         dbesc($photos[0]),
         dbesc($photos[1]),
@@ -368,10 +383,12 @@ function fb_get_friends_sync_full($uid, $access_token, $persons) {
         if($s) {
             $results = json_decode($s);
             logger('fb_get_friends: info: ' . print_r($results,true), LOGGER_DATA);
-            foreach ($results as $contact) {
-                if ($contact->code != 200) logger('fb_get_friends: not found: ' . print_r($contact,true), LOGGER_DEBUG);
-                else fb_get_friends_sync_parsecontact($uid, json_decode($contact->body));
-            }
+                       if(count($results)) {
+                   foreach ($results as $contact) {
+                   if ($contact->code != 200) logger('fb_get_friends: not found: ' . print_r($contact,true), LOGGER_DEBUG);
+                       else fb_get_friends_sync_parsecontact($uid, json_decode($contact->body));
+               }
+                       }
         }
     }
 }
@@ -395,6 +412,7 @@ function fb_get_friends($uid, $fullsync = true) {
        $access_token = get_pconfig($uid,'facebook','access_token');
 
        $no_linking = get_pconfig($uid,'facebook','no_linking');
+
        if($no_linking)
                return;
 
@@ -402,7 +420,7 @@ function fb_get_friends($uid, $fullsync = true) {
                return;
        $s = fetch_url('https://graph.facebook.com/me/friends?access_token=' . $access_token);
        if($s) {
-               logger('facebook: fb_get_friends: ' . $s, LOGGER_DATA);
+               logger('facebook: fb_gwet_friends: ' . $s, LOGGER_DATA);
                $j = json_decode($s);
                logger('facebook: fb_get_friends: json: ' . print_r($j,true), LOGGER_DATA);
                if(! $j->data)
@@ -419,7 +437,7 @@ function fb_get_friends($uid, $fullsync = true) {
 }
 
 // This is the POST method to the facebook settings page
-// Content is posted to Facebook in the function facebook_post_hook() 
+// Content is posted to Facebook in the function facebook_post_hook()
 
 /**
  * @param App $a
@@ -429,6 +447,10 @@ function facebook_post(&$a) {
        $uid = local_user();
        if($uid){
 
+
+               $fb_limited = get_config('facebook','crestrict');
+
+
                $value = ((x($_POST,'post_by_default')) ? intval($_POST['post_by_default']) : 0);
                set_pconfig($uid,'facebook','post_by_default', $value);
 
@@ -439,12 +461,18 @@ function facebook_post(&$a) {
 
                $private_wall = ((x($_POST,'facebook_private_wall')) ? intval($_POST['facebook_private_wall']) : 0);
                set_pconfig($uid,'facebook','private_wall',$private_wall);
-       
+
 
                set_pconfig($uid,'facebook','blocked_apps',escape_tags(trim($_POST['blocked_apps'])));
 
                $linkvalue = ((x($_POST,'facebook_linking')) ? intval($_POST['facebook_linking']) : 0);
-               set_pconfig($uid,'facebook','no_linking', (($linkvalue) ? 0 : 1));
+
+               if($fb_limited) {
+                       if($linkvalue == 0)
+                               set_pconfig($uid,'facebook','no_linking', 1);
+               }
+               else
+                       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
 
@@ -485,6 +513,13 @@ function facebook_content(&$a) {
                return '';
        }
 
+
+       if(! service_class_allows(local_user(),'facebook_connect')) {
+               notice( t('Permission denied.') . EOL);
+               return upgrade_bool_message();
+       }
+
+
        if($a->argc > 1 && $a->argv[1] === 'remove') {
                del_pconfig(local_user(),'facebook','post');
                info( t('Facebook disabled') . EOL);
@@ -495,6 +530,9 @@ function facebook_content(&$a) {
                info( t('Updating contacts') . EOL);
        }
 
+
+       $fb_limited = get_config('facebook','restrict');
+
        $o = '';
        
        $fb_installed = false;
@@ -516,7 +554,7 @@ function facebook_content(&$a) {
                return '';
        }
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' 
+       $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'
                . $a->get_baseurl() . '/addon/facebook/facebook.css' . '" media="all" />' . "\r\n";
 
        $o .= '<h3>' . t('Facebook Connect') . '</h3>';
@@ -548,6 +586,15 @@ function facebook_content(&$a) {
 
                $no_linking = get_pconfig(local_user(),'facebook','no_linking');
                $checked = (($no_linking) ? '' : ' checked="checked" ');
+               if($fb_limited) {
+                       if($no_linking) {
+                               $o .= EOL . '<strong>' . t('Facebook friend linking has been disabled on this site. The following settings will have no effect.') . '</strong>' . EOL;
+                               $checked .= " disabled ";
+                       }
+                       else {
+                               $o .= EOL . '<strong>' . t('Facebook friend linking has been disabled on this site. If you disable it, you will be unable to re-enable it.') . '</strong>' . EOL;
+                       }
+               }
                $o .= '<input type="checkbox" name="facebook_linking" value="1"' . $checked . '/>' . ' ' . t('Link all your Facebook friends and conversations on this website') . EOL ;
 
                $o .= '<p>' . t('Facebook conversations consist of your <em>profile wall</em> and your friend <em>stream</em>.');
@@ -571,7 +618,7 @@ function facebook_content(&$a) {
                $o .= '<div><label id="blocked-apps-label" for="blocked-apps">' . t('Comma separated applications to ignore') . ' </label></div>';
        $o .= '<div><textarea id="blocked-apps" name="blocked_apps" >' . htmlspecialchars($blocked_apps) . '</textarea></div>';
 
-               $o .= '<input type="submit" name="submit" value="' . t('Submit') . '" /></form></div>';
+               $o .= '<input type="submit" name="submit" value="' . t('Save Settings') . '" /></form></div>';
        }
 
        return $o;
@@ -592,7 +639,7 @@ function facebook_cron($a,$b) {
                $poll_interval = FACEBOOK_DEFAULT_POLL_INTERVAL;
 
        if($last) {
-               $next = $last + $poll_interval;
+               $next = $last + ($poll_interval * 60);
                if($next > time()) 
                        return;
        }
@@ -643,8 +690,15 @@ function facebook_cron($a,$b) {
                                logger('facebook_cron: Successful', LOGGER_NORMAL);
                        else {
                                logger('facebook_cron: Failed', LOGGER_NORMAL);
-                               
-                               if(strlen($a->config['admin_email']) && !get_config('facebook', 'realtime_err_mailsent')) {
+
+                               $first_err = get_config('facebook', 'realtime_first_err');
+                               if (!$first_err) {
+                                       $first_err = time();
+                                       set_config('facebook', 'realtime_first_err', $first_err);
+                               }
+                               $first_err_ago = (time() - $first_err);
+
+                               if(strlen($a->config['admin_email']) && !get_config('facebook', 'realtime_err_mailsent') && $first_err_ago > (FACEBOOK_RTU_ERR_MAIL_AFTER_MINUTES * 60)) {
                                        mail($a->config['admin_email'], t('Problems with Facebook Real-Time Updates'),
                                                "Hi!\n\nThere's a problem with the Facebook Real-Time Updates that cannot be solved automatically. Maybe a permission issue?\n\nPlease try to re-activate it on " . $a->config["system"]["url"] . "/admin/plugins/facebook\n\nThis e-mail will only be sent once.",
                                                'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
@@ -657,6 +711,7 @@ function facebook_cron($a,$b) {
                        }
                } else { // !facebook_check_realtime_active()
                        del_config('facebook', 'realtime_err_mailsent');
+                       del_config('facebook', 'realtime_first_err');
                }
        }
        
@@ -687,18 +742,19 @@ function facebook_plugin_admin(&$a, &$o){
 
 
        $o = '<input type="hidden" name="form_security_token" value="' . get_form_security_token("fbsave") . '">';
-       
+
        $o .= '<h4>' . t('Facebook API Key') . '</h4>';
-       
+
        $appid  = get_config('facebook', 'appid'  );
        $appsecret = get_config('facebook', 'appsecret' );
        $poll_interval = get_config('facebook', 'poll_interval' );
+       $sync_comments = get_config('facebook', 'sync_comments' );
        if (!$poll_interval) $poll_interval = FACEBOOK_DEFAULT_POLL_INTERVAL;
-       
+
        $ret1 = q("SELECT `v` FROM `config` WHERE `cat` = 'facebook' AND `k` = 'appid' LIMIT 1");
        $ret2 = q("SELECT `v` FROM `config` WHERE `cat` = 'facebook' AND `k` = 'appsecret' LIMIT 1");
        if ((count($ret1) > 0 && $ret1[0]['v'] != $appid) || (count($ret2) > 0 && $ret2[0]['v'] != $appsecret)) $o .= t('Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.<br><br>');
-       
+
        $working_connection = false;
        if ($appid && $appsecret) {
                $subs = facebook_subscriptions_get();
@@ -706,12 +762,13 @@ function facebook_plugin_admin(&$a, &$o){
                elseif (is_array($subs)) {
                        $o .= t('The given API Key seems to work correctly.') . '<br>';
                        $working_connection = true;
-               } else $o .= t('The correctness of the API Key could not be detected. Somthing strange\'s going on.') . '<br>';
+               } else $o .= t('The correctness of the API Key could not be detected. Something strange\'s going on.') . '<br>';
        }
-       
-       $o .= '<label for="fb_appid">' . t('App-ID / API-Key') . '</label><input name="appid" type="text" value="' . escape_tags($appid ? $appid : "") . '"><br style="clear: both;">';
-       $o .= '<label for="fb_appsecret">' . t('Application secret') . '</label><input name="appsecret" type="text" value="' . escape_tags($appsecret ? $appsecret : "") . '"><br style="clear: both;">';
-       $o .= '<label for="fb_poll_interval">' . sprintf(t('Polling Interval (min. %1$s minutes)'), FACEBOOK_MIN_POLL_INTERVAL) . '</label><input name="poll_interval" type="number" min="' . FACEBOOK_MIN_POLL_INTERVAL . '" value="' . $poll_interval . '"><br style="clear: both;">';
+
+       $o .= '<label for="fb_appid">' . t('App-ID / API-Key') . '</label><input id="fb_appid" name="appid" type="text" value="' . escape_tags($appid ? $appid : "") . '"><br style="clear: both;">';
+       $o .= '<label for="fb_appsecret">' . t('Application secret') . '</label><input id="fb_appsecret" name="appsecret" type="text" value="' . escape_tags($appsecret ? $appsecret : "") . '"><br style="clear: both;">';
+       $o .= '<label for="fb_poll_interval">' . sprintf(t('Polling Interval in minutes (minimum %1$s minutes)'), FACEBOOK_MIN_POLL_INTERVAL) . '</label><input name="poll_interval" id="fb_poll_interval" type="number" min="' . FACEBOOK_MIN_POLL_INTERVAL . '" value="' . $poll_interval . '"><br style="clear: both;">';
+       $o .= '<label for="fb_sync_comments">' . t('Synchronize comments (no comments on Facebook are missed, at the cost of increased system load)') . '</label><input name="sync_comments" id="fb_sync_comments" type="checkbox" ' . ($sync_comments ? 'checked' : '') . '><br style="clear: both;">';
        $o .= '<input type="submit" name="fb_save_keys" value="' . t('Save') . '">';
        
        if ($working_connection) {
@@ -729,9 +786,9 @@ function facebook_plugin_admin(&$a, &$o){
 
 /**
  * @param App $a
- * @param null|object $o
  */
-function facebook_plugin_admin_post(&$a, &$o){
+
+function facebook_plugin_admin_post(&$a){
        check_form_security_token_redirectOnErr('/admin/plugins/facebook', 'fbsave');
        
        if (x($_REQUEST,'fb_save_keys')) {
@@ -739,6 +796,7 @@ function facebook_plugin_admin_post(&$a, &$o){
                set_config('facebook', 'appsecret', $_REQUEST['appsecret']);
                $poll_interval = IntVal($_REQUEST['poll_interval']);
                if ($poll_interval >= FACEBOOK_MIN_POLL_INTERVAL) set_config('facebook', 'poll_interval', $poll_interval);
+               set_config('facebook', 'sync_comments', (x($_REQUEST, 'sync_comments') ? 1 : 0));
                del_config('facebook', 'app_access_token');
                info(t('The new values have been saved.'));
        }
@@ -894,7 +952,7 @@ function facebook_post_hook(&$a,&$b) {
                        if($fb_token && ($toplevel || $b['private'] || $reply)) {
                                logger('facebook: able to post');
                                require_once('library/facebook.php');
-                               require_once('include/bbcode.php');     
+                               require_once('include/bbcode.php');
 
                                $msg = $b['body'];
 
@@ -950,6 +1008,10 @@ function facebook_post_hook(&$a,&$b) {
                                        if(preg_match("/\[img\](.*?)\[\/img\]/is",$b['body'],$matches))
                                                $image = $matches[1];
 
+                               // When saved into the database the content is sent through htmlspecialchars
+                               // That means that we have to decode all image-urls
+                               $image = htmlspecialchars_decode($image);
+
                                // Checking for a bookmark element
                                $body = $b['body'];
                                if (strpos($body, "[bookmark") !== false) {
@@ -969,7 +1031,7 @@ function facebook_post_hook(&$a,&$b) {
                                }
 
                                // At first convert the text to html
-                               $html = bbcode($body);
+                               $html = bbcode($body, false, false);
 
                                // Then convert it to plain text
                                $msg = trim($b['title']." \n\n".html2plain($html, 0, true));
@@ -1033,13 +1095,13 @@ function facebook_post_hook(&$a,&$b) {
 
                                // Fallback - if message is empty
                                if(!strlen($msg))
-                                       $msg = $link;
+                                       $msg = $linkname;
 
                                if(!strlen($msg))
-                                       $msg = $image;
+                                       $msg = $link;
 
                                if(!strlen($msg))
-                                       $msg = $linkname;
+                                       $msg = $image;
 
                                // If there is nothing to post then exit
                                if(!strlen($msg))
@@ -1047,23 +1109,27 @@ function facebook_post_hook(&$a,&$b) {
 
                                logger('Facebook post: msg=' . $msg, LOGGER_DATA);
 
-                               if($likes) { 
+                               if($likes) {
                                        $postvars = array('access_token' => $fb_token);
                                }
                                else {
+                                       // message, picture, link, name, caption, description, source, place, tags
                                        $postvars = array(
-                                               'access_token' => $fb_token, 
+                                               'access_token' => $fb_token,
                                                'message' => $msg
                                        );
-                                       if(isset($image)) {
+                                       if(trim($image) != "") {
                                                $postvars['picture'] = $image;
-                                               //$postvars['type'] = "photo";
                                        }
-                                       if(isset($link)) {
+                                       if(trim($link) != "") {
                                                $postvars['link'] = $link;
-                                               //$postvars['type'] = "link";
+
+                                               // The following doesn't work - why?
+                                               if ((stristr($link,'youtube')) || (stristr($link,'youtu.be')) || (stristr($link,'vimeo'))) {
+                                                       $postvars['source'] = $link;
+                                               }
                                        }
-                                       if(isset($linkname))
+                                       if(trim($linkname) != "")
                                                $postvars['name'] = $linkname;
                                }
 
@@ -1079,15 +1145,15 @@ function facebook_post_hook(&$a,&$b) {
 
                                if($reply) {
                                        $url = 'https://graph.facebook.com/' . $reply . '/' . (($likes) ? 'likes' : 'comments');
-                               } else if (($link != "")  or ($image != "") or ($b['title'] == '') or (strlen($msg) < 500)) { 
+                               } else if (($link != "")  or ($image != "") or ($b['title'] == '') or (strlen($msg) < 500)) {
                                        $url = 'https://graph.facebook.com/me/feed';
                                        if($b['plink'])
                                                $postvars['actions'] = '{"name": "' . t('View on Friendica') . '", "link": "' .  $b['plink'] . '"}';
                                } else {
                                        // if its only a message and a subject and the message is larger than 500 characters then post it as note
                                        $postvars = array(
-                                               'access_token' => $fb_token, 
-                                               'message' => bbcode($b['body']),
+                                               'access_token' => $fb_token,
+                                               'message' => bbcode($b['body'], false, false),
                                                'subject' => $b['title'],
                                        );
                                        $url = 'https://graph.facebook.com/me/notes';
@@ -1105,7 +1171,7 @@ function facebook_post_hook(&$a,&$b) {
 
                                        $retj = json_decode($x);
                                        if($retj->id) {
-                                               q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d LIMIT 1",
+                                               q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d",
                                                        dbesc('fb::' . $retj->id),
                                                        intval($b['id'])
                                                );
@@ -1117,14 +1183,14 @@ function facebook_post_hook(&$a,&$b) {
                                                        add_to_queue($a->contact,NETWORK_FACEBOOK,$s);
                                                        notice( t('Facebook post failed. Queued for retry.') . EOL);
                                                }
-                                               
+
                                                if (isset($retj->error) && $retj->error->type == "OAuthException" && $retj->error->code == 190) {
                                                        logger('Facebook session has expired due to changed password.', LOGGER_DEBUG);
-                                                       
+
                                                        $last_notification = get_pconfig($b['uid'], 'facebook', 'session_expired_mailsent');
                                                        if (!$last_notification || $last_notification < (time() - FACEBOOK_SESSION_ERR_NOTIFICATION_INTERVAL)) {
                                                                require_once('include/enotify.php');
-                                                       
+
                                                                $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($b['uid']) );
                                                                notification(array(
                                                                        'uid' => $b['uid'],
@@ -1137,7 +1203,7 @@ function facebook_post_hook(&$a,&$b) {
                                                                        'source_link'  => $a->config["system"]["url"],
                                                                        'source_photo' => $a->config["system"]["url"] . '/images/person-80.jpg',
                                                                ));
-                                                               
+
                                                                set_pconfig($b['uid'], 'facebook', 'session_expired_mailsent', time());
                                                        } else logger('Facebook: No notification, as the last one was sent on ' . $last_notification, LOGGER_DEBUG);
                                                }
@@ -1178,8 +1244,12 @@ function facebook_post_local(&$a,&$b) {
                $fb_enable = (($fb_post && x($_REQUEST,'facebook_enable')) ? intval($_REQUEST['facebook_enable']) : 0);
 
                // if API is used, default to the chosen settings
-               if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'facebook','post_by_default')))
-                       $fb_enable = 1;
+               // but allow a specific override
+
+               if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'facebook','post_by_default'))) {
+                       if(! x($_REQUEST,'facebook_enable'))
+                               $fb_enable = 1;
+               }
 
                if(! $fb_enable)
                        return;
@@ -1237,11 +1307,11 @@ function fb_queue_hook(&$a,&$b) {
 
                                $retj = json_decode($j);
                                if($retj->id) {
-                                       q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d LIMIT 1",
+                                       q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d",
                                                dbesc('fb::' . $retj->id),
                                                intval($item)
                                        );
-                                       logger('facebook_queue: success: ' . $j); 
+                                       logger('facebook_queue: success: ' . $j);
                                        remove_queue_item($x['id']);
                                }
                                else {
@@ -1289,7 +1359,7 @@ function fb_get_timeline($access_token, &$since) {
                else
                        break;
 
-               $url = $j->paging->next;
+               $url = (isset($j->paging) && isset($j->paging->next) ? $j->paging->next : '');
 
        } while (($oldestdate > $since) and ($since != 0) and ($url != ''));
 
@@ -1361,6 +1431,219 @@ function fb_get_photo($uid,$link) {
        return "";
 }
 
+
+/**
+ * @param App $a
+ * @param array $user
+ * @param array $self
+ * @param string $fb_id
+ * @param bool $wall
+ * @param array $orig_post
+ * @param object $cmnt
+ */
+function fb_consume_comment(&$a, &$user, &$self, $fb_id, $wall, &$orig_post, &$cmnt) {
+
+    if(! $orig_post)
+        return;
+
+    $top_item = $orig_post['id'];
+    $uid = IntVal($user[0]['uid']);
+
+    $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))
+        return;
+
+    $cmntdata = array();
+    $cmntdata['parent'] = $top_item;
+    $cmntdata['verb'] = ACTIVITY_POST;
+    $cmntdata['gravity'] = 6;
+    $cmntdata['uid'] = $uid;
+    $cmntdata['wall'] = (($wall) ? 1 : 0);
+    $cmntdata['uri'] = 'fb::' . $cmnt->id;
+    $cmntdata['parent-uri'] = $orig_post['uri'];
+    if($cmnt->from->id == $fb_id) {
+        $cmntdata['contact-id'] = $self[0]['id'];
+    }
+    else {
+        $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d LIMIT 1",
+            dbesc($cmnt->from->id),
+            intval($uid)
+        );
+        if(count($r)) {
+            $cmntdata['contact-id'] = $r[0]['id'];
+            if($r[0]['blocked'] || $r[0]['readonly'])
+                return;
+        }
+    }
+    if(! x($cmntdata,'contact-id'))
+        $cmntdata['contact-id'] = $orig_post['contact-id'];
+
+    $cmntdata['app'] = 'facebook';
+    $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;
+    $cmntdata['author-avatar'] = 'https://graph.facebook.com/' . $cmnt->from->id . '/picture';
+    $cmntdata['body'] = $cmnt->message;
+    $item = item_store($cmntdata);
+
+    $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0",
+        dbesc($orig_post['uri']),
+        intval($uid)
+    );
+
+    if(count($myconv)) {
+        $importer_url = $a->get_baseurl() . '/profile/' . $user[0]['nickname'];
+
+        foreach($myconv as $conv) {
+
+            // now if we find a match, it means we're in this conversation
+
+            if(! link_compare($conv['author-link'],$importer_url))
+                continue;
+
+            require_once('include/enotify.php');
+
+            $conv_parent = $conv['parent'];
+
+            notification(array(
+                'type'         => NOTIFY_COMMENT,
+                'notify_flags' => $user[0]['notify-flags'],
+                'language'     => $user[0]['language'],
+                'to_name'      => $user[0]['username'],
+                'to_email'     => $user[0]['email'],
+                'uid'          => $user[0]['uid'],
+                'item'         => $cmntdata,
+                'link'            => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $item,
+                'source_name'  => $cmntdata['author-name'],
+                'source_link'  => $cmntdata['author-link'],
+                'source_photo' => $cmntdata['author-avatar'],
+                'verb'         => ACTIVITY_POST,
+                'otype'        => 'item',
+                'parent'       => $conv_parent,
+            ));
+
+            // only send one notification
+            break;
+        }
+    }
+}
+
+
+/**
+ * @param App $a
+ * @param array $user
+ * @param array $self
+ * @param string $fb_id
+ * @param bool $wall
+ * @param array $orig_post
+ * @param object $likes
+ */
+function fb_consume_like(&$a, &$user, &$self, $fb_id, $wall, &$orig_post, &$likes) {
+
+    $top_item = $orig_post['id'];
+    $uid = IntVal($user[0]['uid']);
+
+    if(! $orig_post)
+        return;
+
+    // If we posted the like locally, it will be found with our url, not the FB url.
+
+    $second_url = (($likes->id == $fb_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($second_url)
+    );
+
+    if(count($r))
+        return;
+
+    $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'] = $orig_post['uri'];
+    if($likes->id == $fb_id)
+        $likedata['contact-id'] = $self[0]['id'];
+    else {
+        $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+            dbesc($likes->id),
+            intval($uid)
+        );
+        if(count($r))
+            $likedata['contact-id'] = $r[0]['id'];
+    }
+    if(! x($likedata,'contact-id'))
+        $likedata['contact-id'] = $orig_post['contact-id'];
+
+    $likedata['app'] = 'facebook';
+    $likedata['verb'] = ACTIVITY_LIKE;
+    $likedata['author-name'] = $likes->name;
+    $likedata['author-link'] = 'http://facebook.com/profile.php?id=' . $likes->id;
+    $likedata['author-avatar'] = 'https://graph.facebook.com/' . $likes->id . '/picture';
+
+    $author  = '[url=' . $likedata['author-link'] . ']' . $likedata['author-name'] . '[/url]';
+    $objauthor =  '[url=' . $orig_post['author-link'] . ']' . $orig_post['author-name'] . '[/url]';
+    $post_type = t('status');
+    $plink = '[url=' . $orig_post['plink'] . ']' . $post_type . '[/url]';
+    $likedata['object-type'] = ACTIVITY_OBJ_NOTE;
+
+    $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="' . xmlify($orig_post['plink']) . '" />') . '</link><title>' . $orig_post['title'] . '</title><content>' . $orig_post['body'] . '</content></object>';
+
+    item_store($likedata);
+}
+
+/**
+ * @param App $a
+ * @param array $user
+ * @param object $entry
+ * @param array $self
+ * @param string $fb_id
+ * @param bool $wall
+ * @param array $orig_post
+ */
+function fb_consume_status(&$a, &$user, &$entry, &$self, $fb_id, $wall, &$orig_post) {
+    $uid = IntVal($user[0]['uid']);
+    $access_token = get_pconfig($uid, 'facebook', 'access_token');
+
+    $s = fetch_url('https://graph.facebook.com/' . $entry->id . '?access_token=' . $access_token);
+    if($s) {
+        $j = json_decode($s);
+        if (isset($j->comments) && isset($j->comments->data))
+            foreach ($j->comments->data as $cmnt)
+                fb_consume_comment($a, $user, $self, $fb_id, $wall, $orig_post, $cmnt);
+
+        if (isset($j->likes) && isset($j->likes->data) && isset($j->likes->count)) {
+            if (count($j->likes->data) == $j->likes->count) {
+                foreach ($j->likes->data as $likers) fb_consume_like($a, $user, $self, $fb_id, $wall, $orig_post, $likers);
+            } else {
+                $t = fetch_url('https://graph.facebook.com/' . $entry->id . '/likes?access_token=' . $access_token);
+                if ($t) {
+                    $k = json_decode($t);
+                    if (isset($k->data))
+                        foreach ($k->data as $likers)
+                            fb_consume_like($a, $user, $self, $fb_id, $wall, $orig_post, $likers);
+                }
+            }
+        }
+    }
+}
+
 /**
  * @param int $uid
  * @param object $j
@@ -1370,7 +1653,6 @@ function fb_consume_stream($uid,$j,$wall = false) {
 
        $a = get_app();
 
-
        $user = q("SELECT * FROM `user` WHERE `uid` = %d AND `account_expired` = 0 LIMIT 1",
                intval($uid)
        );
@@ -1390,6 +1672,9 @@ function fb_consume_stream($uid,$j,$wall = false) {
        $blocked_apps = get_pconfig($uid,'facebook','blocked_apps');
        $blocked_apps_arr = explode(',',$blocked_apps);
 
+       $sync_comments = get_config('facebook', 'sync_comments');
+
+    /** @var string $self_id  */
        $self_id = get_pconfig($uid,'facebook','self_id');
        if(! count($j->data) || (! strlen($self_id)))
                return;
@@ -1424,7 +1709,7 @@ function fb_consume_stream($uid,$j,$wall = false) {
                        else {
                                // Looking if user is known - if not he is added
                                $access_token = get_pconfig($uid, 'facebook', 'access_token');
-                               fb_get_friends_sync_new($uid, $access_token, $from);
+                               fb_get_friends_sync_new($uid, $access_token, array($from));
 
                                $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
                                        dbesc($from->id),
@@ -1473,32 +1758,32 @@ function fb_consume_stream($uid,$j,$wall = false) {
 
                        logger('facebook: post '.$entry->id.' from '.$from->name);
 
-                       $datarray['body'] = (x($entry, 'message') ? escape_tags($entry->message) : '');
+                       $datarray['body'] = (isset($entry->message) ? escape_tags($entry->message) : '');
 
-                       if(x($entry, 'name') and x($entry, 'link'))
+                       if(isset($entry->name) and isset($entry->link))
                                $datarray['body'] .= "\n\n[bookmark=".$entry->link."]".$entry->name."[/bookmark]";
-                       elseif (x($entry, 'name'))
+                       elseif (isset($entry->name))
                                $datarray['body'] .= "\n\n[b]" . $entry->name."[/b]";
 
-                       if(x($entry, 'caption')) {
-                               if(!x($entry, 'name') and x($entry, 'link'))
+                       if(isset($entry->caption)) {
+                               if(!isset($entry->name) and isset($entry->link))
                                        $datarray['body'] .= "\n\n[bookmark=".$entry->link."]".$entry->caption."[/bookmark]";
                                else
                                        $datarray['body'] .= "[i]" . $entry->caption."[/i]\n";
                        }
 
-                       if(!x($entry, 'caption') and !x($entry, 'name')) {
-                               if (x($entry, 'link'))
+                       if(!isset($entry->caption) and !isset($entry->name)) {
+                               if (isset($entry->link))
                                        $datarray['body'] .= "\n[url]".$entry->link."[/url]\n";
                                else
                                        $datarray['body'] .= "\n";
                        }
 
                        $quote = "";
-                       if(x($entry, 'description'))
+                       if(isset($entry->description))
                                $quote = $entry->description;
 
-                       if (x($entry, 'properties'))
+                       if (isset($entry->properties))
                                foreach ($entry->properties as $property)
                                        $quote .= "\n".$property->name.": [url=".$property->href."]".$property->text."[/url]";
 
@@ -1508,19 +1793,19 @@ function fb_consume_stream($uid,$j,$wall = false) {
                        // Only import the picture when the message is no video
                        // oembed display a picture of the video as well 
                        if ($entry->type != "video") {
-                               if(x($entry, 'picture') && x($entry, 'link')) {
-                                       $datarray['body'] .= "\n" . '[url=' . $entry->link . '][img]'.$entry->picture.'[/img][/url]';   
+                               if(isset($entry->picture) && isset($entry->link)) {
+                                       $datarray['body'] .= "\n" . '[url=' . $entry->link . '][img]'.$entry->picture.'[/img][/url]';
                                }
                                else {
-                                       if(x($entry, 'picture'))
+                                       if(isset($entry->picture))
                                                $datarray['body'] .= "\n" . '[img]' . $entry->picture . '[/img]';
                                        // if just a link, it may be a wall photo - check
-                                       if(x($entry, 'link'))
+                                       if(isset($entry->link))
                                                $datarray['body'] .= fb_get_photo($uid,$entry->link);
                                }
                        }
 
-                       if (($datarray['app'] == "Events") and x($entry, 'actions'))
+                       if (($datarray['app'] == "Events") and isset($entry->actions))
                                foreach ($entry->actions as $action)
                                        if ($action->name == "View")
                                                $datarray['body'] .= " [url=".$action->link."]".$entry->story."[/url]";
@@ -1540,10 +1825,10 @@ function fb_consume_stream($uid,$j,$wall = false) {
 
                        $datarray['body'] .= "\n";
 
-                       if (x($entry, 'icon'))
+                       if (isset($entry->icon))
                                $datarray['body'] .= "[img]".$entry->icon."[/img] &nbsp; ";
 
-                       if (x($entry, 'actions'))
+                       if (isset($entry->actions))
                                foreach ($entry->actions as $action)
                                        if (($action->name != "Comment") and ($action->name != "Like"))
                                                $datarray['body'] .= "[url=".$action->link."]".$action->name."[/url] &nbsp; ";
@@ -1553,7 +1838,7 @@ function fb_consume_stream($uid,$j,$wall = false) {
                        //if(($datarray['body'] != '') and ($uid == 1))
                        //      $datarray['body'] .= "[noparse]".print_r($entry, true)."[/noparse]";
 
-            if (x($entry, 'place')) {
+            if (isset($entry->place)) {
                            if ($entry->place->name or $entry->place->location->street or
                                    $entry->place->location->city or $entry->place->location->Denmark) {
                                    $datarray['coord'] = '';
@@ -1575,7 +1860,7 @@ function fb_consume_stream($uid,$j,$wall = false) {
                        // If the entry has a privacy policy, we cannot assume who can or cannot see it,
                        // as the identities are from a foreign system. Mark it as private to the owner.
 
-                       if(x($entry, 'privacy') && $entry->privacy->value !== 'EVERYONE') {
+                       if(isset($entry->privacy) && $entry->privacy->value !== 'EVERYONE') {
                                $datarray['private'] = 1;
                                $datarray['allow_cid'] = '<' . $self[0]['id'] . '>';
                        }
@@ -1591,169 +1876,53 @@ function fb_consume_stream($uid,$j,$wall = false) {
                        }
                }
 
-               if(x($entry, 'likes') && x($entry->likes, 'data'))
+               /**  @var array $orig_post */
+
+        $likers_num = (isset($entry->likes) && isset($entry->likes->count) ? IntVal($entry->likes->count) : 0 );
+               if(isset($entry->likes) && isset($entry->likes->data))
                        $likers = $entry->likes->data;
                else
                        $likers = null;
 
-               if(x($entry, 'comments') && x($entry->comments, 'data'))
+        $comments_num = (isset($entry->comments) && isset($entry->comments->count) ? IntVal($entry->comments->count) : 0 );
+               if(isset($entry->comments) && isset($entry->comments->data))
                        $comments = $entry->comments->data;
                else
                        $comments = null;
 
-               if(is_array($likers)) {
-                       foreach($likers as $likes) {
-
-                               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($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'] = $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 AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
-                                               dbesc($likes->id),
-                                               intval($uid)
-                                       );
-                                       if(count($r))
-                                               $likedata['contact-id'] = $r[0]['id'];
-                               }
-                               if(! x($likedata,'contact-id'))
-                                       $likedata['contact-id'] = $orig_post['contact-id'];
-
-                               $likedata['app'] = 'facebook';
-                               $likedata['verb'] = ACTIVITY_LIKE;                                              
-                               $likedata['author-name'] = $likes->name;
-                               $likedata['author-link'] = 'http://facebook.com/profile.php?id=' . $likes->id;
-                               $likedata['author-avatar'] = 'https://graph.facebook.com/' . $likes->id . '/picture';
-                               
-                               $author  = '[url=' . $likedata['author-link'] . ']' . $likedata['author-name'] . '[/url]';
-                               $objauthor =  '[url=' . $orig_post['author-link'] . ']' . $orig_post['author-name'] . '[/url]';
-                               $post_type = t('status');
-                       $plink = '[url=' . $orig_post['plink'] . ']' . $post_type . '[/url]';
-                               $likedata['object-type'] = ACTIVITY_OBJ_NOTE;
-
-                               $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="' . xmlify($orig_post['plink']) . '" />') . '</link><title>' . $orig_post['title'] . '</title><content>' . $orig_post['body'] . '</content></object>';  
-
-                               item_store($likedata);
-                       }
+        $needs_sync = false;
+
+        if(is_array($likers)) {
+                       foreach($likers as $likes) fb_consume_like($a, $user, $self, $self_id, $wall, $orig_post, $likes);
+            if ($sync_comments) {
+                $r = q("SELECT COUNT(*) likes FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `verb` = '%s' AND `parent-uri` != `uri`",
+                    dbesc($orig_post['uri']),
+                    intval($uid),
+                    dbesc(ACTIVITY_LIKE)
+                );
+                if ($r[0]['likes'] < $likers_num) {
+                    logger('fb_consume_stream: missing likes found for ' . $orig_post['uri'] . ' (we have ' . $r[0]['likes'] . ' of ' . $likers_num . '). Synchronizing...', LOGGER_DEBUG);
+                    $needs_sync = true;
+                }
+            }
                }
-               if(is_array($comments)) {
-                       foreach($comments as $cmnt) {
-
-                               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))
-                                       continue;
-
-                               $cmntdata = array();
-                               $cmntdata['parent'] = $top_item;
-                               $cmntdata['verb'] = ACTIVITY_POST;
-                               $cmntdata['gravity'] = 6;
-                               $cmntdata['uid'] = $uid;
-                               $cmntdata['wall'] = (($wall) ? 1 : 0);
-                               $cmntdata['uri'] = 'fb::' . $cmnt->id;
-                               $cmntdata['parent-uri'] = $orig_post['uri'];
-                               if($cmnt->from->id == $self_id) {
-                                       $cmntdata['contact-id'] = $self[0]['id'];
-                               }
-                               else {
-                                       $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d LIMIT 1",
-                                               dbesc($cmnt->from->id),
-                                               intval($uid)
-                                       );
-                                       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['app'] = 'facebook';
-                               $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;
-                               $cmntdata['author-avatar'] = 'https://graph.facebook.com/' . $cmnt->from->id . '/picture';
-                               $cmntdata['body'] = $cmnt->message;
-                               $item = item_store($cmntdata);                  
-                               
-                               $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
-                                       dbesc($orig_post['uri']),
-                                       intval($uid)
-                               );
-
-                               if(count($myconv)) {
-                                       $importer_url = $a->get_baseurl() . '/profile/' . $user[0]['nickname'];
 
-                                       foreach($myconv as $conv) {
-
-                                               // now if we find a match, it means we're in this conversation
-       
-                                               if(! link_compare($conv['author-link'],$importer_url))
-                                                       continue;
-
-                                               require_once('include/enotify.php');
-                                                               
-                                               $conv_parent = $conv['parent'];
-
-                                               notification(array(
-                                                       'type'         => NOTIFY_COMMENT,
-                                                       'notify_flags' => $user[0]['notify-flags'],
-                                                       'language'     => $user[0]['language'],
-                                                       'to_name'      => $user[0]['username'],
-                                                       'to_email'     => $user[0]['email'],
-                                                       'uid'          => $user[0]['uid'],
-                                                       'item'         => $cmntdata,
-                                                       'link'             => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $item,
-                                                       'source_name'  => $cmntdata['author-name'],
-                                                       'source_link'  => $cmntdata['author-link'],
-                                                       'source_photo' => $cmntdata['author-avatar'],
-                                                       'verb'         => ACTIVITY_POST,
-                                                       'otype'        => 'item',
-                                                       'parent'       => $conv_parent,
-                                               ));
-
-                                               // only send one notification
-                                               break;
-                                       }
-                               }
+               if(is_array($comments)) {
+                       foreach($comments as $cmnt) fb_consume_comment($a, $user, $self, $self_id, $wall, $orig_post, $cmnt);
+                       if ($sync_comments) {
+                           $r = q("SELECT COUNT(*) comments FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `verb` = '%s' AND `parent-uri` != `uri`",
+                    dbesc($orig_post['uri']),
+                    intval($uid),
+                    ACTIVITY_POST
+                );
+                           if ($r[0]['comments'] < $comments_num) {
+                    logger('fb_consume_stream: missing comments found for ' . $orig_post['uri'] . ' (we have ' . $r[0]['comments'] . ' of ' . $comments_num . '). Synchronizing...', LOGGER_DEBUG);
+                    $needs_sync = true;
+                }
                        }
                }
+
+               if ($needs_sync) fb_consume_status($a, $user, $entry, $self, $self_id, $wall, $orig_post);
        }
 }