update item_normal() to not include ACTIVITY_OBJ_FILE obj_type

3 files changed, 9 insertions, 16 deletions

diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index 66032aada..4deb7c9e8 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -533,13 +533,12 @@ class Network extends \Zotlabs\Web\Controller {
 	
 				if($parents_str) {
 					$update_unseen = " AND ( id IN ( " . dbesc($parents_str) . " )";
-					$update_unseen .= " AND obj_type != '" . dbesc(ACTIVITY_OBJ_FILE) . "'";
 					$update_unseen .= " OR ( parent IN ( " . dbesc($parents_str) . " ) AND verb in ( '" . dbesc(ACTIVITY_LIKE) . "','" . dbesc(ACTIVITY_DISLIKE) . "' ))) ";
 				}
 			}
 			else {
 				if($parents_str) {
-					$update_unseen = " AND parent IN ( " . dbesc($parents_str) . " ) AND obj_type != '" . dbesc(ACTIVITY_OBJ_FILE) . "'";
+					$update_unseen = " AND parent IN ( " . dbesc($parents_str) . " )";
 				}
 			}
 		}
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php
index c91659f2f..5e2d04c1f 100644
--- a/Zotlabs/Module/Ping.php
+++ b/Zotlabs/Module/Ping.php
@@ -169,15 +169,13 @@ class Ping extends \Zotlabs\Web\Controller {
 			$r = q("SELECT * FROM item
 				WHERE uid = %d
 				AND author_xchan != '%s'
-				AND obj_type != '%s'
 				AND item_unseen = 1
 				AND created > '" . datetime_convert('UTC','UTC',$_SESSION['static_loadtime']) . "'
 				$item_normal
 				ORDER BY created DESC
 				LIMIT 300",
 				intval($sys['channel_id']),
-				dbesc(get_observer_hash()),
-				dbesc(ACTIVITY_OBJ_FILE)
+				dbesc(get_observer_hash())
 			);
 
 			if($r) {
@@ -313,11 +311,9 @@ class Ping extends \Zotlabs\Web\Controller {
 			$r = q("SELECT * FROM item
 				WHERE item_unseen = 1 and uid = %d $item_normal
 				AND author_xchan != '%s'
-				AND obj_type != '%s'
 				ORDER BY created DESC limit 300",
 				intval(local_channel()),
-				dbesc($ob_hash),
-				dbesc(ACTIVITY_OBJ_FILE)
+				dbesc($ob_hash)
 			);
 
 			if($r) {
@@ -487,11 +483,9 @@ class Ping extends \Zotlabs\Web\Controller {
 			$r = q("SELECT id, item_wall FROM item
 				WHERE item_unseen = 1 and uid = %d
 				$item_normal
-				AND author_xchan != '%s'
-				AND obj_type != '%s'",
+				AND author_xchan != '%s'",
 				intval(local_channel()),
-				dbesc($ob_hash),
-				dbesc(ACTIVITY_OBJ_FILE)
+				dbesc($ob_hash)
 			);
 
 			if($r) {
diff --git a/include/items.php b/include/items.php
index dd8b394d3..08e53553b 100755
--- a/include/items.php
+++ b/include/items.php
@@ -173,19 +173,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.item_blocked = 0 and item.obj_type != '" . ACTIVITY_OBJ_FILE . "' ";
 }
 
 function item_normal_search() {
 	return " and item.item_hidden = 0 and item.item_type in (0,3,6) 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.item_blocked = 0 and item.obj_type != '" . ACTIVITY_OBJ_FILE . "' ";
 }
 
 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.item_blocked = 0 and item.obj_type != '" . ACTIVITY_OBJ_FILE . "' ";
 }
 
 
@@ -201,7 +201,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']))
+		|| intval($item['item_blocked']) || ($item['obj_type'] == ACTIVITY_OBJ_FILE))
 		return false;
 
 	return true;