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

Add threaded comments support

Browse Source
This commit is contained in:
Max Kostikov 2019-05-01 21:40:43 +02:00
parent 0174bf3722
commit 51a0fc45e2
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
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;
} }
@ -303,7 +310,7 @@ class Activity {
$ret['attributedTo'] = $i['author']['xchan_url']; $ret['attributedTo'] = $i['author']['xchan_url'];
if($i['id'] != $i['parent']) { if($i['id'] != $i['parent']) {
$ret['inReplyTo'] = ((strpos($i['parent_mid'],'http') === 0) ? $i['parent_mid'] : z_root() . '/item/' . urlencode($i['parent_mid'])); $ret['inReplyTo'] = ((strpos($i['thr_parent'],'http') === 0) ? $i['thr_parent'] : z_root() . '/item/' . urlencode($i['thr_parent']));
} }
if($i['mimetype'] === 'text/bbcode') { if($i['mimetype'] === 'text/bbcode') {
@ -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')) {
@ -502,7 +509,7 @@ class Activity {
} }
if($i['id'] != $i['parent']) { if($i['id'] != $i['parent']) {
$ret['inReplyTo'] = ((strpos($i['parent_mid'],'http') === 0) ? $i['parent_mid'] : z_root() . '/item/' . urlencode($i['parent_mid'])); $ret['inReplyTo'] = ((strpos($i['thr_parent'],'http') === 0) ? $i['thr_parent'] : z_root() . '/item/' . urlencode($i['thr_parent']));
$reply = true; $reply = true;
if($i['item_private']) { if($i['item_private']) {