friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Some changes to let pumpio react similar to facebook.

This commit is contained in:
Michael Vogel 2013-09-04 00:01:00 +02:00
parent 34e7206ba4
commit 9a1a666f24
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/bbcode.php
View File

@ -36,7 +36,8 @@ function stripcode_br_cb($s) {
function tryoembed($match){ function tryoembed($match){
$url = ((count($match)==2)?$match[1]:$match[2]); $url = ((count($match)==2)?$match[1]:$match[2]);
// logger("tryoembed: $url");
//logger("tryoembed: $url");
$o = oembed_fetch_url($url); $o = oembed_fetch_url($url);

5
include/delivery.php
View File

@ -542,7 +542,7 @@ function delivery_run(&$argv, &$argc){
diaspora_send_relay($target_item,$owner,$contact,$public_message); diaspora_send_relay($target_item,$owner,$contact,$public_message);
break; break;
} }
elseif(($top_level) && (! $walltowall)) { elseif(($top_level) && (! $walltowall)) {
// currently no workable solution for sending walltowall // currently no workable solution for sending walltowall
logger('delivery: diaspora status: ' . $loc); logger('delivery: diaspora status: ' . $loc);
@ -558,6 +558,9 @@ function delivery_run(&$argv, &$argc){
case NETWORK_FACEBOOK : case NETWORK_FACEBOOK :
if(get_config('system','dfrn_only')) if(get_config('system','dfrn_only'))
break; break;
case NETWORK_PUMPIO :
if(get_config('system','dfrn_only'))
break;
default: default:
break; break;
} }

5
include/notifier.php
View File

@ -881,12 +881,15 @@ function notifier_run(&$argv, &$argc){
case NETWORK_FACEBOOK: case NETWORK_FACEBOOK:
if(get_config('system','dfrn_only')) if(get_config('system','dfrn_only'))
break; break;
case NETWORK_PUMPIO:
if(get_config('system','dfrn_only'))
break;
default: default:
break; break;
} }
} }
} }
// send additional slaps to mentioned remote tags (@foo@example.com) // send additional slaps to mentioned remote tags (@foo@example.com)
if($slap && count($url_recipients) && ($followup || $top_level) && $public_message && (! $expire)) { if($slap && count($url_recipients) && ($followup || $top_level) && $public_message && (! $expire)) {

8
include/onepoll.php
View File

@ -76,7 +76,7 @@ function onepoll_run(&$argv, &$argc){
$contacts = q("SELECT `contact`.* FROM `contact` $contacts = q("SELECT `contact`.* FROM `contact`
WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != '' WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
AND NOT `network` IN ( '%s', '%s' ) AND NOT `network` IN ( '%s', '%s', '%s' )
AND `contact`.`id` = %d AND `contact`.`id` = %d
AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0 AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0
AND `contact`.`archive` = 0 LIMIT 1", AND `contact`.`archive` = 0 LIMIT 1",
@ -84,6 +84,7 @@ function onepoll_run(&$argv, &$argc){
intval(CONTACT_IS_FRIEND), intval(CONTACT_IS_FRIEND),
dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DIASPORA),
dbesc(NETWORK_FACEBOOK), dbesc(NETWORK_FACEBOOK),
dbesc(NETWORK_PUMPIO),
intval($contact_id) intval($contact_id)
); );
@ -526,6 +527,9 @@ function onepoll_run(&$argv, &$argc){
elseif($contact['network'] === NETWORK_FACEBOOK) { elseif($contact['network'] === NETWORK_FACEBOOK) {
// This is picked up by the Facebook plugin on a cron hook. // This is picked up by the Facebook plugin on a cron hook.
// Ignored here. // Ignored here.
} elseif($contact['network'] === NETWORK_PUMPIO) {
// This is picked up by the pump.io plugin on a cron hook.
// Ignored here.
} }
if($xml) { if($xml) {
@ -544,7 +548,7 @@ function onepoll_run(&$argv, &$argc){
// do it twice. Ensures that children of parents which may be later in the stream aren't tossed // do it twice. Ensures that children of parents which may be later in the stream aren't tossed
consume_feed($xml,$importer,$contact,$hub,1,2); consume_feed($xml,$importer,$contact,$hub,1,2);
$hubmode = 'subscribe'; $hubmode = 'subscribe';

5
include/poller.php
View File

@ -173,7 +173,7 @@ function poller_run(&$argv, &$argc){
$contacts = q("SELECT `contact`.`id` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` $contacts = q("SELECT `contact`.`id` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid`
WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != '' WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
AND NOT `network` IN ( '%s', '%s' ) AND NOT `network` IN ( '%s', '%s', '%s' )
$sql_extra $sql_extra
AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0 AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0
AND `contact`.`archive` = 0 AND `contact`.`archive` = 0
@ -181,7 +181,8 @@ function poller_run(&$argv, &$argc){
intval(CONTACT_IS_SHARING), intval(CONTACT_IS_SHARING),
intval(CONTACT_IS_FRIEND), intval(CONTACT_IS_FRIEND),
dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DIASPORA),
dbesc(NETWORK_FACEBOOK) dbesc(NETWORK_FACEBOOK),
dbesc(NETWORK_PUMPIO)
); );
if(! count($contacts)) { if(! count($contacts)) {