X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=fbsync%2Ffbsync.php;h=5a429ad81137c309be06d0c09789ddc5be0930a6;hb=8c203b00db776fcfe98c2ef4b8a8fbbd9f30a663;hp=e69cd2c0c9539348abbbbea3393e024b4d66da03;hpb=81e05e62745ce8d18cb9d6fd9d80a7d5978b178e;p=friendica-addons.git

diff --git a/fbsync/fbsync.php b/fbsync/fbsync.php
index e69cd2c0..5a429ad8 100644
--- a/fbsync/fbsync.php
+++ b/fbsync/fbsync.php
@@ -2,8 +2,9 @@
 /**
  * Name: Facebook Sync
  * Description: Synchronizes the Facebook Newsfeed
- * Version: 0.0.1 alpha
+ * Version: 1.0
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
+ * Status: Unsupported
  */
 
 /* To-Do
@@ -26,6 +27,7 @@ function fbsync_install() {
 	register_hook('connector_settings_post', 'addon/fbsync/fbsync.php', 'fbsync_settings_post');
 	register_hook('cron', 'addon/fbsync/fbsync.php', 'fbsync_cron');
 	register_hook('follow', 'addon/fbsync/fbsync.php', 'fbsync_follow');
+	register_hook('expire', 'addon/fbsync/fbsync.php', 'fbsync_expire');
 }
 
 function fbsync_uninstall() {
@@ -33,6 +35,7 @@ function fbsync_uninstall() {
 	unregister_hook('connector_settings_post', 'addon/fbsync/fbsync.php', 'fbsync_settings_post');
 	unregister_hook('cron', 'addon/fbsync/fbsync.php', 'fbsync_cron');
 	unregister_hook('follow', 'addon/fbsync/fbsync.php', 'fbsync_follow');
+	unregister_hook('expire', 'addon/fbsync/fbsync.php', 'fbsync_expire');
 }
 
 function fbsync_follow($a, &$contact) {
@@ -100,6 +103,9 @@ function fbsync_follow($a, &$contact) {
 
 function fbsync_settings(&$a,&$s) {
 
+	// Settings are done inside the fbpost addon
+	return;
+
 	if(! local_user())
 		return;
 
@@ -120,11 +126,11 @@ function fbsync_settings(&$a,&$s) {
 	/* Add some HTML to the existing form */
 
 	$s .= '<span id="settings_fbsync_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_fbsync_expanded\'); openClose(\'settings_fbsync_inflated\');">';
-	$s .= '<h3>' . t('Facebook Import') . '</h3>';
+	$s .= '<img class="connector" src="images/facebook.png" /><h3 class="connector">'. t('Facebook Import').'</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_fbsync_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_fbsync_expanded\'); openClose(\'settings_fbsync_inflated\');">';
-	$s .= '<h3>' . t('Facebook Import') . '</h3>';
+	$s .= '<img class="connector" src="images/facebook.png" /><h3 class="connector">'. t('Facebook Import').'</h3>';
 	$s .= '</span>';
 
 	$s .= '<div id="fbsync-enable-wrapper">';
@@ -167,9 +173,24 @@ function fbsync_cron($a,$b) {
 	}
 	logger('fbsync_cron: cron_start');
 
+	$abandon_days = intval(get_config('system','account_abandon_days'));
+	if ($abandon_days < 1)
+		$abandon_days = 0;
+
+	$abandon_limit = date("Y-m-d H:i:s", time() - $abandon_days * 86400);
+
 	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'fbsync' AND `k` = 'sync' AND `v` = '1' ORDER BY RAND()");
 	if(count($r)) {
 		foreach($r as $rr) {
+
+			if ($abandon_days != 0) {
+				$user = q("SELECT `login_date` FROM `user` WHERE uid=%d AND `login_date` >= '%s'", $rr['uid'], $abandon_limit);
+				if (!count($user)) {
+					logger('abandoned account: timeline from user '.$rr['uid'].' will not be imported');
+					continue;
+				}
+			}
+
 			fbsync_get_self($rr['uid']);
 
 			logger('fbsync_cron: importing timeline from user '.$rr['uid']);
@@ -177,14 +198,42 @@ function fbsync_cron($a,$b) {
 		}
 	}
 
-	logger('fbsync: cron_end');
+	logger('fbsync_cron: cron_end');
 
 	set_config('fbsync','last_poll', time());
 }
 
