fixed: comment on answer notified comment owner

Author: jeabakker

classes/ColdTrick/Questions/Notifications.php

@@ -83,8 +83,12 @@ public static function addQuestionOwnerToCommentSubscribers(\Elgg\Hook $hook) {
 
 		/* @var $owner \ElggUser */
 		$owner = $question->getOwnerEntity();
+		if ($object->owner_guid === $owner->guid) {
+			// don't add question owner if it's the comment owner
+			return;
+		}
 
-		$filtered_methods = array_keys(array_filter($owner->getNotificationSettings()));
+		$filtered_methods = array_keys(array_filter($owner->getNotificationSettings('create_comment')));
 		if (empty($filtered_methods)) {
 			return;
 		}
@@ -109,17 +113,17 @@ public static function addQuestionSubscribersToCommentSubscribers(\Elgg\Hook $ho
 			return;
 		}
 
-		$object = $event->getObject();
-		if (!$object instanceof \ElggComment) {
+		$comment = $event->getObject();
+		if (!$comment instanceof \ElggComment) {
 			return;
 		}
 
-		$container = $object->getContainerEntity();
-		if (!$container instanceof \ElggAnswer) {
+		$answer = $comment->getContainerEntity();
+		if (!$answer instanceof \ElggAnswer) {
 			return;
 		}
 
-		$question = $container->getContainerEntity();
+		$question = $answer->getContainerEntity();
 		if (!$question instanceof \ElggQuestion) {
 			// something went wrong, maybe access
 			return;
@@ -130,6 +134,11 @@ public static function addQuestionSubscribersToCommentSubscribers(\Elgg\Hook $ho
 			return;
 		}
 
+		if (isset($subscribers[$comment->owner_guid])) {
+			// remove the comment owner from the subscribers
+			unset($subscribers[$comment->owner_guid]);
+		}
+		
 		return ($hook->getValue() + $subscribers);
 	}
 }

classes/ColdTrick/Questions/Notifications/Subscriptions.php

@@ -21,6 +21,9 @@ public static function createAnswer(\Elgg\Event $event) {
 		/* @var $owner \ElggUser */
 		$owner = $object->getOwnerEntity();
 		$question = $object->getContainerEntity();
+		if (!$question instanceof \ElggQuestion) {
+			return;
+		}
 
 		if ($question->hasMutedNotifications($owner->guid)) {
 			return;
@@ -57,7 +60,10 @@ public static function createCommentOnAnswer(\Elgg\Event $event) {
 
 		/* @var $owner \ElggUser */
 		$owner = $object->getOwnerEntity();
-		$question = $object->getContainerEntity();
+		$question = $answer->getContainerEntity();
+		if (!$question instanceof \ElggQuestion) {
+			return;
+		}
 
 		if ($question->hasMutedNotifications($owner->guid)) {
 			return;