From 503047dc327a514563a1be64bba163100af5cdec Mon Sep 17 00:00:00 2001 From: Jeroen Date: Thu, 22 Jan 2015 00:11:00 +0000 Subject: added redmatrix.nl back as a directory server. this was not the issue with the performance problems --- boot.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 98ff45ebb..88e79a95c 100755 --- a/boot.php +++ b/boot.php @@ -84,7 +84,8 @@ $DIRECTORY_FALLBACK_SERVERS = array( 'https://red.zottel.red', 'https://red.pixelbits.de', 'https://my.federated.social', - 'https://whogotzot.com' + 'https://whogotzot.com', + 'https://redmatrix.nl' ); -- cgit v1.2.3 From 4ff71fc0c7d28b8a843cc67eac1d9463afe575ee Mon Sep 17 00:00:00 2001 From: marijus Date: Thu, 22 Jan 2015 02:34:38 +0100 Subject: change mod/sharedwithme backend to use activity object - this is not backwards compatible --- boot.php | 2 +- include/attach.php | 103 +++++++++++++++++++++++++++++++++++++-------------- mod/filestorage.php | 6 +-- mod/sharedwithme.php | 72 ++++++++++++++++++----------------- 4 files changed, 116 insertions(+), 67 deletions(-) diff --git a/boot.php b/boot.php index 98ff45ebb..d6c9af7bb 100755 --- a/boot.php +++ b/boot.php @@ -501,7 +501,6 @@ define ( 'ACTIVITY_FAVORITE', NAMESPACE_ACTIVITY_SCHEMA . 'favorite' ); define ( 'ACTIVITY_POKE', NAMESPACE_ZOT . '/activity/poke' ); define ( 'ACTIVITY_MOOD', NAMESPACE_ZOT . '/activity/mood' ); -define ( 'ACTIVITY_FILE', NAMESPACE_ZOT . '/activity/file' ); define ( 'ACTIVITY_OBJ_COMMENT', NAMESPACE_ACTIVITY_SCHEMA . 'comment' ); define ( 'ACTIVITY_OBJ_NOTE', NAMESPACE_ACTIVITY_SCHEMA . 'note' ); @@ -515,6 +514,7 @@ define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_ZOT . '/activity/tagterm' ); define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_ZOT . '/activity/profile' ); define ( 'ACTIVITY_OBJ_THING', NAMESPACE_ZOT . '/activity/thing' ); define ( 'ACTIVITY_OBJ_LOCATION',NAMESPACE_ZOT . '/activity/location' ); +define ( 'ACTIVITY_OBJ_FILE', NAMESPACE_ZOT . '/activity/file' ); /** * item weight for query ordering diff --git a/include/attach.php b/include/attach.php index 5ef3bea24..673e438bf 100644 --- a/include/attach.php +++ b/include/attach.php @@ -753,7 +753,7 @@ function attach_delete($channel_id, $resource) { $channel_address = (($c) ? $c[0]['channel_address'] : 'notfound'); - $r = q("SELECT hash, filename, flags, folder FROM attach WHERE hash = '%s' AND uid = %d limit 1", + $r = q("SELECT hash, flags, folder FROM attach WHERE hash = '%s' AND uid = %d limit 1", dbesc($resource), intval($channel_id) ); @@ -762,8 +762,6 @@ function attach_delete($channel_id, $resource) { if(! $r) return; - $url = get_parent_cloudpath($channel_id, $channel_address, $resource) . $r[0]['filename']; - // If resource is a directory delete everything in the directory recursive if($r[0]['flags'] & ATTACH_FLAG_DIR) { $x = q("SELECT hash, flags FROM attach WHERE folder = '%s' AND uid = %d", @@ -806,7 +804,7 @@ function attach_delete($channel_id, $resource) { intval($channel_id) ); - file_activity($channel_id, $resource, $allow_cid='', $allow_gid='', $deny_cid='', $deny_gid='', $url, 'drop', $no_activity=false); + file_activity($channel_id, $resource, $cloudpath='', $allow_cid='', $allow_gid='', $deny_cid='', $deny_gid='', 'drop', $no_activity=false); } /** @@ -942,32 +940,76 @@ function pipe_streams($in, $out) { return $size; } -function file_activity($channel_id, $hash, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $url, $action, $no_activity) { +function file_activity($channel_id, $hash, $cloudpath, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $verb, $no_activity) { require_once('include/items.php'); - $url = rawurlencode($url); - $poster = get_app()->get_observer(); - $verb = ACTIVITY_FILE . '/' . $action . '/' . $hash; + switch($verb) { + case 'post': + $activity = ACTIVITY_POST; + $x = q("SELECT creator, filename, filetype, filesize, revision, folder, flags, created, edited FROM attach WHERE uid = %d AND hash = '%s' LIMIT 1", + intval($channel_id), + dbesc($hash) + ); + break; + case 'drop': + $activity = ACTIVITY_UPDATE; + break; + default: + return; + break; + } + + $url = (($cloudpath && $x[0]['filename']) ? rawurlencode($cloudpath . $x[0]['filename']) : 'unavailable'); $mid = item_message_id(); $item_flags = ITEM_WALL|ITEM_ORIGIN|ITEM_UNSEEN; - if($action == 'post') { - //check if activity item exists - //if yes send drop activity and create a new one + $links = array( + 'rel' => 'alternate', + 'type' => 'text/html', + 'href' => $url + ); - $r = q("SELECT * FROM item WHERE verb = '%s'", - dbesc($verb) + $objtype = ACTIVITY_OBJ_FILE; + + $object = array( + 'type' => ACTIVITY_OBJ_FILE, + 'title' => (($x[0]['filename']) ? $x[0]['filename'] : 'unavailable'), + 'id' => $url, + 'link' => $links, + + 'hash' => $hash, + 'creator' => (($x[0]['creator']) ? $x[0]['creator'] : ''), + 'filename' => (($x[0]['filename']) ? $x[0]['filename'] : ''), + 'filetype' => (($x[0]['filetype']) ? $x[0]['filetype'] : ''), + 'filesize' => (($x[0]['filesize']) ? $x[0]['filesize'] : ''), + 'revision' => (($x[0]['revision']) ? $x[0]['revision'] : ''), + 'folder' => (($x[0]['folder']) ? $x[0]['folder'] : ''), + 'flags' => (($x[0]['flags']) ? $x[0]['flags'] : ''), + 'created' => (($x[0]['created']) ? $x[0]['created'] : ''), + 'edited' => (($x[0]['edited']) ? $x[0]['edited'] : '') + ); + + $private = (($allow_cid || $allow_gid || $deny_cid || $deny_gid) ? 1 : 0); + + if($verb == 'post') { + //check if activity item exists + //if yes send update (drop) activity and create a new one + $y = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND object LIKE '%s'", + dbesc(ACTIVITY_POST), + dbesc(ACTIVITY_OBJ_FILE), + dbesc('%"hash":"' . $hash . '"%') ); - if($r) { + if($y) { $dmid = item_message_id(); - $updateverb = ACTIVITY_FILE . '/drop/' . $hash . '#' . $mid; + + $object['mid'] = $mid; //attach mid for update object $arr = array(); @@ -979,14 +1021,17 @@ function file_activity($channel_id, $hash, $allow_cid, $allow_gid, $deny_cid, $d $arr['author_xchan'] = $poster['xchan_hash']; $arr['owner_xchan'] = $poster['xchan_hash']; $arr['title'] = ''; - $arr['allow_cid'] = $allow_cid; - $arr['allow_gid'] = $allow_gid; - $arr['deny_cid'] = $deny_cid; - $arr['deny_gid'] = $deny_gid; + //updates must be visible to everybody -> perms may have changed + $arr['allow_cid'] = ''; + $arr['allow_gid'] = ''; + $arr['deny_cid'] = ''; + $arr['deny_gid'] = ''; $arr['item_restrict'] = ITEM_HIDDEN; $arr['item_private'] = 0; - $arr['verb'] = $updateverb; - $arr['body'] = $url; + $arr['verb'] = ACTIVITY_UPDATE; + $arr['obj_type'] = $objtype; + $arr['object'] = json_encode($object); + $arr['body'] = ''; $post = item_store($arr); $item_id = $post['item_id']; @@ -995,7 +1040,9 @@ function file_activity($channel_id, $hash, $allow_cid, $allow_gid, $deny_cid, $d proc_run('php',"include/notifier.php","activity",$item_id); } - //call_hooks('post_local_end', $arr); + call_hooks('post_local_end', $arr); + + unset($object['mid']); //remove mid for new object //notice( t('File activity updated') . EOL); @@ -1025,9 +1072,11 @@ function file_activity($channel_id, $hash, $allow_cid, $allow_gid, $deny_cid, $d $arr['deny_cid'] = $deny_cid; $arr['deny_gid'] = $deny_gid; $arr['item_restrict'] = ITEM_HIDDEN; - $arr['item_private'] = 0; - $arr['verb'] = $verb; - $arr['body'] = $url; + $arr['item_private'] = $private; + $arr['verb'] = $activity; + $arr['obj_type'] = $objtype; + $arr['object'] = json_encode($object); + $arr['body'] = ''; $post = item_store($arr); $item_id = $post['item_id']; @@ -1036,9 +1085,9 @@ function file_activity($channel_id, $hash, $allow_cid, $allow_gid, $deny_cid, $d proc_run('php',"include/notifier.php","activity",$item_id); } - //call_hooks('post_local_end', $arr); + call_hooks('post_local_end', $arr); - //(($action === 'post') ? notice( t('File activity posted') . EOL) : notice( t('File activity dropped') . EOL)); + //(($verb === 'post') ? notice( t('File activity posted') . EOL) : notice( t('File activity dropped') . EOL)); return; diff --git a/mod/filestorage.php b/mod/filestorage.php index 67abc2eab..9852f4e73 100644 --- a/mod/filestorage.php +++ b/mod/filestorage.php @@ -21,7 +21,6 @@ function filestorage_post(&$a) { $recurse = ((x($_POST, 'recurse')) ? intval($_POST['recurse']) : 0); $resource = ((x($_POST, 'filehash')) ? notags($_POST['filehash']) : ''); - $no_activity = ((x($_POST, 'no_activity')) ? intval($_POST['no_activity']) : 0); if(! $resource) { @@ -40,10 +39,7 @@ function filestorage_post(&$a) { $channel = $a->get_channel(); $cloudPath = get_parent_cloudpath($channel_id, $channel['channel_address'], $resource); - $filename = find_filename_by_hash($channel_id, $resource); - $url = $cloudPath . $filename; - - file_activity($channel_id, $resource, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, $url, 'post', $no_activity); + file_activity($channel_id, $resource, $cloudPath, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, 'post', $no_activity); goaway($cloudPath); } diff --git a/mod/sharedwithme.php b/mod/sharedwithme.php index d4aa129ac..53884788d 100644 --- a/mod/sharedwithme.php +++ b/mod/sharedwithme.php @@ -1,5 +1,4 @@ 1) && (argv(1) === 'dropall')) { - q("DELETE FROM item WHERE verb LIKE '%s' AND uid = %d", - dbesc($postverb . '%'), + q("DELETE FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d", + dbesc(ACTIVITY_POST), + dbesc(ACTIVITY_OBJ_FILE), intval(local_user()) ); @@ -77,11 +83,13 @@ function sharedwithme_content(&$a) { } //list files - $r = q("SELECT * FROM item WHERE verb LIKE '%s' AND uid = %d", - dbesc($postverb . '%'), - intval(local_user()) + $r = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d AND owner_xchan != '%s'", + dbesc(ACTIVITY_POST), + dbesc(ACTIVITY_OBJ_FILE), + intval(local_user()), + dbesc($channel['channel_hash']) ); - + $o = profile_tabs($a, $is_owner, $channel['channel_address']); $o .= '
'; @@ -96,19 +104,15 @@ function sharedwithme_content(&$a) { if($r) { foreach($r as $rr) { - //don't display the files we shared with others - if($rr['owner_xchan'] != $channel['channel_hash']) { - unobscure($rr); - $url = rawurldecode($rr['body']); - $o .= '' . $url . ' 

'; - } + $object = json_decode($rr['object'],true); + $url = rawurldecode($object['link']['href']); + $o .= '' . $url . ' 

'; } } $o .= '
'; return $o; - } -- cgit v1.2.3