X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=addon%2Ffacebook%2Ffacebook.php;h=5d86c66c2ce96435167e54bd304026030f826674;hb=55112cfdd0dc63c8ad7f719aea5b46db37fcf081;hp=b1ba6342ad4f5c1bf7814c8d9b97d3cee5d4b8e4;hpb=c3478a1485334e9a399fe0786af54d63bb666a60;p=friendica.git
diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php
index b1ba6342ad..5d86c66c2c 100644
--- a/addon/facebook/facebook.php
+++ b/addon/facebook/facebook.php
@@ -1,4 +1,9 @@
+ */
/**
* Installing the Friendika/Facebook connector
@@ -335,18 +340,20 @@ function facebook_content(&$a) {
}
function facebook_install() {
- register_hook('post_local_end', 'addon/facebook/facebook.php', 'facebook_post_hook');
- register_hook('jot_networks', 'addon/facebook/facebook.php', 'facebook_jot_nets');
- register_hook('plugin_settings', 'addon/facebook/facebook.php', 'facebook_plugin_settings');
- register_hook('cron', 'addon/facebook/facebook.php', 'facebook_cron');
+ register_hook('post_local_end', 'addon/facebook/facebook.php', 'facebook_post_hook');
+ register_hook('jot_networks', 'addon/facebook/facebook.php', 'facebook_jot_nets');
+ register_hook('plugin_settings', 'addon/facebook/facebook.php', 'facebook_plugin_settings');
+ register_hook('cron', 'addon/facebook/facebook.php', 'facebook_cron');
+ register_hook('queue_predeliver', 'addon/facebook/facebook.php', 'fb_queue_hook');
}
function facebook_uninstall() {
- unregister_hook('post_local_end', 'addon/facebook/facebook.php', 'facebook_post_hook');
- unregister_hook('jot_networks', 'addon/facebook/facebook.php', 'facebook_jot_nets');
- unregister_hook('plugin_settings', 'addon/facebook/facebook.php', 'facebook_plugin_settings');
- unregister_hook('cron', 'addon/facebook/facebook.php', 'facebook_cron');
+ unregister_hook('post_local_end', 'addon/facebook/facebook.php', 'facebook_post_hook');
+ unregister_hook('jot_networks', 'addon/facebook/facebook.php', 'facebook_jot_nets');
+ unregister_hook('plugin_settings', 'addon/facebook/facebook.php', 'facebook_plugin_settings');
+ unregister_hook('cron', 'addon/facebook/facebook.php', 'facebook_cron');
+ unregister_hook('queue_predeliver', 'addon/facebook/facebook.php', 'fb_queue_hook');
}
@@ -438,7 +445,7 @@ function facebook_post_hook(&$a,&$b) {
logger('facebook reply id=' . $reply);
}
- if($b['private'] && $reply == false) {
+ if($b['private'] && $reply === false) {
$allow_people = expand_acl($b['allow_cid']);
$allow_groups = expand_groups(expand_acl($b['allow_gid']));
$deny_people = expand_acl($b['deny_cid']);
@@ -523,7 +530,7 @@ function facebook_post_hook(&$a,&$b) {
$search_str = $a->get_baseurl() . '/search';
- if(preg_match("/\[url=(.+?)\](.+?)\[\/url\]/is",$msg,$matches)) {
+ if(preg_match("/\[url=(.*?)\](.*?)\[\/url\]/is",$msg,$matches)) {
// don't use hashtags for message link
@@ -534,12 +541,12 @@ function facebook_post_hook(&$a,&$b) {
}
}
- $msg = preg_replace("/\[url=(.+?)\](.+?)\[\/url\]/is",'$2 $1',$msg);
+ $msg = preg_replace("/\[url=(.*?)\](.*?)\[\/url\]/is",'$2 $1',$msg);
- if(preg_match("/\[img\](.+?)\[\/img\]/is",$msg,$matches))
+ if(preg_match("/\[img\](.*?)\[\/img\]/is",$msg,$matches))
$image = $matches[1];
- $msg = preg_replace("/\[img\](.+?)\[\/img\]/is", t('Image: ') . '$1', $msg);
+ $msg = preg_replace("/\[img\](.*?)\[\/img\]/is", t('Image: ') . '$1', $msg);
if((strpos($link,$a->get_baseurl()) !== false) && (! $image))
$image = $a->get_baseurl() . '/images/friendika-64.jpg';
@@ -555,7 +562,7 @@ function facebook_post_hook(&$a,&$b) {
$msg .= "\n";
foreach($arr as $r) {
$matches = false;
- $cnt = preg_match('|\[attach\]href=\"(.+?)\" size=\"(.+?)\" type=\"(.+?)\" title=\"(.+?)\"\[\/attach\]|',$r,$matches);
+ $cnt = preg_match('|\[attach\]href=\"(.*?)\" size=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches);
if($cnt) {
$msg .= $matches[1];
}
@@ -624,25 +631,98 @@ function facebook_post_hook(&$a,&$b) {
// "test_mode" prevents anything from actually being posted.
// Otherwise, let's do it.
- if(! get_config('facebook','test_mode'))
+ if(! get_config('facebook','test_mode')) {
$x = post_url($url, $postvars);
- $retj = json_decode($x);
+ $retj = json_decode($x);
+ if($retj->id) {
+ q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d LIMIT 1",
+ dbesc('fb::' . $retj->id),
+ intval($b['id'])
+ );
+ }
+ else {
+ if(! $likes) {
+ $s = serialize(array('url' => $url, 'item' => $b['id'], 'post' => $postvars));
+ q("INSERT INTO `queue` ( `network`, `cid`, `created`, `last`, `content`)
+ VALUES ( '%s', %d, '%s', '%s', '%s') ",
+ dbesc(NETWORK_FACEBOOK),
+ intval($a->contact),
+ dbesc(datetime_convert()),
+ dbesc(datetime_convert()),
+ dbesc($s)
+ );
+
+ notice( t('Facebook post failed. Queued for retry.') . EOL);
+ }
+ }
+
+ logger('Facebook post returns: ' . $x, LOGGER_DEBUG);
+ }
+ }
+ }
+ }
+}
+
+
+function fb_queue_hook(&$a,&$b) {
+
+ $qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
+ dbesc(NETWORK_FACEBOOK)
+ );
+ if(! count($qi))
+ return;
+
+ require_once('include/queue_fn.php');
+
+ foreach($qi as $x) {
+ if($x['network'] !== NETWORK_FACEBOOK)
+ continue;
+
+ logger('facebook_queue: run');
+
+ $r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid`
+ WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1",
+ intval($x['cid'])
+ );
+ if(! count($r))
+ continue;
+
+ $user = $r[0];
+
+ $appid = get_config('facebook', 'appid' );
+ $secret = get_config('facebook', 'appsecret' );
+
+ if($appid && $secret) {
+ $fb_post = intval(get_pconfig($user['uid'],'facebook','post'));
+ $fb_token = get_pconfig($user['uid'],'facebook','access_token');
+
+ if($fb_post && $fb_token) {
+ logger('facebook_queue: able to post');
+ require_once('library/facebook.php');
+
+ $z = unserialize($x['content']);
+ $item = $z['item'];
+ $j = post_url($z['url'],$z['post']);
+
+ $retj = json_decode($j);
if($retj->id) {
q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d LIMIT 1",
dbesc('fb::' . $retj->id),
- intval($b['id'])
+ intval($item)
);
+ logger('facebook_queue: success: ' . $j);
+ remove_queue_item($x['id']);
+ }
+ else {
+ logger('facebook_queue: failed: ' . $j);
+ update_queue_time($x['id']);
}
-
- logger('Facebook post returns: ' . $x, LOGGER_DEBUG);
-
}
}
}
}
-
function fb_consume_all($uid) {
require_once('include/items.php');
@@ -725,8 +805,10 @@ function fb_consume_stream($uid,$j,$wall = false) {
// don't store post if we don't have a contact
- if(! x($datarray,'contact-id'))
+ if(! x($datarray,'contact-id')) {
+ logger('no contact: post ignored');
continue;
+ }
$datarray['verb'] = ACTIVITY_POST;
if($wall) {
@@ -759,8 +841,10 @@ function fb_consume_stream($uid,$j,$wall = false) {
intval($top_item),
intval($uid)
);
- if(count($r))
+ if(count($r)) {
$orig_post = $r[0];
+ logger('fb: new top level item posted');
+ }
}
if(isset($entry->likes) && isset($entry->likes->data))
@@ -829,7 +913,7 @@ function fb_consume_stream($uid,$j,$wall = false) {
$likedata['body'] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
$likedata['object'] = '';
+ '' . $orig_post['uri'] . '' . xmlify('') . '' . $orig_post['title'] . '' . $orig_post['body'] . '';
$item = item_store($likedata);
}