diff options
| author | nobody <nobody@zotlabs.com> | 2021-02-24 11:38:38 -0800 |
|---|---|---|
| committer | nobody <nobody@zotlabs.com> | 2021-02-24 11:38:38 -0800 |
| commit | beb418b093913bcc9499dac2722d53dfdab4879d (patch) | |
| tree | 739ca3d948cb5574c479289f54cdceba707c7f58 /Zotlabs/Lib/Libzot.php | |
| parent | 0f89d2b8e06de56effc5e5f751c098a432e26e6a (diff) | |
| parent | a033c439f3486c6ce31fb5d680c363ce0582d451 (diff) | |
| download | volse-hubzilla-beb418b093913bcc9499dac2722d53dfdab4879d.tar.gz volse-hubzilla-beb418b093913bcc9499dac2722d53dfdab4879d.tar.bz2 volse-hubzilla-beb418b093913bcc9499dac2722d53dfdab4879d.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Lib/Libzot.php')
| -rw-r--r-- | Zotlabs/Lib/Libzot.php | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php index 45d536638..6aa49c5a7 100644 --- a/Zotlabs/Lib/Libzot.php +++ b/Zotlabs/Lib/Libzot.php @@ -1268,8 +1268,13 @@ class Libzot { } } } + if ($AS->data['signed_data']) { - IConfig::Set($arr, 'activitystreams', 'signed_data', $AS->data['signed_data'], false); + IConfig::Set($arr, 'activitypub', 'signed_data', $AS->data['signed_data'], false); + $j = json_decode($AS->data['signed_data'], true); + if ($j) { + IConfig::Set($arr, 'activitypub', 'rawmsg', json_encode(JSalmon::unpack($j['data'])), true); + } } logger('Activity received: ' . print_r($arr, true), LOGGER_DATA, LOG_DEBUG); @@ -1953,7 +1958,11 @@ class Libzot { } if ($AS->data['signed_data']) { - IConfig::Set($arr, 'activitystreams', 'signed_data', $AS->data['signed_data'], false); + IConfig::Set($arr, 'activitypub', 'signed_data', $AS->data['signed_data'], false); + $j = json_decode($AS->data['signed_data'], true); + if ($j) { + IConfig::Set($arr, 'activitypub', 'rawmsg', json_encode(JSalmon::unpack($j['data'])), true); + } } logger('FOF Activity received: ' . print_r($arr, true), LOGGER_DATA, LOG_DEBUG); |