From a477266bd9833db19e9d799f954b726e75268bd8 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 29 Apr 2014 14:23:39 +0200 Subject: [PATCH 1/7] Mark facebook and faceboo_restrict as unsupported, change version number of fbsync. --- facebook/facebook.php | 2 +- facebook_restrict/facebook_restrict.php | 1 + fbsync/fbsync.php | 2 +- pumpio/pumpio.php | 3 +++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/facebook/facebook.php b/facebook/facebook.php index 1ec97bc22..66f52af37 100644 --- a/facebook/facebook.php +++ b/facebook/facebook.php @@ -4,7 +4,7 @@ * Version: 1.3 * Author: Mike Macgirvin * Author: Tobias Hößl - * + * Status: Unsupported */ /** diff --git a/facebook_restrict/facebook_restrict.php b/facebook_restrict/facebook_restrict.php index a30d88056..c0720edc3 100644 --- a/facebook_restrict/facebook_restrict.php +++ b/facebook_restrict/facebook_restrict.php @@ -5,6 +5,7 @@ * Description: Install this addon and Facebook users will not be able to link friends. Existing users that are linking friends will not be affected. * Version: 1.0 * Author: Mike Macgirvin + * Status: Unsupported */ diff --git a/fbsync/fbsync.php b/fbsync/fbsync.php index a1f88af92..e211e2dbb 100644 --- a/fbsync/fbsync.php +++ b/fbsync/fbsync.php @@ -2,7 +2,7 @@ /** * Name: Facebook Sync * Description: Synchronizes the Facebook Newsfeed - * Version: 0.0.1 alpha + * Version: 1.0 * Author: Michael Vogel */ diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index d2ef540e3..0c7f31729 100755 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -410,6 +410,9 @@ function pumpio_send(&$a,&$b) { if($b['app'] == "pump.io") return; + // To-Do; + // Support for native shares + // http:///api//shares?id= $oauth_token = get_pconfig($b['uid'], "pumpio", "oauth_token"); $oauth_token_secret = get_pconfig($b['uid'], "pumpio", "oauth_token_secret"); From ee22754ac00359531ba595a8ae4ceddd38a18621 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 29 Apr 2014 15:58:08 +0200 Subject: [PATCH 2/7] fbpost: Speeding up the settings page by reducing the calls to facebook. --- fbpost/fbpost.php | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/fbpost/fbpost.php b/fbpost/fbpost.php index 93a31e2b4..ad0b35aaa 100644 --- a/fbpost/fbpost.php +++ b/fbpost/fbpost.php @@ -134,10 +134,6 @@ function fbpost_post(&$a) { $uid = local_user(); if($uid){ - - $fb_limited = get_config('facebook','crestrict'); - - $value = ((x($_POST,'post_by_default')) ? intval($_POST['post_by_default']) : 0); set_pconfig($uid,'facebook','post_by_default', $value); @@ -193,15 +189,32 @@ function fbpost_content(&$a) { settings_init($a); $o = ''; + $accounts = array(); $fb_installed = false; if (get_pconfig(local_user(),'facebook','post')) { $access_token = get_pconfig(local_user(),'facebook','access_token'); if ($access_token) { - $s = fetch_url('https://graph.facebook.com/me/feed?access_token=' . $access_token); + // fetching the list of accounts to check, if facebook is working + // The value is needed several lines below. + $url = 'https://graph.facebook.com/me/accounts'; + $s = fetch_url($url."?access_token=".$access_token, false, $redirects, 10); if($s) { - $j = json_decode($s); - if (isset($j->data)) $fb_installed = true; + $accounts = json_decode($s); + if (isset($accounts->data)) + $fb_installed = true; + } + + // I'm not totally sure, if this above will work in every situation, + // So this old code will be called as well. + if (!$fb_installed) { + $url ="https://graph.facebook.com/me/feed"; + $s = fetch_url($url."?access_token=".$access_token."&limit=1", false, $redirects, 10); + if($s) { + $j = json_decode($s); + if (isset($j->data)) + $fb_installed = true; + } } } } @@ -265,9 +278,9 @@ function fbpost_content(&$a) { $post_to_page = get_pconfig(local_user(),'facebook','post_to_page'); $page_access_token = get_pconfig(local_user(),'facebook','page_access_token'); $fb_token = get_pconfig($a->user['uid'],'facebook','access_token'); - $url = 'https://graph.facebook.com/me/accounts'; - $x = fetch_url($url."?access_token=".$fb_token); - $accounts = json_decode($x); + //$url = 'https://graph.facebook.com/me/accounts'; + //$x = fetch_url($url."?access_token=".$fb_token, false, $redirects, 10); + //$accounts = json_decode($x); $o .= t("Post to page/group:")." ' + . t('Post to Buffer') . ''; + } +} + +function buffer_settings(&$a,&$s) { + + if(! local_user()) + return; + + /* Add our stylesheet to the page so we can make our settings look nice */ + + $a->page['htmlhead'] .= '' . "\r\n"; + + /* Get the current state of our config variables */ + + $enabled = get_pconfig(local_user(),'buffer','post'); + $checked = (($enabled) ? ' checked="checked" ' : ''); + $css = (($enabled) ? '' : '-disabled'); + + $def_enabled = get_pconfig(local_user(),'buffer','post_by_default'); + $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); + + /* Add some HTML to the existing form */ + + $s .= ''; + $s .= '

'. t('Buffer Export').'

'; + $s .= ''; + $s .= ''; + +} + + +function buffer_settings_post(&$a,&$b) { + + if(x($_POST,'buffer-submit')) { + if(x($_POST,'buffer_delete')) { + set_pconfig(local_user(),'buffer','access_token',''); + set_pconfig(local_user(),'buffer','post',false); + set_pconfig(local_user(),'buffer','post_by_default',false); + } else { + // filtering the username if it is filled wrong + $user = $_POST['buffer_user']; + if (strstr($user, "@")) { + $pos = strpos($user, "@"); + if ($pos > 0) + $user = substr($user, 0, $pos); + } + + // Filtering the hostname if someone is entering it with "http" + $host = $_POST['buffer_host']; + $host = trim($host); + $host = str_replace(array("https://", "http://"), array("", ""), $host); + + set_pconfig(local_user(),'buffer','post',intval($_POST['buffer'])); + set_pconfig(local_user(),'buffer','post_by_default',intval($_POST['buffer_bydefault'])); + + //header("Location: ".$a->get_baseurl()."/buffer/connect"); + } + } +} + +function buffer_post_local(&$a,&$b) { + + if((! local_user()) || (local_user() != $b['uid'])) + return; + + $buffer_post = intval(get_pconfig(local_user(),'buffer','post')); + + $buffer_enable = (($buffer_post && x($_REQUEST,'buffer_enable')) ? intval($_REQUEST['buffer_enable']) : 0); + + if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'buffer','post_by_default'))) + $buffer_enable = 1; + + if(! $buffer_enable) + return; + + if(strlen($b['postopts'])) + $b['postopts'] .= ','; + + $b['postopts'] .= 'buffer'; +} + +function buffer_send(&$a,&$b) { + + if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) + return; + + logger("buffer_send: parameter ".print_r($b, true), LOGGER_DATA); + + if(! strstr($b['postopts'],'buffer')) + return; + + if($b['parent'] != $b['id']) + return; + + // if post comes from buffer don't send it back + if($b['app'] == "Buffer") + return; + + $client_id = get_config("buffer", "client_id"); + $client_secret = get_config("buffer", "client_secret"); + $access_token = get_pconfig($b['uid'], "buffer","access_token"); + + if($access_token) { + $buffer = new BufferApp($client_id, $client_secret, $callback_url, $access_token); + + $result = q("SELECT `installed` FROM `addon` WHERE `name` = 'privacy_image_cache' AND `installed`"); + $image_cache = (count($result) > 0); + + require_once("include/plaintext.php"); + require_once("include/network.php"); + + $profiles = $buffer->go('/profiles'); + if (is_array($profiles)) { + foreach ($profiles as $profile) { + if (!$profile->default) + continue; + + switch ($profile->service) { + case 'appdotnet': + $limit = 256; + $markup = false; + $includedlinks = true; + break; + case 'facebook': + $limit = 0; + $markup = false; + $includedlinks = false; + break; + case 'google': + $limit = 0; + $markup = true; + $includedlinks = false; + break; + case 'twitter': + $limit = 140; + $markup = false; + $includedlinks = true; + break; + case 'linkedin': + $limit = 700; + $markup = false; + $includedlinks = true; + break; + } + + $item = $b; + + // Markup for Google+ + if ($markup) { + if ($item["title"] != "") + $item["title"] = "*".$item["title"]."*"; + + $item["body"] = preg_replace("(\[b\](.*?)\[\/b\])ism",'*$1*',$item["body"]); + $item["body"] = preg_replace("(\[i\](.*?)\[\/i\])ism",'_$1_',$item["body"]); + $item["body"] = preg_replace("(\[s\](.*?)\[\/s\])ism",'-$1-',$item["body"]); + } + + $post = plaintext($a, $item, $limit, $includedlinks); + logger("buffer_send: converted message ".$b["id"]." result: ".print_r($post, true), LOGGER_DEBUG); + + // The image cache is used as a sanitizer. Buffer seems to be really picky about pictures + if ($image_cache) { + require_once("addon/privacy_image_cache/privacy_image_cache.php"); + if (isset($post["image"])) + $post["image"] = $a->get_baseurl() . "/privacy_image_cache/".privacy_image_cache_cachename($post["image"]); + + if (isset($post["preview"])) + $post["preview"] = $a->get_baseurl() . "/privacy_image_cache/".privacy_image_cache_cachename($post["preview"]); + } + + //if ($includedlinks AND isset($post["url"])) + // $post["url"] = short_link($post["url"]); + + // Seems like a bug to me + // Buffer doesn't add links to Twitter and App.net (but pictures) + if ($includedlinks AND isset($post["url"])) + $post["text"] .= " ".short_link($post["url"]); + + //if ($includedlinks AND ($post["type"] == "link")) + // $post["text"] .= " ".$post["url"]; + + //if ($includedlinks AND ($post["type"] == "video")) + // $post["text"] .= " ".$post["url"]; + + //print_r($post); + + $message = array(); + $message["text"] = $post["text"]; + $message["profile_ids[]"] = $profile->id; + $message["shorten"] = false; + $message["now"] = true; + + if (isset($post["title"])) + $message["media[title]"] = $post["title"]; + + if (isset($post["description"])) + $message["media[description]"] = $post["description"]; + + if (isset($post["url"])) + $message["media[link]"] = $post["url"]; + + if (isset($post["image"])) { + $message["media[picture]"] = $post["image"]; + if ($post["type"] == "photo") + $message["media[thumbnail]"] = $post["image"]; + } + + if (isset($post["preview"])) + $message["media[thumbnail]"] = $post["preview"]; + + //print_r($message); + $ret = $buffer->go('/updates/create', $message); + logger("buffer_send: send message ".$b["id"]." result: ".print_r($ret, true), LOGGER_DEBUG); + } + } + } +} diff --git a/buffer/bufferapp.php b/buffer/bufferapp.php new file mode 100644 index 000000000..63953c075 --- /dev/null +++ b/buffer/bufferapp.php @@ -0,0 +1,205 @@ + 'get', + + '/profiles' => 'get', + '/profiles/:id' => 'get', + '/profiles/:id/schedules' => 'get', + '/profiles/:id/schedules/update' => 'post', // Array schedules [0][days][]=mon, [0][times][]=12:00 + + '/updates/:id' => 'get', + '/profiles/:id/updates/pending' => 'get', + '/profiles/:id/updates/sent' => 'get', + '/updates/:id/interactions' => 'get', + + '/profiles/:id/updates/reorder' => 'post', // Array order, int offset, bool utc + '/profiles/:id/updates/shuffle' => 'post', + '/updates/create' => 'post', // String text, Array profile_ids, Aool shorten, Bool now, Array media ['link'], ['description'], ['picture'] + '/updates/:id/update' => 'post', // String text, Bool now, Array media ['link'], ['description'], ['picture'], Bool utc + '/updates/:id/share' => 'post', + '/updates/:id/destroy' => 'post', + '/updates/:id/move_to_top' => 'post', + + '/links/shares' => 'get', + + '/info/configuration' => 'get', + + ); + + public $errors = array( + 'invalid-endpoint' => 'The endpoint you supplied does not appear to be valid.', + + '403' => 'Permission denied.', + '404' => 'Endpoint not found.', + '405' => 'Method not allowed.', + '1000' => 'An unknown error occurred.', + '1001' => 'Access token required.', + '1002' => 'Not within application scope.', + '1003' => 'Parameter not recognized.', + '1004' => 'Required parameter missing.', + '1005' => 'Unsupported response format.', + '1006' => 'Parameter value not within bounds.', + '1010' => 'Profile could not be found.', + '1011' => 'No authorization to access profile.', + '1012' => 'Profile did not save successfully.', + '1013' => 'Profile schedule limit reached.', + '1014' => 'Profile limit for user has been reached.', + '1015' => 'Profile could not be destroyed.', + '1016' => 'Profile buffer could not be emptied.', + '1020' => 'Update could not be found.', + '1021' => 'No authorization to access update.', + '1022' => 'Update did not save successfully.', + '1023' => 'Update limit for profile has been reached.', + '1024' => 'Update limit for team profile has been reached.', + '1025' => "Update was recently posted, can't post duplicate content.", + '1026' => 'Update must be in error status to requeue.', + '1027' => 'Update must be in buffer and not custom scheduled in order to move to top.', + '1028' => 'Update soft limit for profile reached.', + '1029' => 'Event type not supported.', + '1030' => 'Media filetype not supported.', + '1031' => 'Media filesize out of acceptable range.', + '1032' => 'Unable to post image to LinkedIn group(s).', + '1033' => 'Comments can only be posted to Facebook at this time.', + '1034' => 'Cannot schedule updates in the past.', + '1042' => 'User did not save successfully.', + '1050' => 'Client could not be found.', + '1051' => 'No authorization to access client.', + ); + + function __construct($client_id = '', $client_secret = '', $callback_url = '', $access_token = '') { + if ($client_id) $this->set_client_id($client_id); + if ($client_secret) $this->set_client_secret($client_secret); + if ($callback_url) $this->set_callback_url($callback_url); + if ($access_token) $this->access_token = $access_token; + + if (isset($_GET['code']) AND $_GET['code']) { + $this->code = $_GET['code']; + $this->create_access_token_url(); + } + + if (!$access_token) + $this->retrieve_access_token(); + } + + function go($endpoint = '', $data = '') { + if (in_array($endpoint, array_keys($this->endpoints))) { + $done_endpoint = $endpoint; + } else { + $ok = false; + + foreach (array_keys($this->endpoints) as $done_endpoint) { + if (preg_match('/' . preg_replace('/(\:\w+)/i', '(\w+)', str_replace('/', '\/', $done_endpoint)) . '/i', $endpoint, $match)) { + $ok = true; + break; + } + } + + if (!$ok) return $this->error('invalid-endpoint'); + } + + if (!$data || !is_array($data)) $data = array(); + $data['access_token'] = $this->access_token; + + $method = $this->endpoints[$done_endpoint]; //get() or post() + return $this->$method($this->buffer_url . $endpoint . '.json', $data); + } + + function store_access_token() { + $_SESSION['oauth']['buffer']['access_token'] = $this->access_token; + } + + function retrieve_access_token() { + $this->access_token = $_SESSION['oauth']['buffer']['access_token']; + + if ($this->access_token) { + $this->ok = true; + } + } + + function error($error) { + return (object) array('error' => $this->errors[$error]); + } + + function create_access_token_url() { + $data = array( + 'code' => $this->code, + 'grant_type' => 'authorization_code', + 'client_id' => $this->client_id, + 'client_secret' => $this->client_secret, + 'redirect_uri' => $this->callback_url, + ); + + $obj = $this->post($this->access_token_url, $data); + $this->access_token = $obj->access_token; + + $this->store_access_token(); + } + + function req($url = '', $data = '', $post = true) { + if (!$url) return false; + if (!$data || !is_array($data)) $data = array(); + + $options = array(CURLOPT_RETURNTRANSFER => true, CURLOPT_HEADER => false); + + if ($post) { + $options += array( + CURLOPT_POST => $post, + CURLOPT_POSTFIELDS => $data + ); + } else { + $url .= '?' . http_build_query($data); + } + + $ch = curl_init($url); + curl_setopt_array($ch, $options); + $rs = curl_exec($ch); + + $code = curl_getinfo($ch, CURLINFO_HTTP_CODE); + if ($code >= 400) { + return $this->error($code); + } + + return json_decode($rs); + } + + function get($url = '', $data = '') { + return $this->req($url, $data, false); + } + + function post($url = '', $data = '') { + return $this->req($url, $data, true); + } + + function get_login_url() { + return $this->authorize_url . '?' + . 'client_id=' . $this->client_id + . '&redirect_uri=' . urlencode($this->callback_url) + . '&response_type=code'; + } + + function set_client_id($client_id) { + $this->client_id = $client_id; + } + + function set_client_secret($client_secret) { + $this->client_secret = $client_secret; + } + + function set_callback_url($callback_url) { + $this->callback_url = $callback_url; + } + } +?> diff --git a/buffer/templates/admin.tpl b/buffer/templates/admin.tpl new file mode 100644 index 000000000..b4cc3651f --- /dev/null +++ b/buffer/templates/admin.tpl @@ -0,0 +1,3 @@ +{{include file="field_input.tpl" field=$client_id}} +{{include file="field_input.tpl" field=$client_secret}} +
From 1320a26a0119a3cfde9543855d7f8292462e4c7c Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 3 May 2014 23:41:33 +0200 Subject: [PATCH 6/7] Buffer: Don't post a link if its a photo - this irritates buffer --- buffer/buffer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buffer/buffer.php b/buffer/buffer.php index 76156e16f..d7ad69f65 100644 --- a/buffer/buffer.php +++ b/buffer/buffer.php @@ -354,7 +354,7 @@ function buffer_send(&$a,&$b) { if (isset($post["description"])) $message["media[description]"] = $post["description"]; - if (isset($post["url"])) + if (isset($post["url"]) AND ($post["type"] != "photo")) $message["media[link]"] = $post["url"]; if (isset($post["image"])) { From 3ebfe081baddd515bdb734c053d0437041c318e1 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 4 May 2014 22:17:41 +0200 Subject: [PATCH 7/7] Buffer: Links to Appnet and Twitter are shortened now. (Including the images) --- buffer/buffer.php | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/buffer/buffer.php b/buffer/buffer.php index d7ad69f65..f6d16eaed 100644 --- a/buffer/buffer.php +++ b/buffer/buffer.php @@ -326,21 +326,19 @@ function buffer_send(&$a,&$b) { $post["preview"] = $a->get_baseurl() . "/privacy_image_cache/".privacy_image_cache_cachename($post["preview"]); } - //if ($includedlinks AND isset($post["url"])) - // $post["url"] = short_link($post["url"]); + if ($includedlinks) { + if (isset($post["url"])) + $post["url"] = short_link($post["url"]); + if (isset($post["image"])) + $post["image"] = short_link($post["image"]); + if (isset($post["preview"])) + $post["preview"] = short_link($post["preview"]); + } // Seems like a bug to me // Buffer doesn't add links to Twitter and App.net (but pictures) if ($includedlinks AND isset($post["url"])) - $post["text"] .= " ".short_link($post["url"]); - - //if ($includedlinks AND ($post["type"] == "link")) - // $post["text"] .= " ".$post["url"]; - - //if ($includedlinks AND ($post["type"] == "video")) - // $post["text"] .= " ".$post["url"]; - - //print_r($post); + $post["text"] .= " ".$post["url"]; $message = array(); $message["text"] = $post["text"];