diff options
| author | Mario Vavti <mario@mariovavti.com> | 2021-01-25 21:52:17 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2021-01-25 21:52:17 +0100 |
| commit | d4198223bc1fd06e9b9fe969edb5d03811889def (patch) | |
| tree | 4203b70f293dab3734b6e63325a7b311d35bbfcc /Zotlabs | |
| parent | 77793e17c04b1f67c10a83e7877c36a8b11ddbaa (diff) | |
| download | volse-hubzilla-d4198223bc1fd06e9b9fe969edb5d03811889def.tar.gz volse-hubzilla-d4198223bc1fd06e9b9fe969edb5d03811889def.tar.bz2 volse-hubzilla-d4198223bc1fd06e9b9fe969edb5d03811889def.zip | |
invoke channel discovery by hash instead of address and add thread listeners only if we also send them the post
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Channel.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Module/Item.php | 11 |
2 files changed, 9 insertions, 5 deletions
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index fe7341e52..11f4d3a52 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -73,7 +73,7 @@ class Channel extends Controller { } } else { - $data = json_encode(Libzot::zotinfo([ 'address' => $channel['channel_address'] ])); + $data = json_encode(Libzot::zotinfo([ 'guid_hash' => $channel['channel_hash'] ])); } $headers = [ @@ -87,7 +87,6 @@ class Channel extends Controller { killme(); } - if((local_channel()) && (argc() > 2) && (argv(2) === 'view')) { $which = $channel['channel_address']; $profile = argv(1); diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index 83424a50d..3d83bcf8f 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -132,13 +132,14 @@ class Item extends Controller { $i = Activity::encode_item_collection($items, 'conversation/' . $item_id, 'OrderedCollection'); - if($portable_id) { - ThreadListener::store(z_root() . '/item/' . $item_id,$portable_id); - } if(! $i) http_status_exit(404, 'Not found'); + if($portable_id) { + ThreadListener::store(z_root() . '/item/' . $item_id,$portable_id); + } + $x = array_merge(['@context' => [ ACTIVITYSTREAMS_JSONLD_REV, 'https://w3id.org/security/v1', @@ -237,6 +238,10 @@ class Item extends Controller { if(! $i) http_status_exit(404, 'Not found'); + if($portable_id) { + ThreadListener::store(z_root() . '/item/' . $item_id, $portable_id); + } + $x = array_merge(['@context' => [ ACTIVITYSTREAMS_JSONLD_REV, 'https://w3id.org/security/v1', |