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

event integration improvements

Browse Source
This commit is contained in:
redmatrix
2015-08-19 16:50:32 -07:00
parent 4e3d295c90
commit a4caaefd32
4 changed files with 55 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/event.php
View File

@@ -850,6 +850,17 @@ function event_store_item($arr, $event) {
$item_arr['item_origin'] = $item_origin;
$item_arr['item_thread_top'] = $item_thread_top;;
$attach = array(array(
'href' => z_root() . '/events/ical/' . urlencode($event['event_hash']),
'length' => 0,
'type' => 'text/calendar',
'title' => t('event') . '-' . $event['event_hash'],
'revision' => ''
));
$item_arr['attach'] = $attach;
if(array_key_exists('term', $arr))
$item_arr['term'] = $arr['term'];

15
include/zot.php
View File

@@ -1688,7 +1688,7 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
$result[] = array($d['hash'],'update ignored',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']);
}
else {
update_imported_item($sender,$arr,$channel['channel_id']);
update_imported_item($sender,$arr,$r[0],$channel['channel_id']);
$result[] = array($d['hash'],'updated',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']);
if(! $relay)
add_source_route($item_id,$sender['hash']);
@@ -1825,9 +1825,20 @@ function remove_community_tag($sender, $arr, $uid) {
* @param array $item
* @param int $uid (unused)
*/
function update_imported_item($sender, $item, $uid) {
function update_imported_item($sender, $item, $orig, $uid) {
$x = item_store_update($item);
// If we're updating an event that we've saved locally, we store the item info first
// because event_addtocal will parse the body to get the 'new' event details
if($orig['resource_type'] === 'event') {
$res = event_addtocal($orig['id'],$uid);
if(! $res)
logger('update event: failed');
}
if(! $x['item_id'])
logger('update_imported_item: failed: ' . $x['message']);
else