implement unfollow thread

include/conversation.php

@@ -917,6 +917,9 @@ function item_photo_menu($item){
 		if($item['parent'] == $item['id'] && $channel && ($channel_hash != $item['author_xchan'])) {
 			$sub_link = 'javascript:dosubthread(' . $item['id'] . '); return false;';
 		}
+		if($channel) {
+			$unsub_link = 'javascript:dounsubthread(' . $item['id'] . '); return false;';
+		}
 	}
 
 	$profile_link = chanlink_hash($item['author_xchan']);
@@ -941,6 +944,7 @@ function item_photo_menu($item){
 	$menu = Array(
 		t("View Source") => $vsrc_link,
 		t("Follow Thread") => $sub_link,
+		t("Stop Following") => $unsub_link,
 		t("View Status") => $status_link,
 		t("View Profile") => $profile_link,
 		t("View Photos") => $photos_link,

include/items.php

@@ -2837,6 +2837,8 @@ function store_diaspora_comment_sig($datarray, $channel, $parent_item, $post_id,
 function send_status_notifications($post_id,$item) {
 
 	$notify = false;
+	$unfollowed = false;
+
 	$parent = 0;
 
 	$r = q("select channel_hash from channel where channel_id = %d limit 1",
@@ -2864,6 +2866,14 @@ function send_status_notifications($post_id,$item) {
 		foreach($x as $xx) {
 			if($xx['author_xchan'] === $r[0]['channel_hash']) {
 				$notify = true;
+
+				// 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) 
+					&& ($xx['obj_type'] === ACTIVITY_OBJ_NOTE || $xx['obj_type'] === ACTIVITY_OBJ_PHOTO) 
+					&& ($xx['parent'] != $xx['id']))
+					$unfollowed = true;				
 			}
 			if($xx['id'] == $xx['parent']) {
 				$parent = $xx['parent'];
@@ -2871,6 +2881,9 @@ function send_status_notifications($post_id,$item) {
 		}
 	}
 
+	if($unfollowed)
+		return;
+
 	$link =  get_app()->get_baseurl() . '/display/' . $item['mid'];
 
 	$y = q("select id from notify where link = '%s' and uid = %d limit 1",

mod/subthread.php

@@ -11,9 +11,12 @@ function subthread_content(&$a) {
 		return;
 	}
 
-	$activity = ACTIVITY_FOLLOW;
+	if(argv(1) === 'sub')
+		$activity = ACTIVITY_FOLLOW;
+	elseif(argv(1) === 'unsub')
+		$activity = ACTIVITY_UNFOLLOW;
 
-	$item_id = ((argc() > 1) ? notags(trim(argv(1))) : 0);
+	$item_id = ((argc() > 2) ? notags(trim(argv(2))) : 0);
 
 	$r = q("SELECT * FROM `item` WHERE `parent` = '%s' OR `parent_mid` = '%s' and parent = id LIMIT 1",
 		dbesc($item_id),
@@ -67,6 +70,8 @@ function subthread_content(&$a) {
 		killme();
 
 
+
+
 	$mid = item_message_id();
 
 	$post_type = (($item['resource_type'] === 'photo') ? t('photo') : t('status'));
@@ -99,7 +104,10 @@ function subthread_content(&$a) {
 	if(! intval($item['item_thread_top']))
 		$post_type = 'comment';		
 
-	$bodyverb = t('%1$s is following %2$s\'s %3$s');
+	if($activity === ACTIVITY_FOLLOW)
+		$bodyverb = t('%1$s is following %2$s\'s %3$s');
+	if($activity === ACTIVITY_UNFOLLOW)
+		$bodyverb = t('%1$s stopped following %2$s\'s %3$s');
 
 	$arr = array();
 
@@ -144,100 +152,7 @@ function subthread_content(&$a) {
 	killme();
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-	$post_type = (($item['resource_id']) ? t('photo') : t('status'));
-	$objtype = (($item['resource_id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE ); 
-
-	$link = xmlify('<link rel="alternate" type="text/html" href="' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
-	$body = $item['body'];
-
-	$obj = <<< EOT
-
-	<object>
-		<type>$objtype</type>
-		<local>1</local>
-		<id>{$item['mid']}</id>
-		<link>$link</link>
-		<title></title>
-		<content>$body</content>
-	</object>
-EOT;
-
-	$arr = array();
-
-	$arr['mid'] = $mid;
-	$arr['uid'] = $owner_uid;
-	$arr['contact-id'] = $contact['id'];
-	$arr['type'] = 'activity';
-	$arr['wall'] = $item['wall'];
-	$arr['origin'] = 1;
-	$arr['gravity'] = GRAVITY_LIKE;
-	$arr['parent'] = $item['id'];
-	$arr['parent-mid'] = $item['mid'];
-	$arr['thr_parent'] = $item['mid'];
-	$arr['owner-name'] = $remote_owner['name'];
-	$arr['owner-link'] = $remote_owner['url'];
-	$arr['owner-avatar'] = $remote_owner['thumb'];
-	$arr['author-name'] = $contact['name'];
-	$arr['author-link'] = $contact['url'];
-	$arr['author-avatar'] = $contact['thumb'];
-	
-	$ulink = '[zrl=' . $contact['url'] . ']' . $contact['name'] . '[/zrl]';
-	$alink = '[zrl=' . $item['author-link'] . ']' . $item['author-name'] . '[/zrl]';
-	$plink = '[zrl=' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/zrl]';
-	$arr['body'] =  sprintf( $bodyverb, $ulink, $alink, $plink );
-
-	$arr['verb'] = $activity;
-	$arr['object-type'] = $objtype;
-	$arr['object'] = $obj;
-	$arr['allow_cid'] = $item['allow_cid'];
-	$arr['allow_gid'] = $item['allow_gid'];
-	$arr['deny_cid'] = $item['deny_cid'];
-	$arr['deny_gid'] = $item['deny_gid'];
-	$arr['visible'] = 1;
-	$arr['unseen'] = 1;
-	$arr['last-child'] = 0;
-
-	$post = item_store($arr);	
-	$post_id = $post['item_id'];
-
-	if(! $item['visible']) {
-		$r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d AND `uid` = %d",
-			intval($item['id']),
-			intval($owner_uid)
-		);
-	}			
-
-	$arr['id'] = $post_id;
-
-	call_hooks('post_local_end', $arr);
-
-	killme();
-
 }
 
 
+

version.inc

@@ -1 +1 @@
-2015-11-02.1204
+2015-11-03.1205

view/js/main.js

@@ -836,10 +836,20 @@ function dropItem(url, object) {
 function dosubthread(ident) {
 	unpause();
 	$('#like-rotator-' + ident.toString()).spin('tiny');
-	$.get('subthread/' + ident.toString(), NavUpdate );
+	$.get('subthread/sub/' + ident.toString(), NavUpdate );
 	liking = 1;
 }
 
+
+function dounsubthread(ident) {
+	unpause();
+	$('#like-rotator-' + ident.toString()).spin('tiny');
+	$.get('subthread/unsub/' + ident.toString(), NavUpdate );
+	liking = 1;
+}
+
+
+
 function dostar(ident) {
 	ident = ident.toString();
 	$('#like-rotator-' + ident).spin('tiny');