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

Merge branch 'dev' into 'dev'

Browse Source 
change event formatting slightly for Zot6 and ActivityStreams.

See merge request hubzilla/core!1727
This commit is contained in:
Mario
2019-09-18 12:43:45 +02:00
parent 01abd73a2a 375c2a87c7
commit 856d4b39d1
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Zotlabs/Lib/Activity.php
View File

@@ -6,6 +6,7 @@ use Zotlabs\Daemon\Master;
use Zotlabs\Web\HTTPSig; use Zotlabs\Web\HTTPSig;
require_once('include/event.php'); require_once('include/event.php');
require_once('include/html2plain.php');
class Activity { class Activity {
@@ -204,7 +205,8 @@ class Activity {
$y = [ $y = [
'type' => 'Event', 'type' => 'Event',
'id' => z_root() . '/event/' . $ev['event_hash'], 'id' => z_root() . '/event/' . $ev['event_hash'],
'summary' => bbcode($ev['summary'], [ 'cache' => true ]), 'name' => $ev['summary'],
// 'summary' => bbcode($ev['summary'], [ 'cache' => true ]),
// RFC3339 Section 4.3 // RFC3339 Section 4.3
'startTime' => (($ev['adjust']) ? datetime_convert('UTC','UTC',$ev['dtstart'], ATOM_TIME) : datetime_convert('UTC','UTC',$ev['dtstart'],'Y-m-d\\TH:i:s-00:00')), 'startTime' => (($ev['adjust']) ? datetime_convert('UTC','UTC',$ev['dtstart'], ATOM_TIME) : datetime_convert('UTC','UTC',$ev['dtstart'],'Y-m-d\\TH:i:s-00:00')),
'content' => bbcode($ev['description'], [ 'cache' => true ]), 'content' => bbcode($ev['description'], [ 'cache' => true ]),
@@ -2559,7 +2561,12 @@ class Activity {
} }
if($event) { if($event) {
$event['summary'] = html2bbcode($content['summary']); $event['summary'] = $content['name'];
if(! $event['summary']) {
if($content['summary']) {
$event['summary'] = html2plain($content['summary']);
}
}
$event['description'] = html2bbcode($content['content']); $event['description'] = html2bbcode($content['content']);
if($event['summary'] && $event['dtstart']) { if($event['summary'] && $event['dtstart']) {
$content['event'] = $event; $content['event'] = $event;