some work on deprecating ACTIVITY_OBJ_FILE

7 files changed, 104 insertions, 25 deletions

diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 322579610..9b79190bb 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -1131,7 +1131,6 @@ class Activity {
 			'http://activitystrea.ms/schema/1.0/photo'          => 'Image',
 			'http://activitystrea.ms/schema/1.0/profile-photo'  => 'Icon',
 			'http://activitystrea.ms/schema/1.0/event'          => 'Event',
-			'http://activitystrea.ms/schema/1.0/wiki'           => 'Document',
 			'http://purl.org/zot/activity/location'             => 'Place',
 			'http://purl.org/zot/activity/chessgame'            => 'Game',
 			'http://purl.org/zot/activity/tagterm'              => 'zot:Tag',
@@ -1139,7 +1138,10 @@ class Activity {
 			'http://purl.org/zot/activity/file'                 => 'zot:File',
 			'http://purl.org/zot/activity/mood'                 => 'zot:Mood',
 			'Invite'                                            => 'Invite',
-			'Question'                                          => 'Question'
+			'Question'                                          => 'Question',
+			'Document'					    => 'Document',
+			'Audio'						    => 'Audio',
+			'Video'						    => 'Video'
 		];
 
 		call_hooks('activity_obj_decode_mapper',$objs);
@@ -1167,7 +1169,6 @@ class Activity {
 			'http://activitystrea.ms/schema/1.0/photo'          => 'Image',
 			'http://activitystrea.ms/schema/1.0/profile-photo'  => 'Icon',
 			'http://activitystrea.ms/schema/1.0/event'          => 'Event',
-			'http://activitystrea.ms/schema/1.0/wiki'           => 'Document',
 			'http://purl.org/zot/activity/location'             => 'Place',
 			'http://purl.org/zot/activity/chessgame'            => 'Game',
 			'http://purl.org/zot/activity/tagterm'              => 'zot:Tag',
@@ -1175,7 +1176,9 @@ class Activity {
 			'http://purl.org/zot/activity/file'                 => 'zot:File',
 			'http://purl.org/zot/activity/mood'                 => 'zot:Mood',
 			'Invite'                                            => 'Invite',
-			'Question'                                          => 'Question'
+			'Question'                                          => 'Question',
+			'Audio'						    => 'Audio',
+			'Video'					            => 'Video'
 		];
 
 		call_hooks('activity_obj_mapper',$objs);
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index 85e90d67c..a4fc8aa75 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -818,6 +818,9 @@ class Enotify {
 				$itemem_text = sprintf( t('repeated %s\'s post'), '[bdi]' . $item['author']['xchan_name'] . '[/bdi]');
 			}
 
+			if(in_array($item['obj_type'], ['Document', 'Video', 'Audio', 'Image'])) {
+				$itemem_text = t('shared a file with you');
+			}
 		}
 
 		$edit = false;
diff --git a/Zotlabs/Lib/NativeWiki.php b/Zotlabs/Lib/NativeWiki.php
index 6bda76eee..3ec032075 100644
--- a/Zotlabs/Lib/NativeWiki.php
+++ b/Zotlabs/Lib/NativeWiki.php
@@ -73,7 +73,7 @@ class NativeWiki {
 		$arr['item_thread_top'] = 1;
 		$arr['item_private'] = intval($acl->is_private());
 		$arr['verb'] = ACTIVITY_CREATE;
-		$arr['obj_type'] = ACTIVITY_OBJ_WIKI;
+		$arr['obj_type'] = 'Document';
 		$arr['body'] = '[table][tr][td][h1]New Wiki[/h1][/td][/tr][tr][td][zrl=' . $wiki_url . ']' . $wiki['htmlName'] . '[/zrl][/td][/tr][/table]';
 
 		$arr['public_policy'] = map_scope(\Zotlabs\Access\PermissionLimits::Get($channel['channel_id'],'view_wiki'),true);
diff --git a/Zotlabs/Module/Sharedwithme.php b/Zotlabs/Module/Sharedwithme.php
index c986f6695..f9d242dd3 100644
--- a/Zotlabs/Module/Sharedwithme.php
+++ b/Zotlabs/Module/Sharedwithme.php
@@ -1,5 +1,8 @@
 <?php
 namespace Zotlabs\Module;
+
+use Zotlabs\Web\Controller;
+
 require_once('include/conversation.php');
 require_once('include/text.php');
 
@@ -9,7 +12,7 @@ require_once('include/text.php');
  *
  */
 
-class Sharedwithme extends \Zotlabs\Web\Controller {
+class Sharedwithme extends Controller {
 
 	function get() {
 		if(! local_channel()) {
diff --git a/Zotlabs/Module/Sse_bs.php b/Zotlabs/Module/Sse_bs.php
index c139fd19b..e4394fe33 100644
--- a/Zotlabs/Module/Sse_bs.php
+++ b/Zotlabs/Module/Sse_bs.php
@@ -128,6 +128,7 @@ class Sse_bs extends Controller {
 				WHERE uid = %d
 				AND created <= '%s'
 				AND item_unseen = 1 AND item_wall = 0 
+				AND obj_type NOT IN ('Document', 'Video', 'Audio', 'Image')
 				AND author_xchan != '%s'
 				$item_normal
 				$sql_extra
@@ -193,6 +194,7 @@ class Sse_bs extends Controller {
 				WHERE uid = %d
 				AND created <= '%s'
 				AND item_unseen = 1 AND item_wall = 1 
+				AND obj_type NOT IN ('Document', 'Video', 'Audio', 'Image')
 				AND author_xchan != '%s'
 				$item_normal
 				$sql_extra
@@ -268,6 +270,7 @@ class Sse_bs extends Controller {
 				WHERE uid = %d
 				AND created <= '%s'
 				AND item_unseen = 1
+				AND obj_type NOT IN ('Document', 'Video', 'Audio', 'Image')
 				AND author_xchan != '%s'
 				AND created > '%s'
 				$item_normal
@@ -448,19 +451,18 @@ class Sse_bs extends Controller {
 
 		$r = q("SELECT * FROM item 
 			WHERE verb = '%s'
-			AND obj_type = '%s'
+			AND obj_type in ('Document', 'Video', 'Audio', 'Image')
 			AND uid = %d
 			AND owner_xchan != '%s'
 			AND item_unseen = 1",
 			dbesc(ACTIVITY_POST),
-			dbesc(ACTIVITY_OBJ_FILE),
 			intval(self::$uid),
 			dbesc(self::$ob_hash)
 		);
 		if($r) {
 			xchan_query($r);
 			foreach($r as $rr) {
-				$result['files']['notifications'][] = Enotify::format_files($rr);
+				$result['files']['notifications'][] = Enotify::format($rr);
 			}
 			$result['files']['count'] = count($r);
 		}
diff --git a/include/attach.php b/include/attach.php
index d986f4af1..7b5972525 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -12,6 +12,8 @@
  */
 
 use Zotlabs\Lib\Libsync;
+use Zotlabs\Access\PermissionLimits;
+use Zotlabs\Daemon\Master;
 
 require_once('include/permissions.php');
 require_once('include/security.php');
@@ -1024,9 +1026,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 	}
 
 	if($notify) {
-		$cloudPath =  z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['0']['display_path'];
-		$object = get_file_activity_object($channel['channel_id'], $r['0']['hash'], $cloudPath);
-		file_activity($channel['channel_id'], $object, $r['0']['allow_cid'], $r['0']['allow_gid'], $r['0']['deny_cid'], $r['0']['deny_gid'], 'post', $notify);
+		file_activity($channel, $observer, $r[0]);
 	}
 
 	return $ret;
@@ -1517,7 +1517,7 @@ function attach_delete($channel_id, $resource, $is_photo = 0) {
 	 */
 	call_hooks('attach_delete', $arr);
 
-	file_activity($channel_id, $object, $object['allow_cid'], $object['allow_gid'], $object['deny_cid'], $object['deny_gid'], 'update', true);
+	//file_activity($channel_id, $object, $object['allow_cid'], $object['allow_gid'], $object['deny_cid'], $object['deny_gid'], 'update', true);
 
 	return;
 }
@@ -1754,6 +1754,7 @@ function pipe_streams($in, $out, $bufsize = 16384) {
  * @param string $verb
  * @param boolean $notify
  */
+/*
 function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $verb, $notify) {
 
 	require_once('include/items.php');
@@ -1802,7 +1803,7 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
 	$uuid = item_message_id();
 	$mid = z_root() . '/item/' . $uuid;
 
-	$objtype = ACTIVITY_OBJ_FILE;
+	$objtype = 'ACTIVITY_OBJ_FILE';
 
 	$arr = array();
 	$arr['aid']           = get_account_id();
@@ -1901,6 +1902,62 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
 
 	return;
 }
+*/
+
+
+function file_activity($channel, $observer, $file) {
+
+	$filetype_parts = explode('/', $file['filetype']);
+
+	switch($filetype_parts[0]) {
+		case 'image':
+			$type = 'Image';
+			break;
+		case 'audio':
+			$type = 'Audio';
+			break;
+		case 'video':
+			$type = 'Video';
+			break;
+		default:
+			$type = 'Document';
+	}
+
+	$resource_id = $file['hash'];
+	$uuid = new_uuid();
+
+	$mid = z_root() . '/item/' . $uuid;
+
+	$arr = [];	// Initialize the array of parameters for the post
+	$arr['aid'] = $channel['channel_account_id'];
+	$arr['uuid'] = $uuid;
+	$arr['uid'] = $channel['channel_id'];
+	$arr['mid'] = $mid;
+	$arr['parent_mid'] = $mid;
+	$arr['resource_type'] = 'attach';
+	$arr['resource_id'] = $resource_id;
+	$arr['owner_xchan'] = $channel['channel_hash'];
+	$arr['author_xchan'] = $observer['xchan_hash'];
+	$arr['plink'] = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $file['display_path'];
+	$arr['llink'] = $arr['plink'];
+	$arr['title'] = $file['filename'];
+	$arr['allow_cid'] = $file['allow_cid'];
+	$arr['allow_gid'] = $file['allow_gid'];
+	$arr['deny_cid'] = $file['deny_cid'];
+	$arr['deny_gid'] = $file['deny_gid'];
+	$arr['item_origin'] = 1;
+	$arr['item_thread_top'] = 1;
+	$arr['item_private'] = (($file['allow_cid'] || $file['allow_gid'] || $file['deny_cid'] || $file['deny_gid']) ? 1 : 0);
+	$arr['verb'] = ACTIVITY_CREATE;
+	$arr['obj_type'] = $type;
+	$arr['title'] = $file['filename'];
+	$body_str = sprintf(t('%s shared a %s with you'), '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]', '[zrl=' . $arr['plink'] . ']' . t('file') . '[/zrl]');
+	$arr['body'] = $body_str;
+
+	post_activity_item($arr);
+
+}
+
 
 /**
  * @brief Create file activity object.
@@ -1917,17 +1974,28 @@ function get_file_activity_object($channel_id, $hash, $url) {
 		dbesc($hash)
 	);
 
-	$url = rawurlencode($url);
-
-	$links   = array();
-	$links[] = array(
+	$links   = [];
+	$links[] = [
 		'rel'  => 'alternate',
-		'type' => 'text/html',
+		'type' => $x[0]['filetype'],
 		'href' => $url
-	);
+	];
+
+	$filetype_parts = explode('/', $x[0]['filetype']);
+
+	switch($filetype_parts[0]) {
+		case 'audio':
+			$type = 'Audio';
+			break;
+		case 'video':
+			$type = 'Video';
+			break;
+		default:
+			$type = 'Document';
+	}
 
 	$object = array(
-		'type'  => ACTIVITY_OBJ_FILE,
+		'type'  => $type,
 		'title' => $x[0]['filename'],
 		'id'    => $url,
 		'link'  => $links,
diff --git a/include/items.php b/include/items.php
index 6fe5e1f0b..dbb4a7623 100755
--- a/include/items.php
+++ b/include/items.php
@@ -239,19 +239,19 @@ function comments_are_now_closed($item) {
 function item_normal() {
 	return " and item.item_hidden = 0 and item.item_type = 0 and item.item_deleted = 0
 		and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0
-		and item.item_blocked = 0 and item.obj_type != '" . ACTIVITY_OBJ_FILE . "' ";
+		and item.item_blocked = 0 ";
 }
 
 function item_normal_search() {
 	return " and item.item_hidden = 0 and item.item_type in (0,3,6,7) and item.item_deleted = 0
 		and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0
-		and item.item_blocked = 0 and item.obj_type != '" . ACTIVITY_OBJ_FILE . "' ";
+		and item.item_blocked = 0 ";
 }
 
 function item_normal_update() {
 	return " and item.item_hidden = 0 and item.item_type = 0
 		and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0
-		and item.item_blocked = 0 and item.obj_type != '" . ACTIVITY_OBJ_FILE . "' ";
+		and item.item_blocked = 0 ";
 }
 
 
@@ -267,7 +267,7 @@ function is_item_normal($item) {
 
 	if(intval($item['item_hidden']) || intval($item['item_type']) || intval($item['item_deleted'])
 		|| intval($item['item_unpublished']) || intval($item['item_delayed']) || intval($item['item_pending_remove'])
-		|| intval($item['item_blocked']) || ($item['obj_type'] == ACTIVITY_OBJ_FILE))
+		|| intval($item['item_blocked']))
 		return false;
 
 	return true;