harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add attachments to zot6 event objects, add zot6 to federated transports (webfinger)

Browse Source 
(cherry picked from commit 0615709a7a)
This commit is contained in:
zotlabs 2019-04-16 03:51:57 +00:00 committed by Mario
parent 5f73a46c05
commit 2221d4d612
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Wfinger.php
View File

@ -128,7 +128,7 @@ class Wfinger extends \Zotlabs\Web\Controller {
'http://webfinger.net/ns/name' => $r[0]['channel_name'], 'http://webfinger.net/ns/name' => $r[0]['channel_name'],
'http://xmlns.com/foaf/0.1/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'], '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) foreach($aliases as $alias)

7
include/event.php
View File

@ -4,8 +4,11 @@
* @brief Event related functions. * @brief Event related functions.
*/ */
use Sabre\VObject; use Sabre\VObject;
use Zotlabs\Lib\Activity;
use Ramsey\Uuid\Uuid; use Ramsey\Uuid\Uuid;
use Ramsey\Uuid\Exception\UnsatisfiedDependencyException; use Ramsey\Uuid\Exception\UnsatisfiedDependencyException;
@ -65,7 +68,7 @@ function format_event_html($ev) {
} }
function format_event_obj($jobject) { function format_event_obj($jobject) {
$event = array(); $event = [];
$object = json_decode($jobject,true); $object = json_decode($jobject,true);
@ -1046,6 +1049,7 @@ function event_store_item($arr, $event) {
'location' => $arr['location'], 'location' => $arr['location'],
'adjust' => $arr['adjust'], 'adjust' => $arr['adjust'],
'content' => format_event_bbcode($arr), 'content' => format_event_bbcode($arr),
'attachment' => Activity::encode_attachment($r[0]),
'author' => array( 'author' => array(
'name' => $r[0]['xchan_name'], 'name' => $r[0]['xchan_name'],
'address' => $r[0]['xchan_addr'], 'address' => $r[0]['xchan_addr'],
@ -1200,6 +1204,7 @@ function event_store_item($arr, $event) {
'location' => $arr['location'], 'location' => $arr['location'],
'adjust' => $arr['adjust'], 'adjust' => $arr['adjust'],
'content' => format_event_bbcode($arr), 'content' => format_event_bbcode($arr),
'attachment' => Activity::encode_attachment($item_arr),
'author' => array( 'author' => array(
'name' => $x[0]['xchan_name'], 'name' => $x[0]['xchan_name'],
'address' => $x[0]['xchan_addr'], 'address' => $x[0]['xchan_addr'],