diff --git a/fbpost/fbpost.php b/fbpost/fbpost.php index 1116971d1..013113205 100644 --- a/fbpost/fbpost.php +++ b/fbpost/fbpost.php @@ -140,11 +140,18 @@ function fbpost_post(&$a) { $value = ((x($_POST,'post_by_default')) ? intval($_POST['post_by_default']) : 0); set_pconfig($uid,'facebook','post_by_default', $value); + $value = ((x($_POST,'suppress_view_on_friendica')) ? intval($_POST['suppress_view_on_friendica']) : 0); + set_pconfig($uid,'facebook','suppress_view_on_friendica', $value); + + $value = ((x($_POST,'post_to_page')) ? $_POST['post_to_page'] : "0-0"); + $values = explode("-", $value); + set_pconfig($uid,'facebook','post_to_page', $values[0]); + set_pconfig($uid,'facebook','page_access_token', $values[1]); info( t('Settings updated.') . EOL); - } + } - return; + return; } // Facebook settings form @@ -202,7 +209,7 @@ function fbpost_content(&$a) { $o .= '
'; + } return $o; @@ -353,10 +388,10 @@ function fbpost_post_hook(&$a,&$b) { return; // only accept comments from the item owner. Other contacts are unknown to FB. - + if(! link_compare($b['author-link'], $a->get_baseurl() . '/profile/' . $u[0]['nickname'])) return; - + logger('facebook reply id=' . $reply); } @@ -408,7 +443,7 @@ function fbpost_post_hook(&$a,&$b) { } if($b['verb'] == ACTIVITY_LIKE) - $likes = true; + $likes = true; $appid = get_config('facebook', 'appid' ); @@ -421,9 +456,9 @@ function fbpost_post_hook(&$a,&$b) { $fb_token = get_pconfig($b['uid'],'facebook','access_token'); - // post to facebook if it's a public post and we've ticked the 'post to Facebook' box, + // post to facebook if it's a public post and we've ticked the 'post to Facebook' box, // or it's a private message with facebook participants - // or it's a reply or likes action to an existing facebook post + // or it's a reply or likes action to an existing facebook post if($fb_token && ($toplevel || $b['private'] || $reply)) { logger('facebook: able to post'); @@ -602,11 +637,18 @@ function fbpost_post_hook(&$a,&$b) { } + $post_to_page = get_pconfig($b['uid'],'facebook','post_to_page'); + $page_access_token = get_pconfig($b['uid'],'facebook','page_access_token'); + if ((intval($post_to_page) != 0) and ($page_access_token != "")) + $target = $post_to_page; + else + $target = "me"; + if($reply) { $url = 'https://graph.facebook.com/' . $reply . '/' . (($likes) ? 'likes' : 'comments'); - } else if (($link != "") or ($image != "") or ($b['title'] == '') or (strlen($msg) < 500)) { - $url = 'https://graph.facebook.com/me/feed'; - if($b['plink']) + } else if (($link != "") or ($image != "") or ($b['title'] == '') or (strlen($msg) < 500) or ($target != "me")) { + $url = 'https://graph.facebook.com/'.$target.'/feed'; + if (!get_pconfig($b['uid'],'facebook','suppress_view_on_friendica') and $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 @@ -618,6 +660,10 @@ function fbpost_post_hook(&$a,&$b) { $url = 'https://graph.facebook.com/me/notes'; } + // Post to page? + if (!$reply and $target != "me") + $postvars['access_token'] = $page_access_token; + logger('facebook: post to ' . $url); logger('facebook: postvars: ' . print_r($postvars,true)); diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index c8330a7e5..bdbb4d4ac 100755 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -505,7 +505,7 @@ function statusnet_shortenmsg($b, $max_char) { while (strpos($msg, " ") !== false) $msg = str_replace(" ", " ", $msg); - return(trim($msg." ".$msglink)); + return(array("msg"=>trim($msg." ".$msglink), "image"=>$image)); } function statusnet_post_hook(&$a,&$b) { @@ -612,14 +612,24 @@ function statusnet_post_hook(&$a,&$b) { } $msg = trim($msg); - } else - $msg = statusnet_shortenmsg($b, $max_char); + $postdata = array('status' => $msg); + } else { + $msgarr = statusnet_shortenmsg($b, $max_char); + $msg = $msgarr["msg"]; + $image = $msgarr["image"]; + if ($image != "") { + $imagedata = file_get_contents($image); + $postdata = array("status"=>$msg, "media"=>$imagedata); + } else + $postdata = array("status"=>$msg); + } // and now dent it :-) if(strlen($msg)) { - $result = $dent->post('statuses/update', array('status' => $msg)); + //$result = $dent->post('statuses/update', array('status' => $msg)); + $result = $dent->post('statuses/update', $postdata); logger('statusnet_post send, result: ' . print_r($result, true). - "\nmessage: ".$msg, LOGGER_DEBUG."\nOriginal post: ".print_r($b)); + "\nmessage: ".$msg, LOGGER_DEBUG."\nOriginal post: ".print_r($b)."\nPost Data: ".print_r($postdata)); if ($result->error) { logger('Send to StatusNet failed: "' . $result->error . '"'); }