keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

The repair option is added to the settings

Browse source
This commit is contained in:
Michael Vogel 2015-09-05 04:54:48 +02:00
parent 635e92249a
commit 3cccb5ecb1
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/notifier.php
View file

@ -295,7 +295,7 @@ function notifier_run(&$argv, &$argc){
$relay_to_owner = false; $relay_to_owner = false;
if($relay_to_owner) { if($relay_to_owner) {
logger('notifier: followup', LOGGER_DEBUG); logger('notifier: followup '.$target_item["guid"], LOGGER_DEBUG);
// local followup to remote post // local followup to remote post
$followup = true; $followup = true;
$public_message = false; // not public $public_message = false; // not public
@ -331,6 +331,8 @@ function notifier_run(&$argv, &$argc){
} else { } else {
$followup = false; $followup = false;
logger('Distributing directly '.$target_item["guid"], LOGGER_DEBUG);
// don't send deletions onward for other people's stuff // don't send deletions onward for other people's stuff
if($target_item['deleted'] && (! intval($target_item['wall']))) { if($target_item['deleted'] && (! intval($target_item['wall']))) {
@ -378,7 +380,7 @@ function notifier_run(&$argv, &$argc){
} }
if (count($url_recipients)) if (count($url_recipients))
logger('notifier: url_recipients ' . print_r($url_recipients,true)); logger('notifier: '.$target_item["guid"].' url_recipients ' . print_r($url_recipients,true));
$conversants = array_unique($conversants); $conversants = array_unique($conversants);
@ -394,6 +396,8 @@ function notifier_run(&$argv, &$argc){
// We have not only to look at the parent, since it could be a Friendica thread. // We have not only to look at the parent, since it could be a Friendica thread.
if (($thr_parent AND ($thr_parent[0]['network'] == NETWORK_OSTATUS)) OR ($parent['network'] == NETWORK_OSTATUS)) { if (($thr_parent AND ($thr_parent[0]['network'] == NETWORK_OSTATUS)) OR ($parent['network'] == NETWORK_OSTATUS)) {
logger('Some parent is OStatus for '.$target_item["guid"], LOGGER_DEBUG);
// Send a salmon notification to every person we mentioned in the post // Send a salmon notification to every person we mentioned in the post
$arr = explode(',',$target_item['tag']); $arr = explode(',',$target_item['tag']);
foreach($arr as $x) { foreach($arr as $x) {
@ -650,7 +654,7 @@ function notifier_run(&$argv, &$argc){
if($contact['self']) if($contact['self'])
continue; continue;
logger("Deliver to ".$contact['url'], LOGGER_DEBUG); logger("Deliver ".$target_item["guid"]." to ".$contact['url'], LOGGER_DEBUG);
// potentially more than one recipient. Start a new process and space them out a bit. // potentially more than one recipient. Start a new process and space them out a bit.
// we will deliver single recipient types of message and email recipients here. // we will deliver single recipient types of message and email recipients here.

2
mod/settings.php
View file

@ -770,6 +770,8 @@ function settings_content(&$a) {
$settings_connectors .= '<span class="field_help">'.t('If you receive a message from an unknown OStatus user, this option decides what to do. If it is checked, a new contact will be created for every unknown user.').'</span>'; $settings_connectors .= '<span class="field_help">'.t('If you receive a message from an unknown OStatus user, this option decides what to do. If it is checked, a new contact will be created for every unknown user.').'</span>';
$settings_connectors .= '</div>'; $settings_connectors .= '</div>';
$settings_connectors .= '<p><a href="'.$a->get_baseurl().'/repair_ostatus">'.t("Repair OStatus subscriptions").'</a></p>';
/* /*
// Deactivated by now - it doesn't seem to work reliable // Deactivated by now - it doesn't seem to work reliable
$legacy_contact = get_pconfig(local_user(), 'system', 'ostatus_legacy_contact'); $legacy_contact = get_pconfig(local_user(), 'system', 'ostatus_legacy_contact');