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

Merge branch 'dev' into 4.2RC

Browse Source
This commit is contained in:
Mario Vavti 2019-05-29 09:08:40 +02:00
commit b6bd2884d5
4 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Zotlabs/Lib/Activity.php
View File

@ -294,8 +294,12 @@ class Activity {
$ret['published'] = datetime_convert('UTC','UTC',$i['created'],ATOM_TIME);
if($i['created'] !== $i['edited'])
$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']) {
$ret['instrument'] = [ 'type' => 'Service', 'name' => $i['app'] ];
$ret['generator'] = [ 'type' => 'Application', 'name' => $i['app'] ];
}
if($i['location'] || $i['coord']) {
$ret['location'] = [ 'type' => 'Place' ];
@ -502,7 +506,7 @@ class Activity {
if($i['created'] !== $i['edited'])
$ret['updated'] = datetime_convert('UTC','UTC',$i['edited'],ATOM_TIME);
if($i['app']) {
$ret['instrument'] = [ 'type' => 'Service', 'name' => $i['app'] ];
$ret['generator'] = [ 'type' => 'Application', 'name' => $i['app'] ];
}
if($i['location'] || $i['coord']) {
$ret['location'] = [ 'type' => 'Place' ];
@ -1309,6 +1313,12 @@ class Activity {
elseif($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'])
$s['created'] = datetime_convert();
@ -1327,13 +1337,13 @@ class Activity {
$s['verb'] = ACTIVITY_POST;
$s['obj_type'] = ACTIVITY_OBJ_NOTE;
$instrument = $act->get_property_obj('instrument');
if(! $instrument)
$instrument = $act->get_property_obj('instrument',$act->obj);
$generator = $act->get_property_obj('generator');
if(! $generator)
$generator = $act->get_property_obj('generator',$act->obj);
if($instrument && array_key_exists('type',$instrument)
&& $instrument['type'] === 'Service' && array_key_exists('name',$instrument)) {
$s['app'] = escape_tags($instrument['name']);
if($generator && array_key_exists('type',$generator)
&& in_array($generator['type'], [ 'Application','Service' ] ) && array_key_exists('name',$generator)) {
$s['app'] = escape_tags($generator['name']);
}
if($channel['channel_system']) {
@ -1493,6 +1503,12 @@ class Activity {
elseif($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' ])) {
@ -1590,14 +1606,14 @@ class Activity {
$s['obj'] = $act->obj;
}
$instrument = $act->get_property_obj('instrument');
if((! $instrument) && (! $response_activity)) {
$instrument = $act->get_property_obj('instrument',$act->obj);
$generator = $act->get_property_obj('generator');
if((! $generator) && (! $response_activity)) {
$generator = $act->get_property_obj('generator',$act->obj);
}
if($instrument && array_key_exists('type',$instrument)
&& $instrument['type'] === 'Service' && array_key_exists('name',$instrument)) {
$s['app'] = escape_tags($instrument['name']);
if($generator && array_key_exists('type',$generator)
&& in_array($generator['type'], [ 'Application', 'Service' ] ) && array_key_exists('name',$generator)) {
$s['app'] = escape_tags($generator['name']);
}

1
Zotlabs/Module/Apschema.php
View File

@ -27,6 +27,7 @@ class Apschema extends \Zotlabs\Web\Controller {
'nomadicLocation' => 'zot:nomadicLocation',
'nomadicHubs' => 'zot:nomadicHubs',
'emojiReaction' => 'zot:emojiReaction',
'expires' => 'zot:expires',
'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 ( 'ZOT_APSCHEMA_REV', '/apschema/v1.4' );
define ( 'ZOT_APSCHEMA_REV', '/apschema/v1.5' );
/**
* activity stream defines
*/

12
include/import.php
View File

@ -897,9 +897,9 @@ function import_menus($channel, $menus) {
$m['menu_name'] = $menu['pagetitle'];
$m['menu_desc'] = $menu['desc'];
if($menu['created'])
$m['menu_created'] = datetime_convert($menu['created']);
$m['menu_created'] = datetime_convert('UTC','UTC',$menu['created']);
if($menu['edited'])
$m['menu_edited'] = datetime_convert($menu['edited']);
$m['menu_edited'] = datetime_convert('UTC','UTC',$menu['edited']);
$m['menu_flags'] = 0;
if($menu['flags']) {
@ -955,9 +955,9 @@ function sync_menus($channel, $menus) {
$m['menu_name'] = $menu['pagetitle'];
$m['menu_desc'] = $menu['desc'];
if($menu['created'])
$m['menu_created'] = datetime_convert($menu['created']);
$m['menu_created'] = datetime_convert('UTC','UTC',$menu['created']);
if($menu['edited'])
$m['menu_edited'] = datetime_convert($menu['edited']);
$m['menu_edited'] = datetime_convert('UTC','UTC',$menu['edited']);
$m['menu_flags'] = 0;
if($menu['flags']) {
@ -1643,12 +1643,12 @@ function import_webpage_element($element, $channel, $type) {
$arr['created'] = $iteminfo[0]['created'];
}
else { // otherwise, generate the creation times and unique id
$arr['created'] = datetime_convert('UTC', 'UTC');
$arr['created'] = datetime_convert();
$arr['uuid'] = item_message_id();
$arr['mid'] = $arr['parent_mid'] = z_root() . '/item/' . $arr['uuid'];
}
// Update the edited time whether or not the element already exists
$arr['edited'] = datetime_convert('UTC', 'UTC');
$arr['edited'] = datetime_convert();
// Import the actual element content
$arr['body'] = file_get_contents($element['path']);
// The element owner is the channel importing the elements