Version 4.7.6

system/Content/Solvable.php

@@ -114,6 +114,13 @@ trait Solvable
 				$notification->recipients->attach( $comment->author() );
 				$notification->send();
 			}
+
+			$payload = [
+				'item' => $this,
+				'comment' => $comment,
+				'markedBy' => $member
+			];
+			\IPS\Api\Webhook::fire( 'content_marked_solved', $payload );
 		}
 		else
 		{
@@ -182,12 +189,30 @@ trait Solvable
 	{
 		return ( ( $this->containerAllowsMemberSolvable() OR $this->containerAllowsSolvable() ) and $this->mapped('solved_comment_id') );
 	}
-	
+
+	/**
+	 * Is this a non-admin/mod but can solve this item?
+	 *
+	 * @param \IPS\Member|null $member The member (null for currently logged in member)
+	 * @return boolean
+	 */
+	public function isNotModeratorButCanSolve( \IPS\Member $member = NULL ): bool
+	{
+		$member = $member ?: \IPS\Member::loggedIn();
+		
+		if ( $this->canSolve( $member ) and $member === $this->author() and $this->containerAllowsMemberSolvable() and ! $member->modPermissions() )
+		{
+			return TRUE;
+		}
+
+		return FALSE;
+	}
+
 	/**
 	 * Can user solve this item?
 	 *
-	 * @param	\IPS\Member	$member	The member (null for currently logged in member)
-	 * @return	bool
+	 * @param \IPS\Member|null $member The member (null for currently logged in member)
+	 * @return    bool
 	 */
 	public function canSolve( \IPS\Member $member = NULL )
 	{
@@ -200,7 +225,7 @@ trait Solvable
 		
 		if ( $this->containerAllowsSolvable() )
 		{
-			if ( $member == $this->author() and $this->containerAllowsMemberSolvable() )
+			if ( $member === $this->author() and $this->containerAllowsMemberSolvable() )
 			{
 				return TRUE;
 			}