diff options
| author | zotlabs <mike@macgirvin.com> | 2019-01-28 02:46:45 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2019-01-28 02:46:45 -0800 |
| commit | 625cdde9a40d13b47a794c6202add2c8f647aebe (patch) | |
| tree | 67c6a48c76b6d8171d5216d674d4d1726b302abe /Zotlabs | |
| parent | 94cbc8bd3160bf644b02ef97268244869b7a9f5b (diff) | |
| download | volse-hubzilla-625cdde9a40d13b47a794c6202add2c8f647aebe.tar.gz volse-hubzilla-625cdde9a40d13b47a794c6202add2c8f647aebe.tar.bz2 volse-hubzilla-625cdde9a40d13b47a794c6202add2c8f647aebe.zip | |
block private reshares from zot6 due to different parents
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Daemon/Notifier.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 5ee8843b2..df73d977d 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -679,6 +679,17 @@ class Notifier { } $packet_type = (($upstream || $uplink) ? 'response' : 'activity'); + + // block zot private reshares from zot6, as this could cause a number of privacy issues + // due to parenting differences between the reshare implementations. In zot a reshare is + // a standalone parent activity and in zot6 it is a followup/child of the original activity. + // For public reshares, some comments to the reshare on the zot fork will not make it to zot6 + // due to these different message models. This cannot be prevented at this time. + + if($packet_type === 'activity' && $activity['type'] === 'Announce' && intval($target_item['item_private'])) { + continue; + } + $packet = Libzot::build_packet($channel,$packet_type,$zenv,$activity,'activitystreams',(($private) ? $hub['hubloc_sitekey'] : null),$hub['site_crypto']); } else { |