diff options
| author | Mario <mario@mariovavti.com> | 2021-02-22 10:32:05 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-02-22 10:32:05 +0000 |
| commit | d4159e83336215de53d87ba9785d252b3d064b6a (patch) | |
| tree | f1699e96b01bffd3d8c418c824e3f4c1101b7e56 | |
| parent | ddad4f604b56656086b32992ef98709be2568a37 (diff) | |
| download | volse-hubzilla-d4159e83336215de53d87ba9785d252b3d064b6a.tar.gz volse-hubzilla-d4159e83336215de53d87ba9785d252b3d064b6a.tar.bz2 volse-hubzilla-d4159e83336215de53d87ba9785d252b3d064b6a.zip | |
streamline iconf names and make sure to save the correct data
| -rw-r--r-- | Zotlabs/Daemon/Notifier.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Lib/Libzot.php | 13 | ||||
| -rw-r--r-- | include/cli_startup.php | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 78e116d68..02a0e155f 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -347,7 +347,6 @@ class Notifier { return; } - if ($target_item['mid'] === $target_item['parent_mid']) { $parent_item = $target_item; $top_level_post = true; @@ -381,7 +380,7 @@ class Notifier { $encoded_item = encode_item($target_item); // Re-use existing signature unless the activity type changed to a Tombstone, which won't verify. - $m = ((intval($target_item['item_deleted'])) ? '' : get_iconfig($target_item, 'activitystreams', 'signed_data')); + $m = ((intval($target_item['item_deleted'])) ? '' : get_iconfig($target_item, 'activitypub', 'signed_data')); if ($m) { $activity = json_decode($m, true); 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); diff --git a/include/cli_startup.php b/include/cli_startup.php index a4c1f629a..b9e7d124d 100644 --- a/include/cli_startup.php +++ b/include/cli_startup.php @@ -9,4 +9,4 @@ function cli_startup() { sys_boot(); App::set_baseurl(get_config('system','baseurl')); -}
\ No newline at end of file +} |