forked from friendica/friendica-addons
Mirroring: There was a problem that the title variable wasn't cleared so it could be fetched from a previous post.
Statusnet: The activity messages are now suppressed
This commit is contained in:
parent
e7f5f0cf20
commit
804bc7a067
|
@ -1052,11 +1052,14 @@ function fbpost_fetchwall($a, $uid) {
|
||||||
$_SESSION["authenticated"] = true;
|
$_SESSION["authenticated"] = true;
|
||||||
$_SESSION["uid"] = $uid;
|
$_SESSION["uid"] = $uid;
|
||||||
|
|
||||||
|
unset($_REQUEST);
|
||||||
$_REQUEST["type"] = "wall";
|
$_REQUEST["type"] = "wall";
|
||||||
$_REQUEST["api_source"] = true;
|
$_REQUEST["api_source"] = true;
|
||||||
$_REQUEST["profile_uid"] = $uid;
|
$_REQUEST["profile_uid"] = $uid;
|
||||||
$_REQUEST["source"] = "Facebook";
|
$_REQUEST["source"] = "Facebook";
|
||||||
|
|
||||||
|
$_REQUEST["title"] = "";
|
||||||
|
|
||||||
$_REQUEST["body"] = (isset($item->message) ? escape_tags($item->message) : '');
|
$_REQUEST["body"] = (isset($item->message) ? escape_tags($item->message) : '');
|
||||||
|
|
||||||
if(isset($item->name) and isset($item->link))
|
if(isset($item->name) and isset($item->link))
|
||||||
|
|
|
@ -109,6 +109,7 @@ function fromgplus_post($a, $uid, $source, $body, $location) {
|
||||||
$_SESSION['authenticated'] = true;
|
$_SESSION['authenticated'] = true;
|
||||||
$_SESSION['uid'] = $uid;
|
$_SESSION['uid'] = $uid;
|
||||||
|
|
||||||
|
unset($_REQUEST);
|
||||||
$_REQUEST['type'] = 'wall';
|
$_REQUEST['type'] = 'wall';
|
||||||
$_REQUEST['api_source'] = true;
|
$_REQUEST['api_source'] = true;
|
||||||
|
|
||||||
|
|
|
@ -46,6 +46,8 @@ function public_server_register_account($a,$b) {
|
||||||
|
|
||||||
|
|
||||||
function public_server_cron($a,$b) {
|
function public_server_cron($a,$b) {
|
||||||
|
logger("public_server: cron start");
|
||||||
|
|
||||||
require_once('include/enotify.php');
|
require_once('include/enotify.php');
|
||||||
$r = q("select * from user where account_expires_on < UTC_TIMESTAMP() + INTERVAL 5 DAY and account_expires_on > '0000-00-00 00:00:00' and
|
$r = q("select * from user where account_expires_on < UTC_TIMESTAMP() + INTERVAL 5 DAY and account_expires_on > '0000-00-00 00:00:00' and
|
||||||
expire_notification_sent = '0000-00-00 00:00:00' ");
|
expire_notification_sent = '0000-00-00 00:00:00' ");
|
||||||
|
@ -116,6 +118,7 @@ function public_server_cron($a,$b) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
logger("public_server: cron end");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -385,14 +385,16 @@ function pumpio_send(&$a,&$b) {
|
||||||
$client->client_id = $consumer_key;
|
$client->client_id = $consumer_key;
|
||||||
$client->client_secret = $consumer_secret;
|
$client->client_secret = $consumer_secret;
|
||||||
|
|
||||||
|
$username = $user.'@'.$host;
|
||||||
|
|
||||||
$success = $client->CallAPI(
|
$success = $client->CallAPI(
|
||||||
'https://'.$host.'/api/user/'.$user.'/feed',
|
'https://'.$host.'/api/user/'.$user.'/feed',
|
||||||
'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
|
'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
|
||||||
|
|
||||||
if($success)
|
if($success)
|
||||||
logger('pumpio_send: success');
|
logger('pumpio_send '.$username.': success');
|
||||||
else
|
else
|
||||||
logger('pumpio_send: general error: ' . print_r($user,true));
|
logger('pumpio_send '.$username.': general error: ' . print_r($user,true));
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -456,10 +458,12 @@ function pumpio_fetchtimeline($a, $uid) {
|
||||||
|
|
||||||
logger('pumpio: fetching for user '.$uid.' '.$url.' C:'.$client->client_id.' CS:'.$client->client_secret.' T:'.$client->access_token.' TS:'.$client->access_token_secret);
|
logger('pumpio: fetching for user '.$uid.' '.$url.' C:'.$client->client_id.' CS:'.$client->client_secret.' T:'.$client->access_token.' TS:'.$client->access_token_secret);
|
||||||
|
|
||||||
|
$username = $user.'@'.$host;
|
||||||
|
|
||||||
$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
|
$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
|
||||||
|
|
||||||
if (!$success) {
|
if (!$success) {
|
||||||
logger('pumpio: error fetching posts for user '.$uid." ".print_r($user, true));
|
logger('pumpio: error fetching posts for user '.$uid." ".$username." ".print_r($user, true));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -498,6 +502,7 @@ function pumpio_fetchtimeline($a, $uid) {
|
||||||
$_SESSION["authenticated"] = true;
|
$_SESSION["authenticated"] = true;
|
||||||
$_SESSION["uid"] = $uid;
|
$_SESSION["uid"] = $uid;
|
||||||
|
|
||||||
|
unset($_REQUEST);
|
||||||
$_REQUEST["type"] = "wall";
|
$_REQUEST["type"] = "wall";
|
||||||
$_REQUEST["api_source"] = true;
|
$_REQUEST["api_source"] = true;
|
||||||
$_REQUEST["profile_uid"] = $uid;
|
$_REQUEST["profile_uid"] = $uid;
|
||||||
|
@ -505,6 +510,8 @@ function pumpio_fetchtimeline($a, $uid) {
|
||||||
|
|
||||||
if ($post->object->displayName != "")
|
if ($post->object->displayName != "")
|
||||||
$_REQUEST["title"] = html2bbcode($post->object->displayName);
|
$_REQUEST["title"] = html2bbcode($post->object->displayName);
|
||||||
|
else
|
||||||
|
$_REQUEST["title"] = "";
|
||||||
|
|
||||||
$_REQUEST["body"] = html2bbcode($post->object->content);
|
$_REQUEST["body"] = html2bbcode($post->object->content);
|
||||||
|
|
||||||
|
|
|
@ -855,6 +855,9 @@ function statusnet_fetchtimeline($a, $uid) {
|
||||||
if ($first_time)
|
if ($first_time)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
if ($post->source == "activity")
|
||||||
|
continue;
|
||||||
|
|
||||||
if (is_object($post->retweeted_status))
|
if (is_object($post->retweeted_status))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
@ -865,6 +868,7 @@ function statusnet_fetchtimeline($a, $uid) {
|
||||||
$_SESSION["authenticated"] = true;
|
$_SESSION["authenticated"] = true;
|
||||||
$_SESSION["uid"] = $uid;
|
$_SESSION["uid"] = $uid;
|
||||||
|
|
||||||
|
unset($_REQUEST);
|
||||||
$_REQUEST["type"] = "wall";
|
$_REQUEST["type"] = "wall";
|
||||||
$_REQUEST["api_source"] = true;
|
$_REQUEST["api_source"] = true;
|
||||||
$_REQUEST["profile_uid"] = $uid;
|
$_REQUEST["profile_uid"] = $uid;
|
||||||
|
@ -872,6 +876,8 @@ function statusnet_fetchtimeline($a, $uid) {
|
||||||
|
|
||||||
//$_REQUEST["date"] = $post->created_at;
|
//$_REQUEST["date"] = $post->created_at;
|
||||||
|
|
||||||
|
$_REQUEST["title"] = "";
|
||||||
|
|
||||||
$_REQUEST["body"] = $post->text;
|
$_REQUEST["body"] = $post->text;
|
||||||
if (is_string($post->place->name))
|
if (is_string($post->place->name))
|
||||||
$_REQUEST["location"] = $post->place->name;
|
$_REQUEST["location"] = $post->place->name;
|
||||||
|
|
|
@ -678,6 +678,7 @@ function twitter_fetchtimeline($a, $uid) {
|
||||||
$_SESSION["authenticated"] = true;
|
$_SESSION["authenticated"] = true;
|
||||||
$_SESSION["uid"] = $uid;
|
$_SESSION["uid"] = $uid;
|
||||||
|
|
||||||
|
unset($_REQUEST);
|
||||||
$_REQUEST["type"] = "wall";
|
$_REQUEST["type"] = "wall";
|
||||||
$_REQUEST["api_source"] = true;
|
$_REQUEST["api_source"] = true;
|
||||||
$_REQUEST["profile_uid"] = $uid;
|
$_REQUEST["profile_uid"] = $uid;
|
||||||
|
@ -685,6 +686,8 @@ function twitter_fetchtimeline($a, $uid) {
|
||||||
|
|
||||||
//$_REQUEST["date"] = $post->created_at;
|
//$_REQUEST["date"] = $post->created_at;
|
||||||
|
|
||||||
|
$_REQUEST["title"] = "";
|
||||||
|
|
||||||
$_REQUEST["body"] = $post->text;
|
$_REQUEST["body"] = $post->text;
|
||||||
if (is_string($post->place->name))
|
if (is_string($post->place->name))
|
||||||
$_REQUEST["location"] = $post->place->name;
|
$_REQUEST["location"] = $post->place->name;
|
||||||
|
|
Loading…
Reference in a new issue