nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3654 from annando/externalpubsubhubbub

Browse source 
Removed external pubsubhubbub URL
This commit is contained in:
Tobias Diekershoff 2017-08-25 09:47:58 +02:00 committed by GitHub
parent 460dd3c2e3 5c53544118
commit 959d6ae15e
5 changed files with 8 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
htconfig.php
View file

@ -60,10 +60,6 @@ $a->config['system']['maximagesize'] = 800000;
$a->config['php_path'] = 'php'; $a->config['php_path'] = 'php';
// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
$a->config['system']['huburl'] = '[internal]';
// Server-to-server private message encryption (RINO) is allowed by default. // Server-to-server private message encryption (RINO) is allowed by default.
// Encryption will only be provided if this setting is set to a non zero value // Encryption will only be provided if this setting is set to a non zero value
// set to 0 to disable, 2 to enable, 1 is deprecated // set to 0 to disable, 2 to enable, 1 is deprecated

35
include/notifier.php
View file

@ -205,8 +205,6 @@ function notifier_run(&$argv, &$argc){
$walltowall = ((($top_level) && ($owner['id'] != $items[0]['contact-id'])) ? true : false); $walltowall = ((($top_level) && ($owner['id'] != $items[0]['contact-id'])) ? true : false);
$hub = get_config('system','huburl');
// Should the post be transmitted to Diaspora? // Should the post be transmitted to Diaspora?
$diaspora_delivery = true; $diaspora_delivery = true;
@ -563,34 +561,13 @@ function notifier_run(&$argv, &$argc){
} }
// Notify PuSH subscribers (Used for OStatus distribution of regular posts) // Notify PuSH subscribers (Used for OStatus distribution of regular posts)
if ($push_notify && strlen($hub)) { if ($push_notify) {
$hubs = explode(',', $hub); // Set push flag for PuSH subscribers to this topic,
if (count($hubs)) { // they will be notified in queue.php
foreach ($hubs as $h) { q("UPDATE `push_subscriber` SET `push` = 1 ".
$h = trim($h); "WHERE `nickname` = '%s' AND `push` = 0", dbesc($owner['nickname']));
if (! strlen($h)) {
continue;
}
if ($h === '[internal]') { logger('Activating internal PuSH for item '.$item_id, LOGGER_DEBUG);
// Set push flag for PuSH subscribers to this topic,
// they will be notified in queue.php
q("UPDATE `push_subscriber` SET `push` = 1 ".
"WHERE `nickname` = '%s' AND `push` = 0", dbesc($owner['nickname']));
logger('Activating internal PuSH for item '.$item_id, LOGGER_DEBUG);
} else {
$params = 'hub.mode=publish&hub.url=' . urlencode( App::get_baseurl() . '/dfrn_poll/' . $owner['nickname'] );
post_url($h,$params);
logger('publish for item '.$item_id.' ' . $h . ' ' . $params . ' returned ' . $a->get_curl_code());
}
if (count($hubs) > 1) {
sleep(7); // try and avoid multiple hubs responding at precisely the same time
}
}
}
// Handling the pubsubhubbub requests // Handling the pubsubhubbub requests
proc_run(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true), proc_run(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true),

19
include/ostatus.php
View file

@ -1495,23 +1495,8 @@ class ostatus {
* @param object $root XML root element where the hub links are added * @param object $root XML root element where the hub links are added
*/ */
public static function hublinks($doc, $root, $nick) { public static function hublinks($doc, $root, $nick) {
$hub = get_config('system','huburl'); $h = App::get_baseurl() . '/pubsubhubbub/'.$nick;
xml::add_element($doc, $root, "link", "", array("href" => $h, "rel" => "hub"));
$hubxml = '';
if (strlen($hub)) {
$hubs = explode(',', $hub);
if (count($hubs)) {
foreach ($hubs as $h) {
$h = trim($h);
if (! strlen($h))
continue;
if ($h === '[internal]') {
$h = App::get_baseurl() . '/pubsubhubbub/'.$nick;
}
xml::add_element($doc, $root, "link", "", array("href" => $h, "rel" => "hub"));
}
}
}
} }
/** /**

3
util/htconfig.vagrant.php
View file

@ -47,9 +47,6 @@ $a->config['system']['maximagesize'] = 800000;
$a->config['php_path'] = '/usr/bin/php'; $a->config['php_path'] = '/usr/bin/php';
// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
$a->config['system']['huburl'] = '[internal]';
// Server-to-server private message encryption (RINO) is allowed by default. // Server-to-server private message encryption (RINO) is allowed by default.
// Encryption will only be provided if this setting is true and the // Encryption will only be provided if this setting is true and the

4
view/templates/htconfig.tpl
View file

@ -77,10 +77,6 @@ $a->config['max_import_size'] = 200000;
$a->config['system']['maximagesize'] = 800000; $a->config['system']['maximagesize'] = 800000;
// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
$a->config['system']['huburl'] = '[internal]';
// Server-to-server private message encryption (RINO) is allowed by default. // Server-to-server private message encryption (RINO) is allowed by default.
// Encryption will only be provided if this setting is set to a non zero value // Encryption will only be provided if this setting is set to a non zero value
// set to 0 to disable, 2 to enable, 1 is deprecated // set to 0 to disable, 2 to enable, 1 is deprecated