diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-06-03 18:03:20 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-06-03 18:03:20 -0400 |
| commit | 8d4c77fc43e4d37e807248f13afb5b2913b6cfc4 (patch) | |
| tree | 688f64270521b0c47eaacae020e2ba92274fddeb /include/delivery.php | |
| parent | 598a2563e844477de2f688663c7c46962b26b602 (diff) | |
| parent | 9f4b89726176f9596cf3330a68cfab8cab5ab361 (diff) | |
| download | volse-hubzilla-8d4c77fc43e4d37e807248f13afb5b2913b6cfc4.tar.gz volse-hubzilla-8d4c77fc43e4d37e807248f13afb5b2913b6cfc4.tar.bz2 volse-hubzilla-8d4c77fc43e4d37e807248f13afb5b2913b6cfc4.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
rev update
database updates
Debugged implementation of Diaspora relayable_retractions
cleanup and logging
first shot at getting like/unlike functions to work consistently
Fix bugs in the retraction code
prepare to implement database update
Implement relaying of relayable_retractions
Support relayable_retractions that are relayed to us by the top-level post owner
quattro: admin panel styling and 1st buttons for addon/theme overview
privacy settings: make submit button translateable
DE: update to the strings
prv messages: make submit translateable
* master:
Diffstat (limited to 'include/delivery.php')
| -rw-r--r-- | include/delivery.php | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/include/delivery.php b/include/delivery.php index 32943d5da..e6cfc8155 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -113,6 +113,7 @@ function delivery_run($argv, $argc){ $uid = $r[0]['uid']; $updated = $r[0]['edited']; + // The following seems superfluous. We've already checked for "if (! intval($r[0]['parent']))" a few lines up if(! $parent_id) continue; @@ -508,17 +509,17 @@ function delivery_run($argv, $argc){ // unsupported break; } - elseif(($target_item['deleted']) && ($target_item['verb'] !== ACTIVITY_LIKE)) { - logger('delivery: diaspora retract: ' . $loc); - // diaspora delete, + elseif(($target_item['deleted']) && ($target_item['uri'] === $target_item['parent-uri'])) { + // top-level retraction + logger('delivery: diaspora retract: ' . $loc); + diaspora_send_retraction($target_item,$owner,$contact,$public_message); break; } - elseif($target_item['parent'] != $target_item['id']) { - - logger('delivery: diaspora relay: ' . $loc); + elseif($target_item['uri'] !== $target_item['parent-uri']) { + // we are the relay - send comments, likes and relayable_retractions to our conversants + logger('delivery: diaspora relay: ' . $loc); - // we are the relay - send comments, likes and unlikes to our conversants diaspora_send_relay($target_item,$owner,$contact,$public_message); break; } |