aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-04-15 20:51:57 -0700
committerzotlabs <mike@macgirvin.com>2019-04-15 20:51:57 -0700
commit0615709a7ab7bba66b2a07d593e84a35ed083edb (patch)
treedfd92be860bfc64b8b13b1382f97b81cdd312026
parent999ae6eb494dbe7c700d40a2e7557ebee7157d80 (diff)
downloadvolse-hubzilla-0615709a7ab7bba66b2a07d593e84a35ed083edb.tar.gz
volse-hubzilla-0615709a7ab7bba66b2a07d593e84a35ed083edb.tar.bz2
volse-hubzilla-0615709a7ab7bba66b2a07d593e84a35ed083edb.zip
add attachments to zot6 event objects, add zot6 to federated transports (webfinger)
-rw-r--r--Zotlabs/Module/Wfinger.php2
-rw-r--r--include/event.php7
2 files changed, 7 insertions, 2 deletions
diff --git a/Zotlabs/Module/Wfinger.php b/Zotlabs/Module/Wfinger.php
index 03275abbc..a19bdbedc 100644
--- a/Zotlabs/Module/Wfinger.php
+++ b/Zotlabs/Module/Wfinger.php
@@ -128,7 +128,7 @@ class Wfinger extends \Zotlabs\Web\Controller {
'http://webfinger.net/ns/name' => $r[0]['channel_name'],
'http://xmlns.com/foaf/0.1/name' => $r[0]['channel_name'],
'https://w3id.org/security/v1#publicKeyPem' => $r[0]['xchan_pubkey'],
- 'http://purl.org/zot/federation' => 'zot'
+ 'http://purl.org/zot/federation' => 'zot,zot6'
];
foreach($aliases as $alias)
diff --git a/include/event.php b/include/event.php
index fdb9e1415..77118c329 100644
--- a/include/event.php
+++ b/include/event.php
@@ -4,8 +4,11 @@
* @brief Event related functions.
*/
+
use Sabre\VObject;
+use Zotlabs\Lib\Activity;
+
use Ramsey\Uuid\Uuid;
use Ramsey\Uuid\Exception\UnsatisfiedDependencyException;
@@ -65,7 +68,7 @@ function format_event_html($ev) {
}
function format_event_obj($jobject) {
- $event = array();
+ $event = [];
$object = json_decode($jobject,true);
@@ -1046,6 +1049,7 @@ function event_store_item($arr, $event) {
'location' => $arr['location'],
'adjust' => $arr['adjust'],
'content' => format_event_bbcode($arr),
+ 'attachment' => Activity::encode_attachment($r[0]),
'author' => array(
'name' => $r[0]['xchan_name'],
'address' => $r[0]['xchan_addr'],
@@ -1200,6 +1204,7 @@ function event_store_item($arr, $event) {
'location' => $arr['location'],
'adjust' => $arr['adjust'],
'content' => format_event_bbcode($arr),
+ 'attachment' => Activity::encode_attachment($item_arr),
'author' => array(
'name' => $x[0]['xchan_name'],
'address' => $x[0]['xchan_addr'],