1 files changed, 4 insertions, 86 deletions

diff --git a/include/items.php b/include/items.php
index f689cc7b5..e26366af5 100644
--- a/include/items.php
+++ b/include/items.php
@@ -459,7 +459,7 @@ function post_activity_item($arr, $allow_code = false, $deliver = true) {
 
 
 	if(! $arr['mid']) {
-		$arr['uuid']         = ((x($arr,'uuid')) ? $arr['uuid'] : item_message_id());
+		$arr['uuid']         = ((x($arr,'uuid')) ? $arr['uuid'] : new_uuid());
 	}
 	$arr['mid']          = ((x($arr,'mid')) ? $arr['mid'] : z_root() . '/item/' . $arr['uuid']);
 	$arr['parent_mid']   = ((x($arr,'parent_mid')) ? $arr['parent_mid'] : $arr['mid']);
@@ -520,7 +520,7 @@ function post_activity_item($arr, $allow_code = false, $deliver = true) {
 		return $ret;
 
 	if($post_id && $deliver) {
-		Master::Summon([ 'Notifier','activity',$post_id ]);
+		Master::Summon(['Notifier','activity', $post_id]);
 	}
 
 	$ret['success'] = true;
@@ -2487,7 +2487,7 @@ function send_status_notifications($post_id,$item) {
 				// check for an unfollow thread activity - we should probably decode the obj and check the id
 				// but it will be extremely rare for this to be wrong.
 
-				if(($xx['verb'] === ACTIVITY_UNFOLLOW)
+				if((in_array($xx['verb'], ['Ignore', ACTIVITY_UNFOLLOW]))
 					&& (in_array($xx['obj_type'], ['Note', 'Image', ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_PHOTO]))
 					&& ($xx['parent'] != $xx['id']))
 					$unfollowed = true;
@@ -2514,7 +2514,6 @@ function send_status_notifications($post_id,$item) {
 	if(! $notify)
 		return;
 
-
 	Enotify::submit(array(
 		'type'         => $type,
 		'from_xchan'   => $item['author_xchan'],
@@ -2607,7 +2606,6 @@ function tag_deliver($uid, $item_id) {
 		return;
 	}
 
-
 	if ($is_group && intval($item['item_thread_top']) && intval($item['item_wall']) && $item['author_xchan'] !== $item['owner_xchan']) {
 
 		if($item['resource_type'] === 'group_item') {
@@ -2625,39 +2623,6 @@ function tag_deliver($uid, $item_id) {
 	}
 
 	/*
-	 * Seems like a good place to plug in a poke notification.
-	 */
-
-	if (stristr($item['verb'],ACTIVITY_POKE)) {
-		$poke_notify = true;
-
-		if(($item['obj_type'] == "") || (!in_array($item['obj_type'], ['Person', ACTIVITY_OBJ_PERSON])) || (! $item['obj']))
-			$poke_notify = false;
-
-		$obj = json_decode($item['obj'],true);
-		if($obj) {
-			if($obj['id'] !== $u[0]['channel_hash'])
-				$poke_notify = false;
-		}
-		if(intval($item['item_deleted']))
-			$poke_notify = false;
-
-		$verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1));
-		if($poke_notify) {
-			Enotify::submit(array(
-				'to_xchan'     => $u[0]['channel_hash'],
-				'from_xchan'   => $item['author_xchan'],
-				'type'         => NOTIFY_POKE,
-				'item'         => $item,
-				'link'         => $i[0]['llink'],
-				'verb'         => ACTIVITY_POKE,
-				'activity'     => $verb,
-				'otype'        => 'item'
-			));
-		}
-	}
-
-	/*
 	 * Do community tagging
 	 */
 
@@ -4411,7 +4376,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
 	$item_normal = item_normal();
 
 	if (! (isset($arr['include_follow']) && intval($arr['include_follow']))) {
-		$item_normal .= sprintf(" and not verb in ('%s', '%s') ",
+		$item_normal .= sprintf(" and not verb in ('Follow', 'Ignore', '%s', '%s') ",
 			dbesc(ACTIVITY_FOLLOW),
 			dbesc(ACTIVITY_UNFOLLOW)
 		);
@@ -4824,54 +4789,7 @@ function comment_local_origin($item) {
 	return false;
 }
 
-
-
-function send_profile_photo_activity($channel,$photo,$profile) {
-
-	// for now only create activities for the default profile
-
-	if(! intval($profile['is_default']))
-		return;
-
-	$arr = array();
-	$arr['item_thread_top'] = 1;
-	$arr['item_origin'] = 1;
-	$arr['item_wall'] = 1;
-
-	if(stripos($profile['gender'],t('female')) !== false)
-		$t = t('%1$s updated her %2$s');
-	elseif(stripos($profile['gender'],t('male')) !== false)
-		$t = t('%1$s updated his %2$s');
-	else
-		$t = t('%1$s updated their %2$s');
-
-	$ptext = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo['resource_id'] . ']' . t('profile photo') . '[/zrl]';
-
-	$ltext = '[zrl=' . z_root() . '/profile/' . $channel['channel_address'] . ']' . '[zmg=150x150]' . z_root() . '/photo/' . $photo['resource_id'] . '-4[/zmg][/zrl]';
-
-	$arr['body'] = sprintf($t,$channel['channel_name'],$ptext) . "\n\n" . $ltext;
-
-	$acl = new Zotlabs\Access\AccessList($channel);
-	$x = $acl->get();
-
-	$arr['allow_cid'] = $x['allow_cid'];
-
-	$arr['allow_gid'] = $x['allow_gid'];
-	$arr['deny_cid'] = $x['deny_cid'];
-	$arr['deny_gid'] = $x['deny_gid'];
-
-	$arr['uid'] = $channel['channel_id'];
-	$arr['aid'] = $channel['channel_account_id'];
-
-	$arr['owner_xchan'] = $channel['channel_hash'];
-	$arr['author_xchan'] = $channel['channel_hash'];
-
-	post_activity_item($arr);
-}
-
-
 function sync_an_item($channel_id,$item_id) {
-
 	$r = q("select * from item where id = %d",
 		intval($item_id)
 	);