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

support 'expires' over Zot6

Browse Source
This commit is contained in:
zotlabs 2019-05-28 16:28:03 -07:00
parent 932b414063
commit 52f8429218
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Zotlabs/Lib/Activity.php
View File

@ -294,6 +294,10 @@ class Activity {
$ret['published'] = datetime_convert('UTC','UTC',$i['created'],ATOM_TIME); $ret['published'] = datetime_convert('UTC','UTC',$i['created'],ATOM_TIME);
if($i['created'] !== $i['edited']) if($i['created'] !== $i['edited'])
$ret['updated'] = datetime_convert('UTC','UTC',$i['edited'],ATOM_TIME); $ret['updated'] = datetime_convert('UTC','UTC',$i['edited'],ATOM_TIME);
if ($i['expires'] <= NULL_DATE) {
$ret['expires'] = datetime_convert('UTC','UTC',$i['expires'],ATOM_TIME);
}
if($i['app']) { if($i['app']) {
$ret['instrument'] = [ 'type' => 'Service', 'name' => $i['app'] ]; $ret['instrument'] = [ 'type' => 'Service', 'name' => $i['app'] ];
} }
@ -1309,6 +1313,12 @@ class Activity {
elseif($act->obj['updated']) { elseif($act->obj['updated']) {
$s['edited'] = datetime_convert('UTC','UTC',$act->obj['updated']); $s['edited'] = datetime_convert('UTC','UTC',$act->obj['updated']);
} }
if ($act->data['expires']) {
$s['expires'] = datetime_convert('UTC','UTC',$act->data['expires']);
}
elseif ($act->obj['expires']) {
$s['expires'] = datetime_convert('UTC','UTC',$act->obj['expires']);
}
if(! $s['created']) if(! $s['created'])
$s['created'] = datetime_convert(); $s['created'] = datetime_convert();
@ -1493,6 +1503,12 @@ class Activity {
elseif($act->obj['updated']) { elseif($act->obj['updated']) {
$s['edited'] = datetime_convert('UTC','UTC',$act->obj['updated']); $s['edited'] = datetime_convert('UTC','UTC',$act->obj['updated']);
} }
if ($act->data['expires']) {
$s['expires'] = datetime_convert('UTC','UTC',$act->data['expires']);
}
elseif ($act->obj['expires']) {
$s['expires'] = datetime_convert('UTC','UTC',$act->obj['expires']);
}
if(in_array($act->type, [ 'Like', 'Dislike', 'Flag', 'Block', 'Announce', 'Accept', 'Reject', 'TentativeAccept', 'emojiReaction' ])) { if(in_array($act->type, [ 'Like', 'Dislike', 'Flag', 'Block', 'Announce', 'Accept', 'Reject', 'TentativeAccept', 'emojiReaction' ])) {

1
Zotlabs/Module/Apschema.php
View File

@ -27,6 +27,7 @@ class Apschema extends \Zotlabs\Web\Controller {
'nomadicLocation' => 'zot:nomadicLocation', 'nomadicLocation' => 'zot:nomadicLocation',
'nomadicHubs' => 'zot:nomadicHubs', 'nomadicHubs' => 'zot:nomadicHubs',
'emojiReaction' => 'zot:emojiReaction', 'emojiReaction' => 'zot:emojiReaction',
'expires' => 'zot:expires',
'magicEnv' => [ 'magicEnv' => [
'@id' => 'zot:magicEnv', '@id' => 'zot:magicEnv',

2
boot.php
View File

@ -468,7 +468,7 @@ define ( 'NAMESPACE_YMEDIA', 'http://search.yahoo.com/mrss/' );
define ( 'ACTIVITYSTREAMS_JSONLD_REV', 'https://www.w3.org/ns/activitystreams' ); define ( 'ACTIVITYSTREAMS_JSONLD_REV', 'https://www.w3.org/ns/activitystreams' );
define ( 'ZOT_APSCHEMA_REV', '/apschema/v1.4' ); define ( 'ZOT_APSCHEMA_REV', '/apschema/v1.5' );
/** /**
* activity stream defines * activity stream defines
*/ */