From 7c2aafd4ee123f9db1ea2733119e0711f53414cc Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 21 May 2019 18:23:45 -0700 Subject: another forum -> group wording change --- Zotlabs/Widget/Notifications.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Zotlabs/Widget/Notifications.php b/Zotlabs/Widget/Notifications.php index 37d9139ec..6ac1c48a6 100644 --- a/Zotlabs/Widget/Notifications.php +++ b/Zotlabs/Widget/Notifications.php @@ -113,11 +113,11 @@ class Notifications { ]; $notifications[] = [ - 'type' => 'forums', + 'type' => 'groups', 'icon' => 'comments-o', 'severity' => 'secondary', - 'label' => t('Forums'), - 'title' => t('Forums'), + 'label' => t('Groups'), + 'title' => t('Groups'), 'filter' => [ 'name_label' => t('Filter by name or address') ] -- cgit v1.2.3 From ca8d252ad75306e6d3cd066d5c593e94de1dfbdd Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 28 May 2019 12:07:14 +0200 Subject: update changelog --- CHANGELOG | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 23c1be7d5..534d52320 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,59 @@ +Hubzilla 4.2 (2019-??-??) + - Introduce Calendar app which deprecates Events and CalDAV apps and streamlines the featuresets + - Update mod cal to reflect changes in the calendar app + - Improve timezone detection for CalDAV calendars + - Add mention support to event description in channel calendar + - Update jgrowl library + - Do not try to oembed URLs without embed tags + - Optimise pdf oembed processing + - Add form security token to mod register + - Replace photo URL for gallery on clonned channel post sync + - Update justified gallery library + - Update bootstrap libraries + - Use "cache" flag for bbcode() on content destined for zot6 + - Improve DB indexing + - Drop deprecated columns from channel the table + - Replace own image URL in clonned channel posts + - Improve DB update handling + - Improve item deletion when a contact was removed + - Zot6 compatibility for emoji reactions + - Add threaded comments support (disabled by default) + - Improve xmlify()/unxmlify() performance + - Update blueimp/jquery-file-uplad library + - Update sabre/vobject library + - Various doco updates + - Implement remove profile photo button (reset to default photo) + - Implement remove cover photo button + - Update the homeinstall script + - Add command line tool for photo thumbnails storage conversion + - Implement option to store photo thumbnails in filesystem instead of DB + + Bugfixes + - Fix encoded URLs in code blocks + - Fix wiki headers not escaped + - Fix possible xchan protocol confusion in new_contact() + - Fix xchan_url not displayed if xchan_addr not available + - Fix suggestion ordering in mod directory + - Fix event attachment delivery to zot6 + + Addons + - pubcrawl: improve friendica compatibility by adding the nonstandard diaspora:guid field + - pubcrawl: initial suport for events + - pubcrawl: improve permalink detection + - flashcards: fix moving learn buttons if viewport sizes changes + - flashcards: Move card details to the bottom of a card + - upgrade_info: provide links to changelog + - photocache: do not save filename for cached photos + - pubcrawl: save local comment activitypub payload in iconfig to be used for relay + - flashcards: UI improvements in box settings + - pubcrawl: implement profile update messages + - pubcrawl: use URI instead of object for actor + - flashcards: fix jumping sync button + - pubcrawl: add threaded comments support + - pubcrawl: ignore target encoding errors + - pubcrawl: format photo items for activitypub + + Hubzilla 4.0.3 (2019-04-26) - Add attachments to zot6 event objects - Add zot6 to federated transports -- cgit v1.2.3 From 52f8429218ae8a0f8c2ff193728e3b4422985207 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 28 May 2019 16:28:03 -0700 Subject: support 'expires' over Zot6 --- Zotlabs/Lib/Activity.php | 16 ++++++++++++++++ Zotlabs/Module/Apschema.php | 1 + boot.php | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 0843e0a7b..dc3cff1e7 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -294,6 +294,10 @@ 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'] ]; } @@ -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(); @@ -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' ])) { diff --git a/Zotlabs/Module/Apschema.php b/Zotlabs/Module/Apschema.php index 5b249bfe8..d217041f2 100644 --- a/Zotlabs/Module/Apschema.php +++ b/Zotlabs/Module/Apschema.php @@ -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', diff --git a/boot.php b/boot.php index e76440e10..86c3c3272 100755 --- a/boot.php +++ b/boot.php @@ -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 */ -- cgit v1.2.3 From 1bf046c142f3ac43da4a65ec3ad80555e781655f Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 28 May 2019 16:35:41 -0700 Subject: Revert "another forum -> group wording change" (wrong tree) This reverts commit 7c2aafd4ee123f9db1ea2733119e0711f53414cc. --- Zotlabs/Widget/Notifications.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Zotlabs/Widget/Notifications.php b/Zotlabs/Widget/Notifications.php index 95b349b3d..077949b4e 100644 --- a/Zotlabs/Widget/Notifications.php +++ b/Zotlabs/Widget/Notifications.php @@ -113,11 +113,11 @@ class Notifications { ]; $notifications[] = [ - 'type' => 'groups', + 'type' => 'forums', 'icon' => 'comments-o', 'severity' => 'secondary', - 'label' => t('Groups'), - 'title' => t('Groups'), + 'label' => t('Forums'), + 'title' => t('Forums'), 'filter' => [ 'name_label' => t('Filter by name or address') ] -- cgit v1.2.3 From 0fa4c89a1b74879b57fef1e6f785d15d49bd3e30 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 28 May 2019 20:23:03 -0700 Subject: convert AS "instrument" objects to the more appropriate "generator" - this probably should happen in pubcrawl addon also --- Zotlabs/Lib/Activity.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index dc3cff1e7..4a1171c5d 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -299,7 +299,7 @@ class Activity { } 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' ]; @@ -506,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' ]; @@ -1337,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']) { @@ -1606,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']); } -- cgit v1.2.3 From 620fc06b6cd068d6819e1613c4ef0ad10f3ba2a6 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 28 May 2019 23:14:22 -0700 Subject: anomolies in calls to datetime_convert in include/import --- include/import.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/import.php b/include/import.php index 92ba014d8..4da0d1a0b 100644 --- a/include/import.php +++ b/include/import.php @@ -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 -- cgit v1.2.3