' . t('Facebook conversations consist of your profile wall and your friend stream.');
@@ -594,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;
}
@@ -645,9 +690,16 @@ 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')) {
- $res = mail($a->config['admin_email'], t('Problems with Facebook Real-Time Updates'),
+
+ $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"
. 'Content-type: text/plain; charset=UTF-8' . "\n"
@@ -659,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');
}
}
@@ -695,6 +748,7 @@ function facebook_plugin_admin(&$a, &$o){
$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");
@@ -708,12 +762,13 @@ function facebook_plugin_admin(&$a, &$o){
elseif (is_array($subs)) {
$o .= t('The given API Key seems to work correctly.') . '
';
$working_connection = true;
- } else $o .= t('The correctness of the API Key could not be detected. Somthing strange\'s going on.') . '
';
+ } else $o .= t('The correctness of the API Key could not be detected. Something strange\'s going on.') . '
';
}
- $o .= '
';
- $o .= '
';
- $o .= '
';
+ $o .= '
';
+ $o .= '
';
+ $o .= '
';
+ $o .= '
';
$o .= '';
if ($working_connection) {
@@ -731,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')) {
@@ -741,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.'));
}
@@ -896,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'];
@@ -906,8 +962,8 @@ function facebook_post_hook(&$a,&$b) {
// unless it's a dislike - just send the text as a comment
- if($b['verb'] == ACTIVITY_DISLIKE)
- $msg = trim(strip_tags(bbcode($msg)));
+ // if($b['verb'] == ACTIVITY_DISLIKE)
+ // $msg = trim(strip_tags(bbcode($msg)));
// Old code
/*$search_str = $a->get_baseurl() . '/search';
@@ -952,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) {
@@ -971,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));
@@ -1017,7 +1077,6 @@ function facebook_post_hook(&$a,&$b) {
// Since facebook increased the maxpostlen massively this never should happen again :)
if (strlen($msg) > FACEBOOK_MAXPOSTLEN) {
- $shortlink = "";
require_once('library/slinky.php');
$display_url = $b['plink'];
@@ -1036,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))
@@ -1050,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;
}
@@ -1082,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';
@@ -1181,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;
@@ -1292,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 +1428,220 @@ function fb_get_photo($uid,$link) {
return "\n\n" . '[url=' . $link . '][img]' . $j->picture . '[/img][/url]';
//else
// return "\n" . '[url=' . $link . ']' . t('link') . '[/url]';
+ 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'] = '';
+
+ 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);
+ }
+ }
+ }
+ }
}
/**
@@ -1372,14 +1653,13 @@ 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)
);
if(! count($user))
return;
- $my_local_url = $a->get_baseurl() . '/profile/' . $user[0]['nickname'];
+ // $my_local_url = $a->get_baseurl() . '/profile/' . $user[0]['nickname'];
$no_linking = get_pconfig($uid,'facebook','no_linking');
if($no_linking)
@@ -1392,11 +1672,16 @@ 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;
- foreach($j->data as $entry) {
+ $top_item = 0;
+
+ foreach($j->data as $entry) {
logger('fb_consume: entry: ' . print_r($entry,true), LOGGER_DATA);
$datarray = array();
@@ -1406,12 +1691,10 @@ function fb_consume_stream($uid,$j,$wall = false) {
intval($uid)
);
if(count($r)) {
- $post_exists = true;
$orig_post = $r[0];
$top_item = $r[0]['id'];
}
else {
- $post_exists = false;
$orig_post = null;
}
@@ -1426,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),
@@ -1475,32 +1758,32 @@ function fb_consume_stream($uid,$j,$wall = false) {
logger('facebook: post '.$entry->id.' from '.$from->name);
- $datarray['body'] = escape_tags($entry->message);
+ $datarray['body'] = (isset($entry->message) ? escape_tags($entry->message) : '');
- if($entry->name and $entry->link)
+ if(isset($entry->name) and isset($entry->link))
$datarray['body'] .= "\n\n[bookmark=".$entry->link."]".$entry->name."[/bookmark]";
- elseif ($entry->name)
+ elseif (isset($entry->name))
$datarray['body'] .= "\n\n[b]" . $entry->name."[/b]";
- if($entry->caption) {
- if(!$entry->name and $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(!$entry->caption and !$entry->name) {
- if ($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($entry->description)
+ if(isset($entry->description))
$quote = $entry->description;
- if ($entry->properties)
+ if (isset($entry->properties))
foreach ($entry->properties as $property)
$quote .= "\n".$property->name.": [url=".$property->href."]".$property->text."[/url]";
@@ -1510,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($entry->picture && $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($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($entry->link)
+ if(isset($entry->link))
$datarray['body'] .= fb_get_photo($uid,$entry->link);
}
}
- if (($datarray['app'] == "Events") and $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]";
@@ -1542,10 +1825,10 @@ function fb_consume_stream($uid,$j,$wall = false) {
$datarray['body'] .= "\n";
- if ($entry->icon)
+ if (isset($entry->icon))
$datarray['body'] .= "[img]".$entry->icon."[/img] ";
- if ($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] ";
@@ -1555,28 +1838,29 @@ function fb_consume_stream($uid,$j,$wall = false) {
//if(($datarray['body'] != '') and ($uid == 1))
// $datarray['body'] .= "[noparse]".print_r($entry, true)."[/noparse]";
- if ($entry->place->name or $entry->place->location->street or
- $entry->place->location->city or $entry->place->location->Denmark) {
- $datarray['coord'] = '';
- if ($entry->place->name)
- $datarray['coord'] .= $entry->place->name;
- if ($entry->place->location->street)
- $datarray['coord'] .= $entry->place->location->street;
- if ($entry->place->location->city)
- $datarray['coord'] .= " ".$entry->place->location->city;
- if ($entry->place->location->country)
- $datarray['coord'] .= " ".$entry->place->location->country;
- } else if ($entry->place->location->latitude and $entry->place->location->longitude)
- $datarray['coord'] = substr($entry->place->location->latitude, 0, 8)
+ 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'] = '';
+ if ($entry->place->name)
+ $datarray['coord'] .= $entry->place->name;
+ if ($entry->place->location->street)
+ $datarray['coord'] .= $entry->place->location->street;
+ if ($entry->place->location->city)
+ $datarray['coord'] .= " ".$entry->place->location->city;
+ if ($entry->place->location->country)
+ $datarray['coord'] .= " ".$entry->place->location->country;
+ } else if ($entry->place->location->latitude and $entry->place->location->longitude)
+ $datarray['coord'] = substr($entry->place->location->latitude, 0, 8)
.' '.substr($entry->place->location->longitude, 0, 8);
-
+ }
$datarray['created'] = datetime_convert('UTC','UTC',$entry->created_time);
$datarray['edited'] = datetime_convert('UTC','UTC',$entry->updated_time);
// 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($entry->privacy && $entry->privacy->value !== 'EVERYONE') {
+ if(isset($entry->privacy) && $entry->privacy->value !== 'EVERYONE') {
$datarray['private'] = 1;
$datarray['allow_cid'] = '<' . $self[0]['id'] . '>';
}
@@ -1592,169 +1876,53 @@ function fb_consume_stream($uid,$j,$wall = false) {
}
}
+ /** @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;
+ $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'] = '';
-
- $item = 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);
}
}