+function fbsync_expire($a,$b) {
+
+	$days = get_config('fbsync', 'expire');
+
+	if ($days == 0)
+		return;
+
+	$r = q("DELETE FROM `item` WHERE `deleted` AND `network` = '%s'", dbesc(NETWORK_FACEBOOK));
+
+	require_once("include/items.php");
+
+	logger('fbsync_expire: expire_start');
+
+	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'fbsync' AND `k` = 'sync' AND `v` = '1' ORDER BY RAND()");
+	if(count($r)) {
+		foreach($r as $rr) {
+			logger('fbsync_expire: user '.$rr['uid']);
+			item_expire($rr['uid'], $days, NETWORK_FACEBOOK, true);
+		}
+	}
+
+	logger('fbsync_expire: expire_end');
+}
+
 function fbsync_createpost($a, $uid, $self, $contacts, $applications, $post, $create_user) {
 
+	$access_token = get_pconfig($uid,'facebook','access_token');
+
 	require_once("include/oembed.php");
+	require_once("include/network.php");
+	require_once("include/items.php");
 
 	// check if it was already imported
 	$r = q("SELECT * FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
@@ -200,6 +249,7 @@ function fbsync_createpost($a, $uid, $self, $contacts, $applications, $post, $cr
 	$postarray['wall'] = 0;
 
 	$postarray['verb'] = ACTIVITY_POST;
+	$postarray['object-type'] = ACTIVITY_OBJ_NOTE; // default value - is maybe changed later when media is attached
 	$postarray['network'] =  dbesc(NETWORK_FACEBOOK);
 
 	$postarray['uri'] = "fb::".$post->post_id;
@@ -249,7 +299,19 @@ function fbsync_createpost($a, $uid, $self, $contacts, $applications, $post, $cr
 	}
 
 	if ($contact_id <= 0) {
-		$contact_id = fbsync_fetch_contact($uid, $contacts[$post->source_id], $create_user);
+		if ($post->actor_id != $post->source_id) {
+			// Testing if we know the source or the actor
+			$contact_id = fbsync_fetch_contact($uid, $contacts[$post->source_id], false);
+
+			if (($contact_id == 0) and array_key_exists($post->actor_id, $contacts))
+				$contact_id = fbsync_fetch_contact($uid, $contacts[$post->actor_id], false);
+
+			// If we don't know anyone, we guess we should know the source. Could be the wrong decision
+			if ($contact_id == 0)
+				$contact_id = fbsync_fetch_contact($uid, $contacts[$post->source_id], $create_user);
+		} else
+			$contact_id = fbsync_fetch_contact($uid, $contacts[$post->source_id], $create_user);
+
 
 		if ($contact_id == -1) {
 			logger('fbsync_createpost: Contact is blocked. Post not imported '.print_r($post, true), LOGGER_DEBUG);
@@ -273,70 +335,115 @@ function fbsync_createpost($a, $uid, $self, $contacts, $applications, $post, $cr
 	$postarray["body"] = $msgdata["body"];
 	$postarray["tag"] = $msgdata["tags"];
 
+	// Change the object type when an attachment is present
+	if (isset($post->attachment->fb_object_type))
+		logger('fb_object_type: '.$post->attachment->fb_object_type." ".print_r($post->attachment, true), LOGGER_DEBUG);
+		switch ($post->attachment->fb_object_type) {
+			case 'photo':
+				$postarray['object-type'] = ACTIVITY_OBJ_IMAGE; // photo is deprecated: http://activitystrea.ms/head/activity-schema.html#image
+				break;
+			case 'video':
+				$postarray['object-type'] = ACTIVITY_OBJ_VIDEO;
+				break;
+			case '':
+				//$postarray['object-type'] = ACTIVITY_OBJ_BOOKMARK;
+				break;
+			default:
+				logger('Unknown object type '.$post->attachment->fb_object_type, LOGGER_DEBUG);
+				break;
+		}
+
+	$pagedata = array();
 	$content = "";
-	$type = "";
+	$pagedata["type"] = "";
 
 	if (isset($post->attachment->name) and isset($post->attachment->href)) {
+		$post->attachment->href = original_url($post->attachment->href);
 		$oembed_data = oembed_fetch_url($post->attachment->href);
-		$type = $oembed_data->type;
+		$pagedata["type"] = $oembed_data->type;
+		if ($pagedata["type"] == "rich")
+			$pagedata["type"] = "link";
+
+		$pagedata["url"] = $post->attachment->href;
+		$pagedata["title"] = $post->attachment->name;
 		$content = "[bookmark=".$post->attachment->href."]".$post->attachment->name."[/bookmark]";
+
+		// If a link is not only attached but also added in the body, look if it can be removed in the body.
+		$removedlink = trim(str_replace($post->attachment->href, "", $postarray["body"]));
+
+		if (($removedlink == "") OR strstr($postarray["body"], $removedlink))
+			$postarray["body"] = $removedlink;
+
 	} elseif (isset($post->attachment->name) AND ($post->attachment->name != ""))
 		$content = "[b]" . $post->attachment->name."[/b]";
 
-	$quote = "";
-	if(isset($post->attachment->description) and ($post->attachment->fb_object_type != "photo"))
-		$quote = $post->attachment->description;
+	$pagedata["text"] = "";
+	if (isset($post->attachment->description) and ($post->attachment->fb_object_type != "photo"))
+		$pagedata["text"] = $post->attachment->description;
 
-	if(isset($post->attachment->caption) and ($post->attachment->fb_object_type == "photo"))
-		$quote = $post->attachment->caption;
+	if (isset($post->attachment->caption) and ($post->attachment->fb_object_type == "photo"))
+		$pagedata["text"] = $post->attachment->caption;
 
-	if ($quote.$post->attachment->href.$content.$postarray["body"] == "")
+	if ($pagedata["text"].$post->attachment->href.$content.$postarray["body"] == "")
 		return;
 
-	if (isset($post->attachment->media) // AND !strstr($post->attachment->href, "://www.youtube.com/")
-		//AND !strstr($post->attachment->href, "://youtu.be/")
-		//AND !strstr($post->attachment->href, ".vimeo.com/"))
-		AND (($type == "") OR ($type == "link"))) {
+	if (isset($post->attachment->media) AND (($pagedata["type"] == "") OR ($pagedata["type"] == "link"))) {
 		foreach ($post->attachment->media AS $media) {
-			//$media->photo->owner = number_format($media->photo->owner, 0, '', '');
-			//if ($media->photo->owner != '') {
-			//	$postarray['author-name'] = $contacts[$media->photo->owner]->name;
-			//	$postarray['author-link'] = $contacts[$media->photo->owner]->url;
-			//	$postarray['author-avatar'] = $contacts[$media->photo->owner]->pic_square;
-			//}
 
 			if (isset($media->type))
-				$type = $media->type;
+				$pagedata["type"] = $media->type;
+
+			if (isset($media->src))
+				$pagedata["images"][0]["src"] = $media->src;
+
+			if (isset($media->photo)) {
+				if (isset($media->photo->images) AND (count($media->photo->images) > 1))
+					$pagedata["images"][0]["src"] = $media->photo->images[1]->src;
+
+				if (isset($media->photo->fbid)) {
+					logger('fbsync_createpost: fetching fbid '.$media->photo->fbid, LOGGER_DEBUG);
+					$url = "https://graph.facebook.com/".$media->photo->fbid."?access_token=".$access_token;
+					$feed = fetch_url($url);
+					$data = json_decode($feed);
+					if (isset($data->images)) {
+						$pagedata["images"][0]["src"] = $data->images[0]->source;
+						logger('fbsync_createpost: got fbid '.$media->photo->fbid.' image '.$pagedata["images"][0]["src"], LOGGER_DEBUG);
+					} else
+						logger('fbsync_createpost: error fetching fbid '.$media->photo->fbid.' '.print_r($data, true), LOGGER_DEBUG);
+				}
+			}
+
+			$pagedata["images"][0]["src"] = fbpost_cleanpicture($pagedata["images"][0]["src"]);
 
-			if(isset($media->src) && isset($media->href) AND ($media->src != "") AND ($media->href != ""))
-				$content .= "\n".'[url='.$media->href.'][img]'.fpost_cleanpicture($media->src).'[/img][/url]';
-			else {
-				if (isset($media->src) AND ($media->src != ""))
-					$content .= "\n".'[img]'.fpost_cleanpicture($media->src).'[/img]';
+			if (isset($media->href) AND ($pagedata["images"][0]["src"] != "") AND ($media->href != "")) {
+				$media->href = original_url($media->href);
+				$pagedata["url"] = $media->href;
+				$content .= "\n".'[url='.$media->href.'][img]'.$pagedata["images"][0]["src"].'[/img][/url]';
+			} else {
+				if ($pagedata["images"][0]["src"] != "")
+					$content .= "\n".'[img]'.$pagedata["images"][0]["src"].'[/img]';
 
 				// if just a link, it may be a wall photo - check
-				if(isset($post->link))
+				if (isset($post->link))
 					$content .= fbpost_get_photo($media->href);
 			}
 		}
 	}
 
-	if ($content)
-		$postarray["body"] .= "\n\n";
+	if ($pagedata["type"] != "") {
+		if ($pagedata["type"] == "link")
+			$postarray["object-type"] = ACTIVITY_OBJ_BOOKMARK;
 
-	if ($type)
-		$postarray["body"] .= "[class=type-".$type."]";
-
-	if ($content)
-		$postarray["body"] .= trim($content);
-
-	if ($quote)
-		$postarray["body"] .= "\n[quote]".trim($quote)."[/quote]";
+		$postarray["body"] .= add_page_info_data($pagedata);
+	} else {
+		if ($content)
+			$postarray["body"] .= "\n".trim($content);
 
-	if ($type)
-		$postarray["body"] .= "[/class]";
+		if ($pagedata["text"])
+			$postarray["body"] .= "\n[quote]".trim($pagedata["text"])."[/quote]";
 
-	$postarray["body"] = trim($postarray["body"]);
+		$postarray["body"] = trim($postarray["body"]);
+	}
 
 	if (trim($postarray["body"]) == "")
 		return;
@@ -367,7 +474,6 @@ function fbsync_createpost($a, $uid, $self, $contacts, $applications, $post, $cr
 	//	$postarray["body"] = "Type: ".$post->type."\n".$postarray["body"];
 	//print_r($post);
 	//print_r($postarray);
-
 	$item = item_store($postarray);
 	logger('fbsync_createpost: User '.$self[0]["nick"].' posted feed item '.$item, LOGGER_DEBUG);
 }
@@ -423,18 +529,18 @@ function fbsync_createcomment($a, $uid, $self_id, $self, $user, $contacts, $appl
 	// Check if the contact id was blocked
 	if ($parent_contact > 0) {
 		$r = q("SELECT `blocked`, `readonly`, `nick` FROM `contact` WHERE `uid` = %d AND `id` = %d LIMIT 1",
-        	        intval($uid), intval($parent_contact));
+			intval($uid), intval($parent_contact));
 
 		// Should only happen if someone deleted the contact manually
-	        if(!count($r)) {
-                	logger("fbsync_createcomment: UID ".$uid." - Contact ".$parent_contact." doesn't seem to exist.", LOGGER_DEBUG);
-	                return;
+		if(!count($r)) {
+			logger("fbsync_createcomment: UID ".$uid." - Contact ".$parent_contact." doesn't seem to exist.", LOGGER_DEBUG);
+			return;
 		}
 
 		// Is blocked? Then return
-        	if ($r[0]["readonly"] OR $r[0]["blocked"]) {
-                	logger("fbsync_createcomment: UID ".$uid." - Contact '".$r[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG);
-	                return;
+		if ($r[0]["readonly"] OR $r[0]["blocked"]) {
+			logger("fbsync_createcomment: UID ".$uid." - Contact '".$r[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG);
+			return;
 		}
 
 		$parent_nick = $r[0]["nick"];
@@ -447,6 +553,7 @@ function fbsync_createcomment($a, $uid, $self_id, $self, $user, $contacts, $appl
 	$postarray['wall'] = 0;
 
 	$postarray['verb'] = ACTIVITY_POST;
+	$postarray['object-type'] = ACTIVITY_OBJ_COMMENT;
 	$postarray['network'] =  dbesc(NETWORK_FACEBOOK);
 
 	$postarray['uri'] = "fb::".$comment->id;
@@ -509,6 +616,8 @@ function fbsync_createcomment($a, $uid, $self_id, $self, $user, $contacts, $appl
 		return;
 
 	$item = item_store($postarray);
+	$postarray["id"] = $item;
+
 	logger('fbsync_createcomment: UID '.$uid.' - CID '.$postarray['contact-id'].' - Nick '.$contact_nick.' posted comment '.$item, LOGGER_DEBUG);
 
 	if ($item == 0)
@@ -522,8 +631,8 @@ function fbsync_createcomment($a, $uid, $self_id, $self, $user, $contacts, $appl
 	if(count($myconv)) {
 		$importer_url = $a->get_baseurl() . '/profile/' . $user[0]['nickname'];
 
-	        $own_contact = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
-        	        intval($uid), dbesc("facebook::".$self_id));
+		$own_contact = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
+			intval($uid), dbesc("facebook::".$self_id));
 
 		if (!count($own_contact))
 			return;
@@ -546,7 +655,7 @@ function fbsync_createcomment($a, $uid, $self_id, $self, $user, $contacts, $appl
 					'to_email'     => $user[0]['email'],
 					'uid'          => $user[0]['uid'],
 					'item'         => $postarray,
-					'link'             => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $item,
+					'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)),
 					'source_name'  => $postarray['author-name'],
 					'source_link'  => $postarray['author-link'],
 					'source_photo' => $postarray['author-avatar'],
@@ -570,8 +679,8 @@ function fbsync_createlike($a, $uid, $self_id, $self, $contacts, $like) {
 				intval($uid)
 		);
 
-        if (count($r))
-                $orig_post = $r[0];
+	if (count($r))
+		$orig_post = $r[0];
 	else
 		return;
 
@@ -597,15 +706,18 @@ function fbsync_createlike($a, $uid, $self_id, $self, $contacts, $like) {
 		$contact_id = $self[0]["id"];
 
 	$likedata = array();
-        $likedata['parent'] = $orig_post['id'];
-        $likedata['verb'] = ACTIVITY_LIKE;
+	$likedata['parent'] = $orig_post['id'];
+
+	$likedata['verb'] = ACTIVITY_LIKE;
+	$likedata['object-type'] = ACTIVITY_OBJ_NOTE;
 	$likedate['network'] =  dbesc(NETWORK_FACEBOOK);
-        $likedata['gravity'] = 3;
-        $likedata['uid'] = $uid;
-        $likedata['wall'] = 0;
-        $likedata['uri'] = item_new_uri($a->get_baseurl(), $uid);
-        $likedata['parent-uri'] = $orig_post["uri"];
-        $likedata['app'] = "Facebook";
+
+	$likedata['gravity'] = 3;
+	$likedata['uid'] = $uid;
+	$likedata['wall'] = 0;
+	$likedata['uri'] = item_new_uri($a->get_baseurl(), $uid);
+	$likedata['parent-uri'] = $orig_post["uri"];
+	$likedata['app'] = "Facebook";
 
 	if ($like->user_id != $self_id) {
 		$likedata['contact-id'] = $contact_id;
@@ -625,12 +737,12 @@ function fbsync_createlike($a, $uid, $self_id, $self, $contacts, $like) {
 	$post_type = t('status');
 
 	$plink = '[url=' . $orig_post['plink'] . ']' . $post_type . '[/url]';
-        $likedata['object-type'] = ACTIVITY_OBJ_NOTE;
+	$likedata['object-type'] = ACTIVITY_OBJ_NOTE;
 
-        $likedata['body'] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
+	$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>';
+	$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>';
 
 
 	$r = q("SELECT * FROM `item` WHERE `parent-uri` = '%s' AND `author-link` = '%s' AND `verb` = '%s' AND `uid` = %d LIMIT 1",
@@ -640,7 +752,7 @@ function fbsync_createlike($a, $uid, $self_id, $self, $contacts, $like) {
 				intval($uid)
 		);
 
-        if (count($r))
+	if (count($r))
 		return;
 
 	$item = item_store($likedata);
@@ -649,6 +761,9 @@ function fbsync_createlike($a, $uid, $self_id, $self, $contacts, $like) {
 
 function fbsync_fetch_contact($uid, $contact, $create_user) {
 
+	if($contact->url == "")
+		return(0);
+
 	// Check if the unique contact is existing
 	// To-Do: only update once a while
 	$r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
@@ -657,131 +772,133 @@ function fbsync_fetch_contact($uid, $contact, $create_user) {
 	if (count($r) == 0)
 		q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')",
 			dbesc(normalise_link($contact->url)),
-                        dbesc($contact->name),
-                        dbesc($contact->username),
+			dbesc($contact->name),
+			dbesc($contact->username),
 			dbesc($contact->pic_square));
 	else
 		q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'",
-                        dbesc($contact->name),
-                        dbesc($contact->username),
+			dbesc($contact->name),
+			dbesc($contact->username),
 			dbesc($contact->pic_square),
 			dbesc(normalise_link($contact->url)));
 
-        $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
-                intval($uid), dbesc("facebook::".$contact->id));
+	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
+		intval($uid), dbesc("facebook::".$contact->id));
 
-        if(!count($r) AND !$create_user)
-                return(0);
+	if(!count($r) AND !$create_user)
+		return(0);
 
-        if (count($r) AND ($r[0]["readonly"] OR $r[0]["blocked"])) {
-                logger("fbsync_fetch_contact: Contact '".$r[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG);
-                return(-1);
-        }
+	if (count($r) AND ($r[0]["readonly"] OR $r[0]["blocked"])) {
+		logger("fbsync_fetch_contact: Contact '".$r[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG);
+		return(-1);
+	}
 
 	$avatarpicture = $contact->pic_square;
 
-        if(!count($r)) {
-                // create contact record
-                q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
-                                        `name`, `nick`, `photo`, `network`, `rel`, `priority`,
-                                        `writable`, `blocked`, `readonly`, `pending`)
-                                        VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0)",
-                        intval($uid),
-                        dbesc(datetime_convert()),
-                        dbesc($contact->url),
-                        dbesc(normalise_link($contact->url)),
-                        dbesc($contact->username."@facebook.com"),
-                        dbesc("facebook::".$contact->id),
-                        dbesc(''),
-                        dbesc("facebook::".$contact->id),
-                        dbesc($contact->name),
-                        dbesc($contact->username),
-                        dbesc($avatarpicture),
-                        dbesc(NETWORK_FACEBOOK),
-                        intval(CONTACT_IS_FRIEND),
-                        intval(1),
-                        intval(1)
-                );
-
-                $r = q("SELECT * FROM `contact` WHERE `alias` = '%s' AND `uid` = %d LIMIT 1",
-                        dbesc("facebook::".$contact->id),
-                        intval($uid)
-                        );
-
-                if(! count($r))
-                        return(false);
-
-                $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($avatarpicture,$uid,$contact_id);
-
-                q("UPDATE `contact` SET `photo` = '%s',
-                                        `thumb` = '%s',
-                                        `micro` = '%s',
-                                        `name-date` = '%s',
-                                        `uri-date` = '%s',
-                                        `avatar-date` = '%s'
-                                WHERE `id` = %d",
-                        dbesc($photos[0]),
-                        dbesc($photos[1]),
-                        dbesc($photos[2]),
-                        dbesc(datetime_convert()),
-                        dbesc(datetime_convert()),
-                        dbesc(datetime_convert()),
-                        intval($contact_id)
-                );
-        } else {
-                // update profile photos once every 12 hours as we have no notification of when they change.
-                $update_photo = ($r[0]['avatar-date'] < datetime_convert('','','now -12 hours'));
-
-                // 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']) || ($update_photo)) {
-
-                        logger("fbsync_fetch_contact: Updating contact ".$contact->username, LOGGER_DEBUG);
-
-                        require_once("Photo.php");
-
-                        $photos = import_profile_photo($avatarpicture, $uid, $r[0]['id']);
-
-                        q("UPDATE `contact` SET `photo` = '%s',
-                                                `thumb` = '%s',
-                                                `micro` = '%s',
-                                                `name-date` = '%s',
-                                                `uri-date` = '%s',
-                                                `avatar-date` = '%s',
-                                                `url` = '%s',
-                                                `nurl` = '%s',
-                                                `addr` = '%s',
-                                                `name` = '%s',
-                                                `nick` = '%s'
-                                        WHERE `id` = %d",
-                                dbesc($photos[0]),
-                                dbesc($photos[1]),
-                                dbesc($photos[2]),
-                                dbesc(datetime_convert()),
-                                dbesc(datetime_convert()),
-                                dbesc(datetime_convert()),
-                                dbesc($contact->url),
-                                dbesc(normalise_link($contact->url)),
-                                dbesc($contact->username."@facebook.com"),
-                                dbesc($contact->name),
-                                dbesc($contact->username),
-                                intval($r[0]['id'])
-                        );
-                }
-        }
-        return($r[0]["id"]);
+	if(!count($r)) {
+		// create contact record
+		q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
+					`name`, `nick`, `photo`, `network`, `rel`, `priority`,
+					`writable`, `blocked`, `readonly`, `pending`)
+					VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0)",
+			intval($uid),
+			dbesc(datetime_convert()),
+			dbesc($contact->url),
+			dbesc(normalise_link($contact->url)),
+			dbesc($contact->username."@facebook.com"),
+			dbesc("facebook::".$contact->id),
+			dbesc($contact->id),
+			dbesc("facebook::".$contact->id),
+			dbesc($contact->name),
+			dbesc($contact->username),
+			dbesc($avatarpicture),
+			dbesc(NETWORK_FACEBOOK),
+			intval(CONTACT_IS_FRIEND),
+			intval(1),
+			intval(1)
+		);
+
+		$r = q("SELECT * FROM `contact` WHERE `alias` = '%s' AND `uid` = %d LIMIT 1",
+			dbesc("facebook::".$contact->id),
+			intval($uid)
+			);
+
+		if(! count($r))
+			return(false);
+
+		$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($avatarpicture,$uid,$contact_id);
+
+		q("UPDATE `contact` SET `photo` = '%s',
+					`thumb` = '%s',
+					`micro` = '%s',
+					`name-date` = '%s',
+					`uri-date` = '%s',
+					`avatar-date` = '%s'
+				WHERE `id` = %d",
+			dbesc($photos[0]),
+			dbesc($photos[1]),
+			dbesc($photos[2]),
+			dbesc(datetime_convert()),
+			dbesc(datetime_convert()),
+			dbesc(datetime_convert()),
+			intval($contact_id)
+		);
+	} else {
+		// update profile photos once every 12 hours as we have no notification of when they change.
+		$update_photo = ($r[0]['avatar-date'] < datetime_convert('','','now -12 hours'));
+
+		// 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']) || ($update_photo)) {
+
+			logger("fbsync_fetch_contact: Updating contact ".$contact->username, LOGGER_DEBUG);
+
+			require_once("Photo.php");
+
+			$photos = import_profile_photo($avatarpicture, $uid, $r[0]['id']);
+
+			q("UPDATE `contact` SET `photo` = '%s',
+						`thumb` = '%s',
+						`micro` = '%s',
+						`name-date` = '%s',
+						`uri-date` = '%s',
+						`avatar-date` = '%s',
+						`url` = '%s',
+						`nurl` = '%s',
+						`addr` = '%s',
+						`name` = '%s',
+						`nick` = '%s',
+						`notify` = '%s'
+					WHERE `id` = %d",
+				dbesc($photos[0]),
+				dbesc($photos[1]),
+				dbesc($photos[2]),
+				dbesc(datetime_convert()),
+				dbesc(datetime_convert()),
+				dbesc(datetime_convert()),
+				dbesc($contact->url),
+				dbesc(normalise_link($contact->url)),
+				dbesc($contact->username."@facebook.com"),
+				dbesc($contact->name),
+				dbesc($contact->username),
+				dbesc($contact->id),
+				intval($r[0]['id'])
+			);
+		}
+	}
+	return($r[0]["id"]);
 }
 
 function fbsync_get_self($uid) {
@@ -854,9 +971,9 @@ function fbsync_fetchuser($a, $uid, $id) {
 
 	if (count($contact)) {
 		if (($contact[0]["readonly"] OR $contact[0]["blocked"])) {
-        	        logger("fbsync_fetchuser: Contact '".$contact[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG);
+			logger("fbsync_fetchuser: Contact '".$contact[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG);
 			$user["contact-id"] = -1;
-        	} else
+		} else
 			$user["contact-id"] = $contact[0]["id"];
 
 		$user["name"] = $contact[0]["name"];
@@ -908,7 +1025,7 @@ function fbsync_fetchfeed($a, $uid) {
 
 	require_once('include/items.php');
 
-	//if ($last_updated == "")
+	if ($last_updated == "")
 		$last_updated = 0;
 
 	logger("fbsync_fetchfeed: fetching content for user ".$self_id);
@@ -928,7 +1045,6 @@ function fbsync_fetchfeed($a, $uid) {
 	$url = "https://graph.facebook.com/fql?q=".urlencode(json_encode($fql))."&access_token=".$access_token;
 
 	$feed = fetch_url($url);
-//file_put_contents("/home/ike/pirati.ca/htdocs/fb.".$uid, $feed);
 	$data = json_decode($feed);
 
 	if (!is_array($data->data)) {
@@ -1012,7 +1128,6 @@ function fbsync_fetchfeed($a, $uid) {
 	foreach ($post_data AS $post) {
 		if ($post->updated_time > $last_updated)
 			$last_updated = $post->updated_time;
-
 		fbsync_createpost($a, $uid, $self, $contacts, $application_data, $post, $create_user);
 	}