diff options
| author | friendica <info@friendica.com> | 2014-04-10 16:14:19 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-04-10 16:14:19 -0700 |
| commit | bf1f18e172808b0bbeb70180cd0eff305627645a (patch) | |
| tree | eccf6790ea1485038b7d3784a1b76d3adbe130f1 | |
| parent | c97222c2fcac5eef8d0a95db5156b99219e56d42 (diff) | |
| download | volse-hubzilla-bf1f18e172808b0bbeb70180cd0eff305627645a.tar.gz volse-hubzilla-bf1f18e172808b0bbeb70180cd0eff305627645a.tar.bz2 volse-hubzilla-bf1f18e172808b0bbeb70180cd0eff305627645a.zip | |
Include the entire original item when notifying other channels of deletions as it contains important routing and scope information. Previously we were only sending a couple of critical fields like the message-id, flags, and creation date. The thinking was that it is deleted, let's not resend the deleted contents anywhere. But in order to route this through the same path the original post took we really need the entire original post with all of its baggage attached.
| -rwxr-xr-x | include/items.php | 5 | ||||
| -rw-r--r-- | include/zot.php | 2 | ||||
| -rw-r--r-- | mod/post.php | 2 | ||||
| -rw-r--r-- | version.inc | 2 |
4 files changed, 3 insertions, 8 deletions
diff --git a/include/items.php b/include/items.php index af0d4d297..78166a8ab 100755 --- a/include/items.php +++ b/include/items.php @@ -843,12 +843,7 @@ function encode_item($item) { } if($item['item_restrict'] & ITEM_DELETED) { - $x['message_id'] = $item['mid']; - $x['created'] = $item['created']; $x['flags'] = array('deleted'); - $x['owner'] = encode_item_xchan($item['owner']); - $x['author'] = encode_item_xchan($item['author']); - return $x; } $x['message_id'] = $item['mid']; diff --git a/include/zot.php b/include/zot.php index 19512c1ec..f9d527b33 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1412,7 +1412,7 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false) { } if((! perm_is_allowed($channel['channel_id'],$sender['hash'],$perm)) && (! $tag_delivery) && (! $public)) { - logger("permission denied for delivery {$channel['channel_id']}"); + logger("permission denied for delivery to channel {$channel['channel_id']} {$channel['channel_address']}"); $result[] = array($d['hash'],'permission denied',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>'); continue; } diff --git a/mod/post.php b/mod/post.php index 95c984b40..883b11a69 100644 --- a/mod/post.php +++ b/mod/post.php @@ -539,7 +539,7 @@ function post_post(&$a) { $sitekey = $hubsite['hubloc_sitekey']; - logger('mod_zot: Checking sitekey: ' . $sitekey); + logger('mod_zot: Checking sitekey: ' . $sitekey, LOGGER_DATA); if(rsa_verify($data['callback'],base64url_decode($data['callback_sig']),$sitekey)) { $forgery = false; diff --git a/version.inc b/version.inc index 6ef4f0add..a92680152 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-04-09.642 +2014-04-10.643 |