aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-10-31 06:24:14 -0700
committerfriendica <info@friendica.com>2014-10-31 06:24:14 -0700
commit1cb45c30e9032794b7827738cc28f7728ac28677 (patch)
tree869aeeb75d3142cd253059aa6a74afd768c3265f
parent7f0bd5a6e5f8963ebf0c48f7919b5b7dc420390c (diff)
downloadvolse-hubzilla-1cb45c30e9032794b7827738cc28f7728ac28677.tar.gz
volse-hubzilla-1cb45c30e9032794b7827738cc28f7728ac28677.tar.bz2
volse-hubzilla-1cb45c30e9032794b7827738cc28f7728ac28677.zip
document request packets a bit more
-rw-r--r--include/zot.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/zot.php b/include/zot.php
index 0cbef1ad3..c9a17562e 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1444,8 +1444,11 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false,$reque
if(! $r) {
$result[] = array($d['hash'],'comment parent not found',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']);
- // we don't seem to have a copy of this conversation or at least the parent - request a copy of the entire conversation to date.
+ // We don't seem to have a copy of this conversation or at least the parent - so request a copy of the entire conversation to date.
// Don't do this if it's a relay post as we're the ones who are supposed to have the copy and we don't want the request to loop.
+ // Also don't do this if this comment came from a conversation request packet. It's possible that comments are allowed but posting
+ // isn't and that could cause a conversation fetch loop. We can detect these packets since they are delivered via a 'notify' packet type
+ // that has a message_id element in the initial zot packet (just like the corresponding 'request' packet type which makes the request).
if((! $relay) && (! $request))
proc_run('php', 'include/notifier.php', 'request', $channel['channel_id'], $sender['hash'], $arr['parent_mid']);