some work on deprecating ACTIVITY_OBJ_FILE

5 files changed, 20 insertions, 9 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);
 		}