clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases 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

1
include/bbcode.php
View File

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

3
include/delivery.php
View File

@ -558,6 +558,9 @@ function delivery_run(&$argv, &$argc){
case NETWORK_FACEBOOK :
if(get_config('system','dfrn_only'))
break;
case NETWORK_PUMPIO :
if(get_config('system','dfrn_only'))
break;
default:
break;
}

3
include/notifier.php
View File

@ -881,6 +881,9 @@ function notifier_run(&$argv, &$argc){
case NETWORK_FACEBOOK:
if(get_config('system','dfrn_only'))
break;
case NETWORK_PUMPIO:
if(get_config('system','dfrn_only'))
break;
default:
break;
}

6
include/onepoll.php
View File

@ -76,7 +76,7 @@ function onepoll_run(&$argv, &$argc){
$contacts = q("SELECT `contact`.* FROM `contact`
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 `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0
AND `contact`.`archive` = 0 LIMIT 1",
@ -84,6 +84,7 @@ function onepoll_run(&$argv, &$argc){
intval(CONTACT_IS_FRIEND),
dbesc(NETWORK_DIASPORA),
dbesc(NETWORK_FACEBOOK),
dbesc(NETWORK_PUMPIO),
intval($contact_id)
);
@ -526,6 +527,9 @@ function onepoll_run(&$argv, &$argc){
elseif($contact['network'] === NETWORK_FACEBOOK) {
// This is picked up by the Facebook plugin on a cron hook.
// Ignored here.
} elseif($contact['network'] === NETWORK_PUMPIO) {
// This is picked up by the pump.io plugin on a cron hook.
// Ignored here.
}
if($xml) {

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`
WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
AND NOT `network` IN ( '%s', '%s' )
AND NOT `network` IN ( '%s', '%s', '%s' )
$sql_extra
AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0
AND `contact`.`archive` = 0
@ -181,7 +181,8 @@ function poller_run(&$argv, &$argc){
intval(CONTACT_IS_SHARING),
intval(CONTACT_IS_FRIEND),
dbesc(NETWORK_DIASPORA),
dbesc(NETWORK_FACEBOOK)
dbesc(NETWORK_FACEBOOK),
dbesc(NETWORK_PUMPIO)
);
if(! count($contacts)) {