Merge pull request #91 from annando/master
privacy_image_cache: Pictures are now fetched from the original source
This commit is contained in:
friendica
commit
effab3aad8
5 changed files with 586 additions and 62 deletions
|
|
@ -22,6 +22,7 @@
|
|||
* in a future release.
|
||||
*/
|
||||
|
||||
define('FACEBOOK_DEFAULT_POLL_INTERVAL', 5); // given in minutes
|
||||
|
||||
require_once('include/security.php');
|
||||
|
||||
|
|
@ -32,6 +33,7 @@ function fbpost_install() {
|
|||
register_hook('connector_settings', 'addon/fbpost/fbpost.php', 'fbpost_plugin_settings');
|
||||
register_hook('enotify', 'addon/fbpost/fbpost.php', 'fbpost_enotify');
|
||||
register_hook('queue_predeliver', 'addon/fbpost/fbpost.php', 'fbpost_queue_hook');
|
||||
register_hook('cron', 'addon/fbpost/fbpost.php', 'fbpost_cron');
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -42,8 +44,7 @@ function fbpost_uninstall() {
|
|||
unregister_hook('connector_settings', 'addon/fbpost/fbpost.php', 'fbpost_plugin_settings');
|
||||
unregister_hook('enotify', 'addon/fbpost/fbpost.php', 'fbpost_enotify');
|
||||
unregister_hook('queue_predeliver', 'addon/fbpost/fbpost.php', 'fbpost_queue_hook');
|
||||
|
||||
|
||||
unregister_hook('cron', 'addon/fbpost/fbpost.php', 'fbpost_cron');
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -140,6 +141,9 @@ 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,'mirror_posts')) ? intval($_POST['mirror_posts']) : 0);
|
||||
set_pconfig($uid,'facebook','mirror_posts', $value);
|
||||
|
||||
$value = ((x($_POST,'suppress_view_on_friendica')) ? intval($_POST['suppress_view_on_friendica']) : 0);
|
||||
set_pconfig($uid,'facebook','suppress_view_on_friendica', $value);
|
||||
|
||||
|
|
@ -209,7 +213,7 @@ function fbpost_content(&$a) {
|
|||
$o .= '<div id="fbpost-enable-wrapper">';
|
||||
|
||||
$o .= '<a href="https://www.facebook.com/dialog/oauth?client_id=' . $appid . '&redirect_uri='
|
||||
. $a->get_baseurl() . '/fbpost/' . $a->user['nickname'] . '&scope=publish_stream,manage_pages,photo_upload,user_groups,offline_access">' . t('Install Facebook Post connector for this account.') . '</a>';
|
||||
. $a->get_baseurl() . '/fbpost/' . $a->user['nickname'] . '&scope=read_stream,publish_stream,manage_pages,photo_upload,user_groups,offline_access">' . t('Install Facebook Post connector for this account.') . '</a>';
|
||||
$o .= '</div>';
|
||||
}
|
||||
|
||||
|
|
@ -221,7 +225,7 @@ function fbpost_content(&$a) {
|
|||
$o .= '<div id="fbpost-enable-wrapper">';
|
||||
|
||||
$o .= '<a href="https://www.facebook.com/dialog/oauth?client_id=' . $appid . '&redirect_uri='
|
||||
. $a->get_baseurl() . '/fbpost/' . $a->user['nickname'] . '&scope=publish_stream,manage_pages,photo_upload,user_groups,offline_access">' . t('Re-authenticate [This is necessary whenever your Facebook password is changed.]') . '</a>';
|
||||
. $a->get_baseurl() . '/fbpost/' . $a->user['nickname'] . '&scope=read_stream,publish_stream,manage_pages,photo_upload,user_groups,offline_access">' . t('Re-authenticate [This is necessary whenever your Facebook password is changed.]') . '</a>';
|
||||
$o .= '</div>';
|
||||
|
||||
$o .= '<div id="fbpost-post-default-form">';
|
||||
|
|
@ -234,6 +238,10 @@ function fbpost_content(&$a) {
|
|||
$checked = (($suppress_view_on_friendica) ? ' checked="checked" ' : '');
|
||||
$o .= '<input type="checkbox" name="suppress_view_on_friendica" value="1"' . $checked . '/>' . ' ' . t('Suppress "View on friendica"') . EOL;
|
||||
|
||||
$mirror_posts = get_pconfig(local_user(),'facebook','mirror_posts');
|
||||
$checked = (($mirror_posts) ? ' checked="checked" ' : '');
|
||||
$o .= '<input type="checkbox" name="mirror_posts" value="1"' . $checked . '/>' . ' ' . t('Mirror wall posts from facebook to friendica.') . EOL;
|
||||
|
||||
// List all pages
|
||||
$post_to_page = get_pconfig(local_user(),'facebook','post_to_page');
|
||||
$page_access_token = get_pconfig(local_user(),'facebook','page_access_token');
|
||||
|
|
@ -386,6 +394,10 @@ function fbpost_post_hook(&$a,&$b) {
|
|||
if($b['deleted'] || ($b['created'] !== $b['edited']))
|
||||
return;
|
||||
|
||||
// if post comes from facebook don't send it back
|
||||
if($b['app'] == "Facebook")
|
||||
return;
|
||||
|
||||
/**
|
||||
* Post to Facebook stream
|
||||
*/
|
||||
|
|
@ -965,3 +977,209 @@ function fbpost_get_app_access_token() {
|
|||
}
|
||||
}
|
||||
|
||||
function fbpost_cron($a,$b) {
|
||||
$last = get_config('facebook','last_poll');
|
||||
|
||||
$poll_interval = intval(get_config('facebook','poll_interval'));
|
||||
if(! $poll_interval)
|
||||
$poll_interval = FACEBOOK_DEFAULT_POLL_INTERVAL;
|
||||
|
||||
if($last) {
|
||||
$next = $last + ($poll_interval * 60);
|
||||
if($next > time()) {
|
||||
logger('facebook: poll intervall not reached');
|
||||
return;
|
||||
}
|
||||
}
|
||||
logger('facebook: cron_start');
|
||||
|
||||
$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'facebook' AND `k` = 'mirror_posts' AND `v` = '1' ORDER BY RAND() ");
|
||||
if(count($r)) {
|
||||
foreach($r as $rr) {
|
||||
logger('facebook: fetching for user '.$rr['uid']);
|
||||
fbpost_fetchwall($a, $rr['uid']);
|
||||
}
|
||||
}
|
||||
|
||||
logger('facebook: cron_end');
|
||||
|
||||
set_config('facebook','last_poll', time());
|
||||
}
|
||||
|
||||
function fbpost_fetchwall($a, $uid) {
|
||||
$access_token = get_pconfig($uid,'facebook','access_token');
|
||||
$post_to_page = get_pconfig($uid,'facebook','post_to_page');
|
||||
$lastcreated = get_pconfig($uid,'facebook','last_created');
|
||||
|
||||
if ((int)$post_to_page == 0)
|
||||
$post_to_page = "me";
|
||||
|
||||
$url = "https://graph.facebook.com/".$post_to_page."/feed?access_token=".$access_token;
|
||||
|
||||
if ($lastcreated != "")
|
||||
$url .= "&since=".urlencode($lastcreated);
|
||||
|
||||
$feed = fetch_url($url);
|
||||
$data = json_decode($feed);
|
||||
$items = array_reverse($data->data);
|
||||
|
||||
foreach ($items as $item) {
|
||||
if ($item->created_time > $lastcreated)
|
||||
$lastcreated = $item->created_time;
|
||||
|
||||
if ($item->application->id == get_config('facebook','appid'))
|
||||
continue;
|
||||
|
||||
if(isset($item->privacy) && ($item->privacy->value !== 'EVERYONE') && ($item->privacy->value !== ''))
|
||||
continue;
|
||||
|
||||
$_SESSION["authenticated"] = true;
|
||||
$_SESSION["uid"] = $uid;
|
||||
|
||||
$_REQUEST["type"] = "wall";
|
||||
$_REQUEST["api_source"] = true;
|
||||
$_REQUEST["profile_uid"] = $uid;
|
||||
$_REQUEST["source"] = "Facebook";
|
||||
|
||||
$_REQUEST["body"] = (isset($item->message) ? escape_tags($item->message) : '');
|
||||
|
||||
if(isset($item->name) and isset($item->link))
|
||||
$_REQUEST["body"] .= "\n\n[bookmark=".$item->link."]".$item->name."[/bookmark]";
|
||||
elseif (isset($item->name))
|
||||
$_REQUEST["body"] .= "\n\n[b]" . $item->name."[/b]";
|
||||
|
||||
/*if(isset($item->caption)) {
|
||||
if(!isset($item->name) and isset($item->link))
|
||||
$_REQUEST["body"] .= "\n\n[bookmark=".$item->link."]".$item->caption."[/bookmark]";
|
||||
//else
|
||||
// $_REQUEST["body"] .= "[i]" . $item->caption."[/i]\n";
|
||||
}
|
||||
|
||||
if(!isset($item->caption) and !isset($item->name)) {
|
||||
if (isset($item->link))
|
||||
$_REQUEST["body"] .= "\n[url]".$item->link."[/url]\n";
|
||||
else
|
||||
$_REQUEST["body"] .= "\n";
|
||||
}*/
|
||||
|
||||
$quote = "";
|
||||
if(isset($item->description) and ($item->type != "photo"))
|
||||
$quote = $item->description;
|
||||
|
||||
if(isset($item->caption) and ($item->type == "photo"))
|
||||
$quote = $item->caption;
|
||||
|
||||
//if (isset($item->properties))
|
||||
// foreach ($item->properties as $property)
|
||||
// $quote .= "\n".$property->name.": [url=".$property->href."]".$property->text."[/url]";
|
||||
|
||||
if ($quote)
|
||||
$_REQUEST["body"] .= "\n[quote]".$quote."[/quote]";
|
||||
|
||||
// Only import the picture when the message is no video
|
||||
// oembed display a picture of the video as well
|
||||
if ($item->type != "video") {
|
||||
//if (($item->type != "video") and ($item->type != "photo")) {
|
||||
if(isset($item->picture) && isset($item->link))
|
||||
$_REQUEST["body"] .= "\n".'[url='.$item->link.'][img]'.fpost_cleanpicture($item->picture).'[/img][/url]';
|
||||
else {
|
||||
if (isset($item->picture))
|
||||
$_REQUEST["body"] .= "\n".'[img]'.fpost_cleanpicture($item->picture).'[/img]';
|
||||
// if just a link, it may be a wall photo - check
|
||||
if(isset($item->link))
|
||||
$_REQUEST["body"] .= fbpost_get_photo($uid,$item->link);
|
||||
}
|
||||
}
|
||||
|
||||
/*if (($datarray['app'] == "Events") and isset($item->actions))
|
||||
foreach ($item->actions as $action)
|
||||
if ($action->name == "View")
|
||||
$_REQUEST["body"] .= " [url=".$action->link."]".$item->story."[/url]";
|
||||
*/
|
||||
|
||||
if(trim($_REQUEST["body"]) == '') {
|
||||
logger('facebook: empty body '.$item->id.' '.print_r($item, true));
|
||||
continue;
|
||||
}
|
||||
|
||||
$_REQUEST["body"] = trim($_REQUEST["body"]);
|
||||
|
||||
if (isset($item->place)) {
|
||||
if ($item->place->name or $item->place->location->street or
|
||||
$item->place->location->city or $item->place->location->country) {
|
||||
$_REQUEST["location"] = '';
|
||||
if ($item->place->name)
|
||||
$_REQUEST["location"] .= $item->place->name;
|
||||
if ($item->place->location->street)
|
||||
$_REQUEST["location"] .= " ".$item->place->location->street;
|
||||
if ($item->place->location->city)
|
||||
$_REQUEST["location"] .= " ".$item->place->location->city;
|
||||
if ($item->place->location->country)
|
||||
$_REQUEST["location"] .= " ".$item->place->location->country;
|
||||
|
||||
$_REQUEST["location"] = trim($_REQUEST["location"]);
|
||||
}
|
||||
if ($item->place->location->latitude and $item->place->location->longitude)
|
||||
$_REQUEST["coord"] = substr($item->place->location->latitude, 0, 8)
|
||||
.' '.substr($item->place->location->longitude, 0, 8);
|
||||
}
|
||||
|
||||
//print_r($_REQUEST);
|
||||
logger('facebook: posting for user '.$uid);
|
||||
|
||||
require_once('mod/item.php');
|
||||
item_post($a);
|
||||
}
|
||||
|
||||
set_pconfig($uid,'facebook','last_created', $lastcreated);
|
||||
}
|
||||
|
||||
function fbpost_get_photo($uid,$link) {
|
||||
$access_token = get_pconfig($uid,'facebook','access_token');
|
||||
if(! $access_token || (! stristr($link,'facebook.com/photo.php')))
|
||||
return "";
|
||||
|
||||
$ret = preg_match('/fbid=([0-9]*)/',$link,$match);
|
||||
if($ret)
|
||||
$photo_id = $match[1];
|
||||
else
|
||||
return "";
|
||||
|
||||
$x = fetch_url('https://graph.facebook.com/'.$photo_id.'?access_token='.$access_token);
|
||||
$j = json_decode($x);
|
||||
if($j->picture)
|
||||
return "\n\n".'[url='.$link.'][img]'.fpost_cleanpicture($j->picture).'[/img][/url]';
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
function fpost_cleanpicture($image) {
|
||||
|
||||
if (strpos($image, ".fbcdn.net/") and (substr($image, -6) == "_s.jpg"))
|
||||
$image = substr($image, 0, -6)."_n.jpg";
|
||||
|
||||
$queryvar = fbpost_parse_query($image);
|
||||
if ($queryvar['url'] != "")
|
||||
$image = urldecode($queryvar['url']);
|
||||
|
||||
return $image;
|
||||
}
|
||||
|
||||
function fbpost_parse_query($var) {
|
||||
/**
|
||||
* Use this function to parse out the query array element from
|
||||
* the output of parse_url().
|
||||
*/
|
||||
$var = parse_url($var, PHP_URL_QUERY);
|
||||
$var = html_entity_decode($var);
|
||||
$var = explode('&', $var);
|
||||
$arr = array();
|
||||
|
||||
foreach($var as $val) {
|
||||
$x = explode('=', $val);
|
||||
$arr[$x[0]] = $x[1];
|
||||
}
|
||||
|
||||
unset($val, $x, $var);
|
||||
return $arr;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ function forumlist_network_mod_init($a,$b) {
|
|||
|
||||
if(count($contacts)) {
|
||||
foreach($contacts as $contact) {
|
||||
$forumlist .= '<a href="' . $a->get_baseurl() . '/redir/' . $contact["id"] . '" title="' . $contact['url'] . '" class="label sparkle" target="external-link"><img class="forumlist-img" height="20" width="20" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /></a> <a href="' . $a->get_baseurl() . '/network?f=&cid=' . $contact['id'] . '" >' . $contact["name"]."</a><br />";
|
||||
$forumlist .= '<div><a href="' . $a->get_baseurl() . '/redir/' . $contact["id"] . '" title="' . $contact['url'] . '" class="label sparkle" target="external-link"><img class="forumlist-img" height="20" width="20" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /></a> <a href="' . $a->get_baseurl() . '/network?f=&cid=' . $contact['id'] . '" >' . $contact["name"]."</a></div>";
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
|
|
|||
|
|
@ -119,7 +119,17 @@ function privacy_image_cache_init() {
|
|||
// It shouldn't happen but it does - spaces in URL
|
||||
$_REQUEST['url'] = str_replace(" ", "+", $_REQUEST['url']);
|
||||
|
||||
$img_str = fetch_url($_REQUEST['url'],true);
|
||||
// if the picture seems to be from another picture cache then take the original source
|
||||
$queryvar = privacy_image_cache_parse_query($_REQUEST['url']);
|
||||
if ($queryvar['url'] != "")
|
||||
$_REQUEST['url'] = urldecode($queryvar['url']);
|
||||
|
||||
// if fetching facebook pictures don't fetch the thumbnail but the big one
|
||||
if (strpos($_REQUEST['url'], ".fbcdn.net/") and (substr($_REQUEST['url'], -6) == "_s.jpg"))
|
||||
$_REQUEST['url'] = substr($_REQUEST['url'], 0, -6)."_n.jpg";
|
||||
|
||||
$redirects = 0;
|
||||
$img_str = fetch_url($_REQUEST['url'],true, $redirects, 10);
|
||||
|
||||
$tempfile = tempnam(get_config("system","temppath"), "cache");
|
||||
file_put_contents($tempfile, $img_str);
|
||||
|
|
@ -132,9 +142,9 @@ function privacy_image_cache_init() {
|
|||
$mime = "image/png";
|
||||
$cachefile = ""; // Clear the cachefile so that the dummy isn't stored
|
||||
$valid = false;
|
||||
$img = new Photo($img_str);
|
||||
$img = new Photo($img_str, "image/png");
|
||||
if($img->is_valid()) {
|
||||
$img->scaleImage(1);
|
||||
$img->scaleImage(10);
|
||||
$img_str = $img->imageString();
|
||||
}
|
||||
//} else if (substr($img_str, 0, 6) == "GIF89a") {
|
||||
|
|
@ -319,14 +329,12 @@ function privacy_image_cache_cron(&$a = null, &$b = null) {
|
|||
|
||||
logger("Purging old Cache of the Privacy Image Cache", LOGGER_DEBUG);
|
||||
q('DELETE FROM `photo` WHERE `uid` = 0 AND `resource-id` LIKE "pic:%%" AND `created` < NOW() - INTERVAL %d SECOND', $cachetime);
|
||||
set_config('pi_cache', 'last_delete', $time);
|
||||
|
||||
clear_cache($a->get_basepath(), $a->get_basepath()."/privacy_image_cache");
|
||||
|
||||
set_config('pi_cache', 'last_delete', $time);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @param App $a
|
||||
* @param null|object $o
|
||||
|
|
@ -372,3 +380,22 @@ function privacy_image_cache_plugin_admin_post(&$a = null, &$o = null){
|
|||
q('DELETE FROM `photo` WHERE `uid` = 0 AND `resource-id` LIKE "pic:%%"');
|
||||
}
|
||||
}
|
||||
|
||||
function privacy_image_cache_parse_query($var) {
|
||||
/**
|
||||
* Use this function to parse out the query array element from
|
||||
* the output of parse_url().
|
||||
*/
|
||||
$var = parse_url($var, PHP_URL_QUERY);
|
||||
$var = html_entity_decode($var);
|
||||
$var = explode('&', $var);
|
||||
$arr = array();
|
||||
|
||||
foreach($var as $val) {
|
||||
$x = explode('=', $val);
|
||||
$arr[$x[0]] = $x[1];
|
||||
}
|
||||
|
||||
unset($val, $x, $var);
|
||||
return $arr;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,6 +30,8 @@
|
|||
* Thank you guys for the Twitter compatible API!
|
||||
*/
|
||||
|
||||
define('STATUSNET_DEFAULT_POLL_INTERVAL', 5); // given in minutes
|
||||
|
||||
require_once('library/twitteroauth.php');
|
||||
|
||||
class StatusNetOAuth extends TwitterOAuth {
|
||||
|
|
@ -104,6 +106,7 @@ function statusnet_install() {
|
|||
register_hook('notifier_normal', 'addon/statusnet/statusnet.php', 'statusnet_post_hook');
|
||||
register_hook('post_local', 'addon/statusnet/statusnet.php', 'statusnet_post_local');
|
||||
register_hook('jot_networks', 'addon/statusnet/statusnet.php', 'statusnet_jot_nets');
|
||||
register_hook('cron', 'addon/statusnet/statusnet.php', 'statusnet_cron');
|
||||
logger("installed statusnet");
|
||||
}
|
||||
|
||||
|
|
@ -114,6 +117,7 @@ function statusnet_uninstall() {
|
|||
unregister_hook('notifier_normal', 'addon/statusnet/statusnet.php', 'statusnet_post_hook');
|
||||
unregister_hook('post_local', 'addon/statusnet/statusnet.php', 'statusnet_post_local');
|
||||
unregister_hook('jot_networks', 'addon/statusnet/statusnet.php', 'statusnet_jot_nets');
|
||||
unregister_hook('cron', 'addon/statusnet/statusnet.php', 'statusnet_cron');
|
||||
|
||||
// old setting - remove only
|
||||
unregister_hook('post_local_end', 'addon/statusnet/statusnet.php', 'statusnet_post_hook');
|
||||
|
|
@ -135,9 +139,6 @@ function statusnet_jot_nets(&$a,&$b) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
function statusnet_settings_post ($a,$post) {
|
||||
if(! local_user())
|
||||
return;
|
||||
|
|
@ -156,6 +157,9 @@ function statusnet_settings_post ($a,$post) {
|
|||
del_pconfig(local_user(), 'statusnet', 'oauthsecret');
|
||||
del_pconfig(local_user(), 'statusnet', 'baseapi');
|
||||
del_pconfig(local_user(), 'statusnet', 'post_taglinks');
|
||||
del_pconfig(local_user(), 'statusnet', 'lastid');
|
||||
del_pconfig(local_user(), 'statusnet', 'mirror_posts');
|
||||
del_pconfig(local_user(), 'statusnet', 'intelligent_shortening');
|
||||
} else {
|
||||
if (isset($_POST['statusnet-preconf-apiurl'])) {
|
||||
/***
|
||||
|
|
@ -229,6 +233,8 @@ function statusnet_settings_post ($a,$post) {
|
|||
set_pconfig(local_user(),'statusnet','post',intval($_POST['statusnet-enable']));
|
||||
set_pconfig(local_user(),'statusnet','post_by_default',intval($_POST['statusnet-default']));
|
||||
set_pconfig(local_user(),'statusnet','post_taglinks',intval($_POST['statusnet-sendtaglinks']));
|
||||
set_pconfig(local_user(), 'statusnet', 'mirror_posts', intval($_POST['statusnet-mirror']));
|
||||
set_pconfig(local_user(), 'statusnet', 'intelligent_shortening', intval($_POST['statusnet-shortening']));
|
||||
info( t('StatusNet settings updated.') . EOL);
|
||||
}}}}
|
||||
}
|
||||
|
|
@ -253,6 +259,12 @@ function statusnet_settings(&$a,&$s) {
|
|||
$defchecked = (($defenabled) ? ' checked="checked" ' : '');
|
||||
$linksenabled = get_pconfig(local_user(),'statusnet','post_taglinks');
|
||||
$linkschecked = (($linksenabled) ? ' checked="checked" ' : '');
|
||||
|
||||
$mirrorenabled = get_pconfig(local_user(),'statusnet','mirror_posts');
|
||||
$mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : '');
|
||||
$shorteningenabled = get_pconfig(local_user(),'statusnet','intelligent_shortening');
|
||||
$shorteningchecked = (($shorteningenabled) ? ' checked="checked" ' : '');
|
||||
|
||||
$s .= '<div class="settings-block">';
|
||||
$s .= '<h3>'. t('StatusNet Posting Settings').'</h3>';
|
||||
|
||||
|
|
@ -342,6 +354,15 @@ function statusnet_settings(&$a,&$s) {
|
|||
$s .= '<label id="statusnet-default-label" for="statusnet-default">'. t('Send public postings to StatusNet by default') .'</label>';
|
||||
$s .= '<input id="statusnet-default" type="checkbox" name="statusnet-default" value="1" ' . $defchecked . '/>';
|
||||
$s .= '<div class="clear"></div>';
|
||||
|
||||
$s .= '<label id="statusnet-mirror-label" for="statusnet-mirror">'.t('Mirror all posts from statusnet that are no replies or repeated messages').'</label>';
|
||||
$s .= '<input id="statusnet-mirror" type="checkbox" name="statusnet-mirror" value="1" '. $mirrorchecked . '/>';
|
||||
$s .= '<div class="clear"></div>';
|
||||
|
||||
$s .= '<label id="statusnet-shortening-label" for="statusnet-shortening">'.t('Shortening method that optimizes the post').'</label>';
|
||||
$s .= '<input id="statusnet-shortening" type="checkbox" name="statusnet-shortening" value="1" '. $shorteningchecked . '/>';
|
||||
$s .= '<div class="clear"></div>';
|
||||
|
||||
$s .= '<label id="statusnet-sendtaglinks-label" for="statusnet-sendtaglinks">'.t('Send linked #-tags and @-names to StatusNet').'</label>';
|
||||
$s .= '<input id="statusnet-sendtaglinks" type="checkbox" name="statusnet-sendtaglinks" value="1" '. $linkschecked . '/>';
|
||||
$s .= '</div><div class="clear"></div>';
|
||||
|
|
@ -427,6 +448,24 @@ function statusnet_shortenmsg($b, $max_char) {
|
|||
if ($b["title"] != "")
|
||||
$body = $b["title"]."\n\n".$body;
|
||||
|
||||
if (strpos($body, "[bookmark") !== false) {
|
||||
// splitting the text in two parts:
|
||||
// before and after the bookmark
|
||||
$pos = strpos($body, "[bookmark");
|
||||
$body1 = substr($body, 0, $pos);
|
||||
$body2 = substr($body, $pos);
|
||||
|
||||
// Removing all quotes after the bookmark
|
||||
// they are mostly only the content after the bookmark.
|
||||
$body2 = preg_replace("/\[quote\=([^\]]*)\](.*?)\[\/quote\]/ism",'',$body2);
|
||||
$body2 = preg_replace("/\[quote\](.*?)\[\/quote\]/ism",'',$body2);
|
||||
$body = $body1.$body2;
|
||||
}
|
||||
|
||||
// Add some newlines so that the message could be cut better
|
||||
$body = str_replace(array("[quote", "[bookmark", "[/bookmark]", "[/quote]"),
|
||||
array("\n[quote", "\n[bookmark", "[/bookmark]\n", "[/quote]\n"), $body);
|
||||
|
||||
// remove the recycle signs and the names since they aren't helpful on twitter
|
||||
// recycle 1
|
||||
$recycle = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8');
|
||||
|
|
@ -523,6 +562,12 @@ function statusnet_post_hook(&$a,&$b) {
|
|||
if(! strstr($b['postopts'],'statusnet'))
|
||||
return;
|
||||
|
||||
// if posts comes from statusnet don't send it back
|
||||
if($b['app'] == "StatusNet")
|
||||
return;
|
||||
|
||||
logger('statusnet post invoked');
|
||||
|
||||
load_pconfig($b['uid'], 'statusnet');
|
||||
|
||||
$api = get_pconfig($b['uid'], 'statusnet', 'baseapi');
|
||||
|
|
@ -530,6 +575,11 @@ function statusnet_post_hook(&$a,&$b) {
|
|||
$csecret = get_pconfig($b['uid'], 'statusnet', 'consumersecret');
|
||||
$otoken = get_pconfig($b['uid'], 'statusnet', 'oauthtoken');
|
||||
$osecret = get_pconfig($b['uid'], 'statusnet', 'oauthsecret');
|
||||
$intelligent_shortening = get_pconfig($b['uid'], 'statusnet', 'intelligent_shortening');
|
||||
|
||||
// Global setting overrides this
|
||||
if (get_config('statusnet','intelligent_shortening'))
|
||||
$intelligent_shortening = get_config('statusnet','intelligent_shortening');
|
||||
|
||||
if($ckey && $csecret && $otoken && $osecret) {
|
||||
|
||||
|
|
@ -697,14 +747,108 @@ function statusnet_plugin_admin(&$a, &$o){
|
|||
'key' => Array("key[$id]", t("Consumer Key"), "", ""),
|
||||
);
|
||||
|
||||
|
||||
$t = get_markup_template( "admin.tpl", "addon/statusnet/" );
|
||||
$o = replace_macros($t, array(
|
||||
'$submit' => t('Submit'),
|
||||
|
||||
'$sites' => $sitesform,
|
||||
|
||||
));
|
||||
|
||||
|
||||
}
|
||||
|
||||
function statusnet_cron($a,$b) {
|
||||
$last = get_config('statusnet','last_poll');
|
||||
|
||||
$poll_interval = intval(get_config('statusnet','poll_interval'));
|
||||
if(! $poll_interval)
|
||||
$poll_interval = STATUSNET_DEFAULT_POLL_INTERVAL;
|
||||
|
||||
if($last) {
|
||||
$next = $last + ($poll_interval * 60);
|
||||
if($next > time()) {
|
||||
logger('statusnet: poll intervall not reached');
|
||||
return;
|
||||
}
|
||||
}
|
||||
logger('statusnet: cron_start');
|
||||
|
||||
$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'statusnet' AND `k` = 'mirror_posts' AND `v` = '1' ORDER BY RAND() ");
|
||||
if(count($r)) {
|
||||
foreach($r as $rr) {
|
||||
logger('statusnet: fetching for user '.$rr['uid']);
|
||||
statusnet_fetchtimeline($a, $rr['uid']);
|
||||
}
|
||||
}
|
||||
|
||||
logger('statusnet: cron_end');
|
||||
|
||||
set_config('statusnet','last_poll', time());
|
||||
}
|
||||
|
||||
function statusnet_fetchtimeline($a, $uid) {
|
||||
$ckey = get_pconfig($uid, 'statusnet', 'consumerkey');
|
||||
$csecret = get_pconfig($uid, 'statusnet', 'consumersecret');
|
||||
$api = get_pconfig($uid, 'statusnet', 'baseapi');
|
||||
$otoken = get_pconfig($uid, 'statusnet', 'oauthtoken');
|
||||
$osecret = get_pconfig($uid, 'statusnet', 'oauthsecret');
|
||||
$lastid = get_pconfig($uid, 'statusnet', 'lastid');
|
||||
|
||||
$application_name = get_config('statusnet', 'application_name');
|
||||
|
||||
if ($application_name == "")
|
||||
$application_name = $a->get_hostname();
|
||||
|
||||
$connection = new StatusNetOAuth($api, $ckey,$csecret,$otoken,$osecret);
|
||||
|
||||
$parameters = array("exclude_replies" => true, "trim_user" => true, "contributor_details" => false, "include_rts" => false);
|
||||
|
||||
if ($lastid <> "")
|
||||
$parameters["since_id"] = $lastid;
|
||||
|
||||
$items = $connection->get('statuses/user_timeline', $parameters);
|
||||
$posts = array_reverse($items);
|
||||
|
||||
foreach ($posts as $post) {
|
||||
if ($post->id > $lastid)
|
||||
$lastid = $post->id;
|
||||
|
||||
if (is_object($post->retweeted_status))
|
||||
continue;
|
||||
|
||||
if ($post->in_reply_to_status_id != "")
|
||||
continue;
|
||||
|
||||
if (!strpos($post->source, $application_name)) {
|
||||
$_SESSION["authenticated"] = true;
|
||||
$_SESSION["uid"] = $uid;
|
||||
|
||||
$_REQUEST["type"] = "wall";
|
||||
$_REQUEST["api_source"] = true;
|
||||
$_REQUEST["profile_uid"] = $uid;
|
||||
$_REQUEST["source"] = "StatusNet";
|
||||
|
||||
//$_REQUEST["date"] = $post->created_at;
|
||||
|
||||
$_REQUEST["body"] = $post->text;
|
||||
if (is_string($post->place->name))
|
||||
$_REQUEST["location"] = $post->place->name;
|
||||
|
||||
if (is_string($post->place->full_name))
|
||||
$_REQUEST["location"] = $post->place->full_name;
|
||||
|
||||
if (is_array($post->geo->coordinates))
|
||||
$_REQUEST["coord"] = $post->geo->coordinates[0]." ".$post->geo->coordinates[1];
|
||||
|
||||
if (is_array($post->coordinates->coordinates))
|
||||
$_REQUEST["coord"] = $post->coordinates->coordinates[1]." ".$post->coordinates->coordinates[0];
|
||||
|
||||
//print_r($_REQUEST);
|
||||
if ($_REQUEST["body"] != "") {
|
||||
logger('statusnet: posting for user '.$uid);
|
||||
|
||||
require_once('mod/item.php');
|
||||
item_post($a);
|
||||
}
|
||||
}
|
||||
}
|
||||
set_pconfig($uid, 'statusnet', 'lastid', $lastid);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -36,6 +36,8 @@
|
|||
* Documentation: http://diekershoff.homeunix.net/redmine/wiki/friendikaplugin/Twitter_Plugin
|
||||
*/
|
||||
|
||||
define('TWITTER_DEFAULT_POLL_INTERVAL', 5); // given in minutes
|
||||
|
||||
function twitter_install() {
|
||||
// we need some hooks, for the configuration and for sending tweets
|
||||
register_hook('connector_settings', 'addon/twitter/twitter.php', 'twitter_settings');
|
||||
|
|
@ -43,6 +45,7 @@ function twitter_install() {
|
|||
register_hook('post_local', 'addon/twitter/twitter.php', 'twitter_post_local');
|
||||
register_hook('notifier_normal', 'addon/twitter/twitter.php', 'twitter_post_hook');
|
||||
register_hook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets');
|
||||
register_hook('cron', 'addon/twitter/twitter.php', 'twitter_cron');
|
||||
logger("installed twitter");
|
||||
}
|
||||
|
||||
|
|
@ -53,6 +56,7 @@ function twitter_uninstall() {
|
|||
unregister_hook('post_local', 'addon/twitter/twitter.php', 'twitter_post_local');
|
||||
unregister_hook('notifier_normal', 'addon/twitter/twitter.php', 'twitter_post_hook');
|
||||
unregister_hook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets');
|
||||
unregister_hook('cron', 'addon/twitter/twitter.php', 'twitter_cron');
|
||||
|
||||
// old setting - remove only
|
||||
unregister_hook('post_local_end', 'addon/twitter/twitter.php', 'twitter_post_hook');
|
||||
|
|
@ -72,8 +76,6 @@ function twitter_jot_nets(&$a,&$b) {
|
|||
$b .= '<div class="profile-jot-net"><input type="checkbox" name="twitter_enable"' . $selected . ' value="1" /> '
|
||||
. t('Post to Twitter') . '</div>';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
function twitter_settings_post ($a,$post) {
|
||||
|
|
@ -94,6 +96,9 @@ function twitter_settings_post ($a,$post) {
|
|||
del_pconfig(local_user(), 'twitter', 'post');
|
||||
del_pconfig(local_user(), 'twitter', 'post_by_default');
|
||||
del_pconfig(local_user(), 'twitter', 'post_taglinks');
|
||||
del_pconfig(local_user(), 'twitter', 'lastid');
|
||||
del_pconfig(local_user(), 'twitter', 'mirror_posts');
|
||||
del_pconfig(local_user(), 'twitter', 'intelligent_shortening');
|
||||
} else {
|
||||
if (isset($_POST['twitter-pin'])) {
|
||||
// if the user supplied us with a PIN from Twitter, let the magic of OAuth happen
|
||||
|
|
@ -119,6 +124,8 @@ function twitter_settings_post ($a,$post) {
|
|||
set_pconfig(local_user(),'twitter','post',intval($_POST['twitter-enable']));
|
||||
set_pconfig(local_user(),'twitter','post_by_default',intval($_POST['twitter-default']));
|
||||
set_pconfig(local_user(),'twitter','post_taglinks',intval($_POST['twitter-sendtaglinks']));
|
||||
set_pconfig(local_user(), 'twitter', 'mirror_posts', intval($_POST['twitter-mirror']));
|
||||
set_pconfig(local_user(), 'twitter', 'intelligent_shortening', intval($_POST['twitter-shortening']));
|
||||
info( t('Twitter settings updated.') . EOL);
|
||||
}}
|
||||
}
|
||||
|
|
@ -141,6 +148,10 @@ function twitter_settings(&$a,&$s) {
|
|||
$defchecked = (($defenabled) ? ' checked="checked" ' : '');
|
||||
$linksenabled = get_pconfig(local_user(),'twitter','post_taglinks');
|
||||
$linkschecked = (($linksenabled) ? ' checked="checked" ' : '');
|
||||
$mirrorenabled = get_pconfig(local_user(),'twitter','mirror_posts');
|
||||
$mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : '');
|
||||
$shorteningenabled = get_pconfig(local_user(),'twitter','intelligent_shortening');
|
||||
$shorteningchecked = (($shorteningenabled) ? ' checked="checked" ' : '');
|
||||
|
||||
$s .= '<div class="settings-block">';
|
||||
$s .= '<h3>'. t('Twitter Posting Settings') .'</h3>';
|
||||
|
|
@ -198,6 +209,15 @@ function twitter_settings(&$a,&$s) {
|
|||
$s .= '<label id="twitter-default-label" for="twitter-default">'. t('Send public postings to Twitter by default') .'</label>';
|
||||
$s .= '<input id="twitter-default" type="checkbox" name="twitter-default" value="1" ' . $defchecked . '/>';
|
||||
$s .= '<div class="clear"></div>';
|
||||
|
||||
$s .= '<label id="twitter-mirror-label" for="twitter-mirror">'.t('Mirror all posts from twitter that are no replies or retweets').'</label>';
|
||||
$s .= '<input id="twitter-mirror" type="checkbox" name="twitter-mirror" value="1" '. $mirrorchecked . '/>';
|
||||
$s .= '<div class="clear"></div>';
|
||||
|
||||
$s .= '<label id="twitter-shortening-label" for="twitter-shortening">'.t('Shortening method that optimizes the tweet').'</label>';
|
||||
$s .= '<input id="twitter-shortening" type="checkbox" name="twitter-shortening" value="1" '. $shorteningchecked . '/>';
|
||||
$s .= '<div class="clear"></div>';
|
||||
|
||||
$s .= '<label id="twitter-sendtaglinks-label" for="twitter-sendtaglinks">'.t('Send linked #-tags and @-names to Twitter').'</label>';
|
||||
$s .= '<input id="twitter-sendtaglinks" type="checkbox" name="twitter-sendtaglinks" value="1" '. $linkschecked . '/>';
|
||||
$s .= '</div><div class="clear"></div>';
|
||||
|
|
@ -286,6 +306,24 @@ function twitter_shortenmsg($b) {
|
|||
if ($b["title"] != "")
|
||||
$body = $b["title"]."\n\n".$body;
|
||||
|
||||
if (strpos($body, "[bookmark") !== false) {
|
||||
// splitting the text in two parts:
|
||||
// before and after the bookmark
|
||||
$pos = strpos($body, "[bookmark");
|
||||
$body1 = substr($body, 0, $pos);
|
||||
$body2 = substr($body, $pos);
|
||||
|
||||
// Removing all quotes after the bookmark
|
||||
// they are mostly only the content after the bookmark.
|
||||
$body2 = preg_replace("/\[quote\=([^\]]*)\](.*?)\[\/quote\]/ism",'',$body2);
|
||||
$body2 = preg_replace("/\[quote\](.*?)\[\/quote\]/ism",'',$body2);
|
||||
$body = $body1.$body2;
|
||||
}
|
||||
|
||||
// Add some newlines so that the message could be cut better
|
||||
$body = str_replace(array("[quote", "[bookmark", "[/bookmark]", "[/quote]"),
|
||||
array("\n[quote", "\n[bookmark", "[/bookmark]\n", "[/quote]\n"), $body);
|
||||
|
||||
// remove the recycle signs and the names since they aren't helpful on twitter
|
||||
// recycle 1
|
||||
$recycle = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8');
|
||||
|
|
@ -385,6 +423,10 @@ function twitter_post_hook(&$a,&$b) {
|
|||
if($b['parent'] != $b['id'])
|
||||
return;
|
||||
|
||||
// if post comes from twitter don't send it back
|
||||
if($b['app'] == "Twitter")
|
||||
return;
|
||||
|
||||
logger('twitter post invoked');
|
||||
|
||||
|
||||
|
|
@ -394,6 +436,11 @@ function twitter_post_hook(&$a,&$b) {
|
|||
$csecret = get_config('twitter', 'consumersecret');
|
||||
$otoken = get_pconfig($b['uid'], 'twitter', 'oauthtoken');
|
||||
$osecret = get_pconfig($b['uid'], 'twitter', 'oauthsecret');
|
||||
$intelligent_shortening = get_pconfig($b['uid'], 'twitter', 'intelligent_shortening');
|
||||
|
||||
// Global setting overrides this
|
||||
if (get_config('twitter','intelligent_shortening'))
|
||||
$intelligent_shortening = get_config('twitter','intelligent_shortening');
|
||||
|
||||
if($ckey && $csecret && $otoken && $osecret) {
|
||||
logger('twitter: we have customer key and oauth stuff, going to send.', LOGGER_DEBUG);
|
||||
|
|
@ -403,9 +450,6 @@ function twitter_post_hook(&$a,&$b) {
|
|||
$tweet = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
|
||||
// in theory max char is 140 but T. uses t.co to make links
|
||||
// longer so we give them 10 characters extra
|
||||
|
||||
$intelligent_shortening = get_config('twitter','intelligent_shortening');
|
||||
|
||||
if (!$intelligent_shortening) {
|
||||
$max_char = 130; // max. length for a tweet
|
||||
// we will only work with up to two times the length of the dent
|
||||
|
|
@ -513,3 +557,94 @@ function twitter_plugin_admin(&$a, &$o){
|
|||
'$consumersecret' => array('consumersecret', t('Consumer secret'), get_config('twitter', 'consumersecret' ), '')
|
||||
));
|
||||
}
|
||||
|
||||
function twitter_cron($a,$b) {
|
||||
$last = get_config('twitter','last_poll');
|
||||
|
||||
$poll_interval = intval(get_config('twitter','poll_interval'));
|
||||
if(! $poll_interval)
|
||||
$poll_interval = TWITTER_DEFAULT_POLL_INTERVAL;
|
||||
|
||||
if($last) {
|
||||
$next = $last + ($poll_interval * 60);
|
||||
if($next > time()) {
|
||||
logger('twitter: poll intervall not reached');
|
||||
return;
|
||||
}
|
||||
}
|
||||
logger('twitter: cron_start');
|
||||
|
||||
$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'mirror_posts' AND `v` = '1' ORDER BY RAND() ");
|
||||
if(count($r)) {
|
||||
foreach($r as $rr) {
|
||||
logger('twitter: fetching for user '.$rr['uid']);
|
||||
twitter_fetchtimeline($a, $rr['uid']);
|
||||
}
|
||||
}
|
||||
|
||||
logger('twitter: cron_end');
|
||||
|
||||
set_config('twitter','last_poll', time());
|
||||
}
|
||||
|
||||
function twitter_fetchtimeline($a, $uid) {
|
||||
$ckey = get_config('twitter', 'consumerkey');
|
||||
$csecret = get_config('twitter', 'consumersecret');
|
||||
$otoken = get_pconfig($uid, 'twitter', 'oauthtoken');
|
||||
$osecret = get_pconfig($uid, 'twitter', 'oauthsecret');
|
||||
$lastid = get_pconfig($uid, 'twitter', 'lastid');
|
||||
|
||||
$application_name = get_config('twitter', 'application_name');
|
||||
|
||||
if ($application_name == "")
|
||||
$application_name = $a->get_hostname();
|
||||
|
||||
require_once('library/twitteroauth.php');
|
||||
$connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
|
||||
|
||||
$parameters = array("exclude_replies" => true, "trim_user" => true, "contributor_details" => false, "include_rts" => false);
|
||||
|
||||
if ($lastid <> "")
|
||||
$parameters["since_id"] = $lastid;
|
||||
|
||||
$items = $connection->get('statuses/user_timeline', $parameters);
|
||||
$posts = array_reverse($items);
|
||||
|
||||
foreach ($posts as $post) {
|
||||
if ($post->id_str > $lastid)
|
||||
$lastid = $post->id_str;
|
||||
|
||||
if (!strpos($post->source, $application_name)) {
|
||||
$_SESSION["authenticated"] = true;
|
||||
$_SESSION["uid"] = $uid;
|
||||
|
||||
$_REQUEST["type"] = "wall";
|
||||
$_REQUEST["api_source"] = true;
|
||||
$_REQUEST["profile_uid"] = $uid;
|
||||
$_REQUEST["source"] = "Twitter";
|
||||
|
||||
//$_REQUEST["date"] = $post->created_at;
|
||||
|
||||
$_REQUEST["body"] = $post->text;
|
||||
if (is_string($post->place->name))
|
||||
$_REQUEST["location"] = $post->place->name;
|
||||
|
||||
if (is_string($post->place->full_name))
|
||||
$_REQUEST["location"] = $post->place->full_name;
|
||||
|
||||
if (is_array($post->geo->coordinates))
|
||||
$_REQUEST["coord"] = $post->geo->coordinates[0]." ".$post->geo->coordinates[1];
|
||||
|
||||
if (is_array($post->coordinates->coordinates))
|
||||
$_REQUEST["coord"] = $post->coordinates->coordinates[1]." ".$post->coordinates->coordinates[0];
|
||||
|
||||
//print_r($_REQUEST);
|
||||
logger('twitter: posting for user '.$uid);
|
||||
|
||||
require_once('mod/item.php');
|
||||
item_post($a);
|
||||
|
||||
}
|
||||
}
|
||||
set_pconfig($uid, 'twitter', 'lastid', $lastid);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue