aboutsummaryrefslogtreecommitdiffstats
path: root/include/notifier.php
diff options
context:
space:
mode:
authorZach Prezkuta <fermion@gmx.com>2012-06-02 16:11:31 -0600
committerZach Prezkuta <fermion@gmx.com>2012-06-03 14:53:30 -0600
commit77962aa79df5671e206635cc6980e4b1ac969bf9 (patch)
treed3d5fe2a3db5a201a0f5f1d083053f6810f54be1 /include/notifier.php
parentb000088ded0d0f677114da0af1c5ea6436a97560 (diff)
downloadvolse-hubzilla-77962aa79df5671e206635cc6980e4b1ac969bf9.tar.gz
volse-hubzilla-77962aa79df5671e206635cc6980e4b1ac969bf9.tar.bz2
volse-hubzilla-77962aa79df5671e206635cc6980e4b1ac969bf9.zip
Fix bugs in the retraction code
Currently, the following seems to be the functional status: For a Diaspora top-level post: Friendica comments show up AND delete Diaspora comments show up AND delete for top-level owner Diaspora comments show up for non-owner Diaspora comments sometimes don't delete for non-owner -> Appears to be Diaspora's fault, as a "not a valid object" error shows up in the log Friendica likes show up, but can't unlike (Friendica doesn't even message Diaspora) Diaspora likes show up Diaspora non-owner can't unlike -> Same as comments, seems to be Diaspora's fault For a Friendica top-level post: Friendica comments show up AND delete Diaspora comments show up AND delete Friendica likes don't show up in Diaspora sometimes Friendica doesn't even message Diaspora for unlikes (sometimes?) Diaspora likes and unlikes work
Diffstat (limited to 'include/notifier.php')
-rw-r--r--include/notifier.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/notifier.php b/include/notifier.php
index 68f230a05..be50366d5 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -738,7 +738,7 @@ function notifier_run($argv, $argc){
// unsupported
break;
}
- elseif(($target_item['deleted']) && ($top_level || $followup) && ($target_item['verb'] !== ACTIVITY_LIKE)) {
+ elseif(($target_item['deleted']) && (($target_item['uri'] === $target_item['parent-uri']) || $followup) && ($target_item['verb'] !== ACTIVITY_LIKE)) {
// diaspora delete, including relayable_retractions that need to be relayed
diaspora_send_retraction($target_item,$owner,$contact);
break;
@@ -748,7 +748,7 @@ function notifier_run($argv, $argc){
diaspora_send_followup($target_item,$owner,$contact);
break;
}
- elseif($target_item['parent'] != $target_item['id']) {
+ elseif($target_item['uri'] !== $target_item['parent-uri']) {
// we are the relay - send comments, likes, unlikes and relayable_retractions to our conversants
diaspora_send_relay($target_item,$owner,$contact);
break;