Merge pull request #453 from annando/forumposts

Public forum posts aren't transmitted via the connectors anymore
This commit is contained in:
Tobias Diekershoff 2017-11-26 01:03:33 +01:00 committed by GitHub
commit 7305ae1341
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 64 additions and 9 deletions

View file

@ -247,6 +247,13 @@ function buffer_send(&$a,&$b) {
if($b['parent'] != $b['id']) if($b['parent'] != $b['id'])
return; return;
// Dont't post if the post doesn't belong to us.
// This is a check for forum postings
$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
if ($b['contact-id'] != $self['id']) {
return;
}
// if post comes from buffer don't send it back // if post comes from buffer don't send it back
//if($b['app'] == "Buffer") //if($b['app'] == "Buffer")
// return; // return;

View file

@ -284,6 +284,13 @@ function diaspora_send(&$a,&$b) {
if($b['parent'] != $b['id']) if($b['parent'] != $b['id'])
return; return;
// Dont't post if the post doesn't belong to us.
// This is a check for forum postings
$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
if ($b['contact-id'] != $self['id']) {
return;
}
logger('diaspora_send: prepare posting', LOGGER_DEBUG); logger('diaspora_send: prepare posting', LOGGER_DEBUG);
$handle = PConfig::get($b['uid'],'diaspora','handle'); $handle = PConfig::get($b['uid'],'diaspora','handle');

View file

@ -155,15 +155,21 @@ function libertree_send(&$a,&$b) {
logger('libertree_send: invoked'); logger('libertree_send: invoked');
if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
return; return;
if(! strstr($b['postopts'],'libertree')) if (! strstr($b['postopts'],'libertree'))
return; return;
if($b['parent'] != $b['id']) if ($b['parent'] != $b['id'])
return; return;
// Dont't post if the post doesn't belong to us.
// This is a check for forum postings
$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
if ($b['contact-id'] != $self['id']) {
return;
}
$ltree_api_token = PConfig::get($b['uid'],'libertree','libertree_api_token'); $ltree_api_token = PConfig::get($b['uid'],'libertree','libertree_api_token');
$ltree_url = PConfig::get($b['uid'],'libertree','libertree_url'); $ltree_url = PConfig::get($b['uid'],'libertree','libertree_url');

View file

@ -415,6 +415,13 @@ function pumpio_send(&$a,&$b) {
if (!count($receiver) && ($b['private'] || !strstr($b['postopts'],'pumpio'))) if (!count($receiver) && ($b['private'] || !strstr($b['postopts'],'pumpio')))
return; return;
// Dont't post if the post doesn't belong to us.
// This is a check for forum postings
$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
if ($b['contact-id'] != $self['id']) {
return;
}
} }
if($b['verb'] == ACTIVITY_LIKE) { if($b['verb'] == ACTIVITY_LIKE) {

View file

@ -541,6 +541,13 @@ function statusnet_post_hook(&$a,&$b) {
if($b['private'] || !strstr($b['postopts'],'statusnet')) if($b['private'] || !strstr($b['postopts'],'statusnet'))
return; return;
// Dont't post if the post doesn't belong to us.
// This is a check for forum postings
$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
if ($b['contact-id'] != $self['id']) {
return;
}
} }
if (($b['verb'] == ACTIVITY_POST) && $b['deleted']) if (($b['verb'] == ACTIVITY_POST) && $b['deleted'])

View file

@ -325,6 +325,13 @@ function tumblr_send(&$a,&$b) {
if($b['parent'] != $b['id']) if($b['parent'] != $b['id'])
return; return;
// Dont't post if the post doesn't belong to us.
// This is a check for forum postings
$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
if ($b['contact-id'] != $self['id']) {
return;
}
$oauth_token = PConfig::get($b['uid'], "tumblr", "oauth_token"); $oauth_token = PConfig::get($b['uid'], "tumblr", "oauth_token");
$oauth_token_secret = PConfig::get($b['uid'], "tumblr", "oauth_token_secret"); $oauth_token_secret = PConfig::get($b['uid'], "tumblr", "oauth_token_secret");
$page = PConfig::get($b['uid'], "tumblr", "page"); $page = PConfig::get($b['uid'], "tumblr", "page");

View file

@ -171,7 +171,7 @@ function twitter_jot_nets(&$a,&$b) {
} }
} }
function twitter_settings_post ($a,$post) { function twitter_settings_post($a,$post) {
if(! local_user()) if(! local_user())
return; return;
// don't check twitter settings if twitter submit button is not clicked // don't check twitter settings if twitter submit button is not clicked
@ -412,7 +412,7 @@ function twitter_post_hook(&$a,&$b) {
return; return;
} }
if($b['parent'] != $b['id']) { if ($b['parent'] != $b['id']) {
logger("twitter_post_hook: parameter ".print_r($b, true), LOGGER_DATA); logger("twitter_post_hook: parameter ".print_r($b, true), LOGGER_DATA);
// Looking if its a reply to a twitter post // Looking if its a reply to a twitter post
@ -446,8 +446,16 @@ function twitter_post_hook(&$a,&$b) {
} else { } else {
$iscomment = false; $iscomment = false;
if($b['private'] || !strstr($b['postopts'],'twitter')) if ($b['private'] || !strstr($b['postopts'],'twitter')) {
return; return;
}
// Dont't post if the post doesn't belong to us.
// This is a check for forum postings
$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
if ($b['contact-id'] != $self['id']) {
return;
}
} }
if (($b['verb'] == ACTIVITY_POST) && $b['deleted']) if (($b['verb'] == ACTIVITY_POST) && $b['deleted'])

View file

@ -200,6 +200,12 @@ function wppost_send(&$a,&$b) {
if($b['parent'] != $b['id']) if($b['parent'] != $b['id'])
return; return;
// Dont't post if the post doesn't belong to us.
// This is a check for forum postings
$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
if ($b['contact-id'] != $self['id']) {
return;
}
$wp_username = xmlify(PConfig::get($b['uid'],'wppost','wp_username')); $wp_username = xmlify(PConfig::get($b['uid'],'wppost','wp_username'));
$wp_password = xmlify(PConfig::get($b['uid'],'wppost','wp_password')); $wp_password = xmlify(PConfig::get($b['uid'],'wppost','wp_password'));