diff options
| author | Zach Prezkuta <fermion@gmx.com> | 2012-05-31 19:40:12 -0600 |
|---|---|---|
| committer | Zach Prezkuta <fermion@gmx.com> | 2012-06-03 14:53:29 -0600 |
| commit | c0af6dbb1a5507dcf0fffaf13b42cfd71b0d0c50 (patch) | |
| tree | 0ed31d5a6de8c1f4abaaa509aa119a4704c955c4 /include/notifier.php | |
| parent | 1fe1ac022f0755d73c62bac86f1b54fdbd6b50f5 (diff) | |
| download | volse-hubzilla-c0af6dbb1a5507dcf0fffaf13b42cfd71b0d0c50.tar.gz volse-hubzilla-c0af6dbb1a5507dcf0fffaf13b42cfd71b0d0c50.tar.bz2 volse-hubzilla-c0af6dbb1a5507dcf0fffaf13b42cfd71b0d0c50.zip | |
Implement relaying of relayable_retractions
Also: some whitespace cleanup, fix Diaspora parent DB query
Diffstat (limited to 'include/notifier.php')
| -rw-r--r-- | include/notifier.php | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/include/notifier.php b/include/notifier.php index 47ad29310..68f230a05 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -597,7 +597,7 @@ function notifier_run($argv, $argc){ break; case NETWORK_OSTATUS: - // Do not send to otatus if we are not configured to send to public networks + // Do not send to ostatus if we are not configured to send to public networks if($owner['prvnets']) break; if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only')) @@ -738,8 +738,8 @@ function notifier_run($argv, $argc){ // unsupported break; } - elseif(($target_item['deleted']) && ($target_item['verb'] !== ACTIVITY_LIKE)) { - // diaspora delete, + elseif(($target_item['deleted']) && ($top_level || $followup) && ($target_item['verb'] !== ACTIVITY_LIKE)) { + // diaspora delete, including relayable_retractions that need to be relayed diaspora_send_retraction($target_item,$owner,$contact); break; } @@ -749,7 +749,7 @@ function notifier_run($argv, $argc){ break; } elseif($target_item['parent'] != $target_item['id']) { - // we are the relay - send comments, likes and unlikes to our conversants + // we are the relay - send comments, likes, unlikes and relayable_retractions to our conversants diaspora_send_relay($target_item,$owner,$contact); break; } @@ -859,6 +859,13 @@ function notifier_run($argv, $argc){ } + // If the item was deleted, clean up the `sign` table + if($target_item['deleted']) { + $r = q("DELETE FROM sign where `retract_iid` = %d", + intval($target_item['id']) + ); + } + logger('notifier: calling hooks', LOGGER_DEBUG); if($normal_mode) |