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

event attachments still weren't being delivered to zot6

Browse Source
This commit is contained in:
zotlabs 2019-04-28 18:20:40 -07:00
parent 95871fe13c
commit 9641254443
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Zotlabs/Lib/Activity.php
View File

@ -195,6 +195,13 @@ class Activity {
if(! $ev['nofinish']) { if(! $ev['nofinish']) {
$y['endTime'] = (($ev['adjust']) ? datetime_convert('UTC','UTC',$ev['dtend'], ATOM_TIME) : datetime_convert('UTC','UTC',$ev['dtend'],'Y-m-d\\TH:i:s-00:00')); $y['endTime'] = (($ev['adjust']) ? datetime_convert('UTC','UTC',$ev['dtend'], ATOM_TIME) : datetime_convert('UTC','UTC',$ev['dtend'],'Y-m-d\\TH:i:s-00:00'));
} }
// copy attachments from the passed object - these are already formatted for ActivityStreams
if($x['attachment']) {
$y['attachment'] = $x['attachment'];
}
if($actor) { if($actor) {
return $y; return $y;
} }
@ -404,7 +411,7 @@ class Activity {
$ret = []; $ret = [];
if($item['attach']) { if($item['attach']) {
$atts = json_decode($item['attach'],true); $atts = ((is_array($item['attach'])) ? $item['attach'] : json_decode($item['attach'],true));
if($atts) { if($atts) {
foreach($atts as $att) { foreach($atts as $att) {
if(strpos($att['type'],'image')) { if(strpos($att['type'],'image')) {