diff options
author | zotlabs <mike@macgirvin.com> | 2020-02-10 18:17:41 -0800 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2020-02-10 18:17:41 -0800 |
commit | bf7c96807a50433b7241ddf6df9e01d4ef11f43d (patch) | |
tree | b689e76e7eae9c7e339916048b7c5623b96a4b7d /Zotlabs | |
parent | d4a6aa7801d7bad862436990418a7aba34ddef1f (diff) | |
download | volse-hubzilla-bf7c96807a50433b7241ddf6df9e01d4ef11f43d.tar.gz volse-hubzilla-bf7c96807a50433b7241ddf6df9e01d4ef11f43d.tar.bz2 volse-hubzilla-bf7c96807a50433b7241ddf6df9e01d4ef11f43d.zip |
fix poll responses
Diffstat (limited to 'Zotlabs')
-rw-r--r-- | Zotlabs/Daemon/Notifier.php | 12 | ||||
-rw-r--r-- | Zotlabs/Lib/Libzot.php | 1 |
2 files changed, 12 insertions, 1 deletions
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 1d0be10d9..00c6fb077 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -3,6 +3,7 @@ namespace Zotlabs\Daemon; use Zotlabs\Lib\Libzot; +use Zotlabs\Lib\Activity; require_once('include/queue_fn.php'); require_once('include/html2plain.php'); @@ -366,9 +367,18 @@ class Notifier { $activity = json_decode($m,true); } else { - $activity = \Zotlabs\Lib\Activity::encode_activity($target_item); + $activity = array_merge(['@context' => [ + ACTIVITYSTREAMS_JSONLD_REV, + 'https://w3id.org/security/v1', + z_root() . ZOT_APSCHEMA_REV + ]], Activity::encode_activity($target_item) + ); } + logger('target_item: ' . print_r($target_item,true), LOGGER_DEBUG); + logger('encoded: ' . print_r($activity,true), LOGGER_DEBUG); + + // Send comments to the owner to re-deliver to everybody in the conversation // We only do this if the item in question originated on this site. This prevents looping. // To clarify, a site accepting a new comment is responsible for sending it to the owner for relay. diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php index d64421926..42e706754 100644 --- a/Zotlabs/Lib/Libzot.php +++ b/Zotlabs/Lib/Libzot.php @@ -1617,6 +1617,7 @@ class Libzot { dbesc($arr['parent_mid']), intval($channel['channel_id']) ); + if(! $r) { $DR->update('comment parent not found'); $result[] = $DR->get(); |