lots of facebook fixes

6 files changed, 156 insertions, 23 deletions

diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php
index 6350e74bd..41a1381c1 100644
--- a/addon/facebook/facebook.php
+++ b/addon/facebook/facebook.php
@@ -128,8 +128,10 @@ function fb_get_friends($uid) {
 			if($s) {
 				$jp = json_decode($s);
 				logger('fb_get_friends: info: ' . print_r($jp,true));
-				if(! $jp->link)
-					$jp->link = 'http://facebook.com/profile.php?id=' . $person->id;
+
+				// always use numeric link for consistency
+
+				$jp->link = 'http://facebook.com/profile.php?id=' . $person->id;
 
 				// check if we already have a contact
 
@@ -267,6 +269,7 @@ function facebook_install() {
 	register_hook('post_local_end',  'addon/facebook/facebook.php', 'facebook_post_hook');
 	register_hook('jot_networks',    'addon/facebook/facebook.php', 'facebook_jot_nets');
 	register_hook('plugin_settings', 'addon/facebook/facebook.php', 'facebook_plugin_settings');
+	register_hook('cron',            'addon/facebook/facebook.php', 'facebook_cron');
 }
 
 
@@ -274,9 +277,42 @@ function facebook_uninstall() {
 	unregister_hook('post_local_end',  'addon/facebook/facebook.php', 'facebook_post_hook');
 	unregister_hook('jot_networks',    'addon/facebook/facebook.php', 'facebook_jot_nets');
 	unregister_hook('plugin_settings', 'addon/facebook/facebook.php', 'facebook_plugin_settings');
+	unregister_hook('cron',            'addon/facebook/facebook.php', 'facebook_cron');
+}
+
+
+function facebook_cron($a,$b) {
+
+	$last = get_config('facebook','last_poll');
+	
+	if($last) {
+		$next = $last + 3600;
+		if($next > time()) 
+			return;
+	}
+
+	logger('facebook_cron');
+
+	set_config('facebook','last_poll', time());
+
+	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'facebook' AND `k` = 'post' AND `v` = '1' ");
+	if(count($r)) {
+		foreach($r as $rr) {
+			// check for new friends once a day
+			$last_friend_check = get_pconfig($uid,'facebook','friend_check');
+			if($last_friend_check) 
+				$next_friend_check = $last_friend_check + 86400;
+			if($next_friend_check <= time()) {
+				fb_get_friends($uid);
+				set_pconfig($uid,'facebook','friend_check',time());
+			}
+			fb_consume_all($rr['uid']);
+		}
+	}	
 }
 
 
+
 function facebook_plugin_settings(&$a,&$b) {
 
 	$b .= '<div class="settings-block">';
@@ -306,9 +342,55 @@ function facebook_post_hook(&$a,&$b) {
 	 * Post to Facebook stream
 	 */
 
+	require_once('include/group.php');
+
 	logger('Facebook post');
 
-	if((local_user()) && (local_user() == $b['uid']) && (! $b['private']) && (! $b['parent'])) {
+	$reply = false;
+	$likes = false;
+
+	if((local_user()) && (local_user() == $b['uid'])) {
+
+		if($b['parent']) {
+			$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+				intval($b['parent']),
+				intval(local_user())
+			);
+			if(count($r) && substr($r[0]['uri'],0,4) === 'fb::')
+				$reply = substr($r[0]['uri'],4);
+			else
+				return;
+			logger('facebook reply id=' . $reply);
+		}
+
+		if($b['private'] && $reply == false) {
+			$allow_people = expand_acl($b['allow_cid']);
+			$allow_groups = expand_groups(expand_acl($b['allow_gid']));
+			$deny_people  = expand_acl($b['deny_cid']);
+			$deny_groups  = expand_groups(expand_acl($b['deny_gid']));
+
+			$recipients = array_unique(array_merge($allow_people,$allow_groups));
+			$deny = array_unique(array_merge($deny_people,$deny_groups));
+
+			$allow_str = dbesc(implode(', ',$recipients));
+			$r = q("SELECT `notify` FROM `contact` WHERE `id` IN ( $allow_str ) AND `network` = 'face'"); 
+			$allow_arr = array();
+			if(count($r)) 
+				foreach($r as $rr)
+					$allow_arr[] = $rr['notify'];
+
+			$deny_str = dbesc(implode(', ',$deny));
+			$r = q("SELECT `notify` FROM `contact` WHERE `id` IN ( $deny_str ) AND `network` = 'face'"); 
+			$deny_arr = array();
+			if(count($r)) 
+				foreach($r as $rr)
+					$deny_arr[] = $rr['notify'];
+			if((! count($allow_arr)) && (! count($deny_arr)))
+				return;
+		}
+
+		if($b['verb'] == ACTIVITY_LIKE)
+			$likes = true;				
 
 
 		$appid  = get_config('facebook', 'appid'  );
@@ -323,7 +405,7 @@ function facebook_post_hook(&$a,&$b) {
 			$fb_token  = get_pconfig(local_user(),'facebook','access_token');
 
 			logger('facebook: $fb_post: ' . $fb_post . ' $fb_enable: ' . $fb_enable . ' $fb_token: ' . $fb_token,LOGGER_DEBUG); 
-			if($fb_post && $fb_token && $fb_enable) {
+			if($fb_post && $fb_token && ($fb_enable || $b['private'])) {
 				logger('facebook: able to post');
 				require_once('library/facebook.php');
 				require_once('include/bbcode.php');	
@@ -366,11 +448,32 @@ function facebook_post_hook(&$a,&$b) {
 					'access_token' => $fb_token, 
 					'message' => $msg
 				);
- 
-				if($b['plink'])
-					$postvars['actions'] = '{"name": "' . t('View on Friendika') . '", "link": "' .  $b['plink'] . '"}';
 
-				$x = post_url('https://graph.facebook.com/me/feed', $postvars);
+				if(($b['private']) && (! $b['parent'])) {
+					$postvars['privacy'] = '{"value": "CUSTOM", "friends": "SOME_FRIENDS"';
+					if(count($allow_arr))
+						$postvars['privacy'] .= ',"allow": "' . implode(',',$allow_arr) . '"';
+					if(count($deny_arr))
+						$postvars['privacy'] .= ',"deny": "' . implode(',',$deny_arr) . '"';
+					$postvars['privacy'] .= '}';
+
+				}
+
+				if(! $reply) { 
+					if($b['plink'])
+						$postvars['actions'] = '{"name": "' . t('View on Friendika') . '", "link": "' .  $b['plink'] . '"}';
+				}
+
+				if($reply) {
+					$url = 'https://graph.facebook.com/' . $reply . '/' . (($likes) ? 'likes' : 'comments');
+				}
+				else { 
+					$url = 'https://graph.facebook.com/me/feed';
+				}
+				logger('facebook: post to ' . $url);
+				logger('facebook: postvars: ' . print_r($postvars,true));
+
+				$x = post_url($url, $postvars);
 				
 				logger('Facebook post returns: ' . $x, LOGGER_DEBUG);
 
@@ -390,14 +493,13 @@ function fb_consume_all($uid) {
 	$s = fetch_url('https://graph.facebook.com/me/feed?access_token=' . $access_token);
 	if($s) {
 		$j = json_decode($s);
-logger('fb_consume_stream: wall: ' . print_r($j,true));
+		logger('fb_consume_stream: wall: ' . print_r($j,true), LOGGER_DATA);
 		fb_consume_stream($uid,$j,true);
 	}
 	$s = fetch_url('https://graph.facebook.com/me/home?access_token=' . $access_token);
 	if($s) {
-logger('fb_consume_stream: raw feed: ' . $s);
 		$j = json_decode($s);
-logger('fb_consume_stream: feed: ' . print_r($j,true));
+		logger('fb_consume_stream: feed: ' . print_r($j,true), LOGGER_DATA);
 		fb_consume_stream($uid,$j,false);
 	}
 
@@ -410,14 +512,19 @@ function fb_consume_stream($uid,$j,$wall = false) {
 		intval($uid)
 	);
 
+	$user = q("SELECT `nickname` FROM `user` WHERE `uid` = %d LIMIT 1",
+		intval($uid)
+	);
+	if(count($user))
+		$my_local_url = $a->get_baseurl() . '/profile/' . $user[0]['nickname'];
+
 
 	$self_id = get_pconfig($uid,'facebook','self_id');
-logger('fb_consume'); 
 	if(! count($j->data) || (! strlen($self_id)))
 		return;
 
 	foreach($j->data as $entry) {
-logger('fb_consume: entry: ' . print_r($entry,true));
+		logger('fb_consume: entry: ' . print_r($entry,true), LOGGER_DATA);
 		$datarray = array();
 		$we_posted = false;
 		$app = $entry->application;
@@ -425,7 +532,7 @@ logger('fb_consume: entry: ' . print_r($entry,true));
 			$we_posted = true;
 
 		if($we_posted) {
-			$r = q("SELECT * FROM `item` WHERE `uid` = %d AND `created` > '%s' AND `created` < '%s' AND `deleted` = 0 LIMIT 1",
+			$r = q("SELECT * FROM `item` WHERE `wall` = 1 AND `uid` = %d AND `created` > '%s' AND `created` < '%s' AND `deleted` = 0 LIMIT 1",
 				intval($uid),
 				dbesc(datetime_convert('UTC','UTC',$entry->created_time . ' - 1 minute')),
 				dbesc(datetime_convert('UTC','UTC',$entry->created_time . ' + 1 minute'))
@@ -446,6 +553,7 @@ logger('fb_consume: entry: ' . print_r($entry,true));
 			$post_exists = false;
 			$orig_post = null;
 		}
+
 		if(! $orig_post) {
 			$datarray['gravity'] = 0;
 			$datarray['uid'] = $uid;
@@ -463,6 +571,11 @@ logger('fb_consume: entry: ' . print_r($entry,true));
 					$datarray['contact-id'] = $r[0]['id'];
 			}
 			$datarray['verb'] = ACTIVITY_POST;						
+			if($wall) {
+				$datarray['owner-name'] = $self[0]['name'];
+				$datarray['author-link'] = $self[0]['url'];
+				$datarray['author-avatar'] = $self[0]['thumb'];
+			}
 			$datarray['author-name'] = $from->name;
 			$datarray['author-link'] = 'http://facebook.com/profile.php?id=' . $from->id;
 			$datarray['author-avatar'] = 'https://graph.facebook.com/' . $from->id . '/picture';
@@ -479,9 +592,10 @@ logger('fb_consume: entry: ' . print_r($entry,true));
 				$datarray['body'] .= "\n" . $entry->description;
 			$datarray['created'] = datetime_convert('UTC','UTC',$entry->created_time);
 			$datarray['edited'] = datetime_convert('UTC','UTC',$entry->updated_time);
-
+			if($entry->privacy && $entry->privacy->value !== 'EVERYONE')
+				$datarray['private'] = 1;			
 			$top_item = item_store($datarray);
-			$r = q("SELECT * FROM `item` WHERE `uid` = %d AND `uid` = %d LIMIT 1",
+			$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 				intval($top_item),
 				intval($uid)
 			);			
@@ -554,8 +668,20 @@ logger('fb_consume: entry: ' . print_r($entry,true));
 				$cmntdata['wall'] = (($wall) ? 1 : 0);
 				$cmntdata['uri'] = 'fb::' . $cmnt->id;
 				$cmntdata['parent-uri'] = 'fb::' . $entry->id;
-				if($cmnt->from->id == $self_id)
+				if($cmnt->from->id == $self_id) {
 					$cmntdata['contact-id'] = $self[0]['id'];
+					// see if I already posted it here locally and we're now getting it back from FB
+					$r = q("SELECT * FROM `item` WHERE `uid` = %d AND `created` > '%s' AND `created` < '%s' 
+						AND `parent-uri` = '%s' AND `author-link` = '%s' LIMIT 1",
+						intval($uid),
+						dbesc(datetime_convert('UTC','UTC',$cmnt->created_time . ' - 1 minute')),
+						dbesc(datetime_convert('UTC','UTC',$cmnt->created_time . ' + 1 minute')),
+						dbesc('fb::' . $entry->id),
+						dbesc($my_local_url)
+					);
+					if(count($r))
+						continue;
+				}
 				elseif(is_array($orig_post) && (x($orig_post,'contact-id')))
 					$cmntdata['contact-id'] = $orig_post['contact-id'];
 				else {
diff --git a/boot.php b/boot.php
index 67f17299d..f2c2b39bc 100644
--- a/boot.php
+++ b/boot.php
@@ -1218,6 +1218,7 @@ function set_config($family,$key,$value) {
 	global $a;
 
 	if(get_config($family,$key,true) === false) {
+		$a->config[$family][$key] = $value;
 		$ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ",
 			dbesc($family),
 			dbesc($key),
@@ -1312,6 +1313,7 @@ function set_pconfig($uid,$family,$key,$value) {
 	global $a;
 
 	if(get_pconfig($uid,$family,$key,true) === false) {
+		$a->config[$uid][$family][$key] = $value;
 		$ret = q("INSERT INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ",
 			intval($uid),
 			dbesc($family),
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index d1303d933..f2763a569 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -48,7 +48,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 
 	$o = '';
 
-	// When used for private messages, we limit correspondence to mutual friends and the selector
+	// When used for private messages, we limit correspondence to mutual DFRN/Friendika friends and the selector
 	// to one recipient. By default our selector allows multiple selects amongst all contacts.
 
 	$sql_extra = '';
@@ -61,7 +61,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 		$sql_extra .= " AND `network` IN ( 'dfrn' ) ";
 	}
 	elseif($privatenet) {	
-		$sql_extra .= " AND `network` IN ( 'dfrn', 'mail' ) ";
+		$sql_extra .= " AND `network` IN ( 'dfrn', 'mail', 'face' ) ";
 	}
 
 	if($privmail)
@@ -83,8 +83,6 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 
 	call_hooks($a->module . '_pre_' . $selname, $arr);
 
-
-
 	if(count($r)) {
 		foreach($r as $rr) {
 			if((is_array($preselected)) && in_array($rr['id'], $preselected))
diff --git a/include/notifier.php b/include/notifier.php
index 4cc6d7a99..b009cc870 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -20,6 +20,8 @@ function notifier_run($argv, $argc){
 	require_once('include/items.php');
 	require_once('include/bbcode.php');
 
+	load_hooks();
+
 	if($argc < 3)
 		return;
 
diff --git a/include/poller.php b/include/poller.php
index b5639e034..dd2efcb76 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -26,6 +26,8 @@ function poller_run($argv, $argc){
 
 	$a->set_baseurl(get_config('system','url'));
 
+	load_hooks();
+
 	logger('poller: start');
 	
 	// run queue delivery process in the background
@@ -61,10 +63,12 @@ function poller_run($argv, $argc){
 
 	$sql_extra = (($manual_id) ? " AND `id` = $manual_id " : "");
 
+	reload_plugins();
+
 	$d = datetime_convert();
+
 	call_hooks('cron', $d);
 
-	reload_plugins();
 
 	$contacts = q("SELECT `id` FROM `contact` 
 		WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
diff --git a/mod/item.php b/mod/item.php
index e53cfb033..7b561fcca 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -538,7 +538,8 @@ function item_post(&$a) {
 
 	proc_run('php', "include/notifier.php", $notify_type, "$post_id");
 
-	$datarray['id'] = $post_id;
+	$datarray['id']    = $post_id;
+	$datarray['plink'] = $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id;
 
 	call_hooks('post_local_end', $datarray);