From ba7d103b61b1bd1a52087768a9661589c60c5b09 Mon Sep 17 00:00:00 2001
From: Darin Kotter <darin.kotter@my.eitc.edu>
Date: Thu, 22 Oct 2020 15:03:39 -0600
Subject: [PATCH 1/3] Add new helper function to build out the list of post
 types we want to show in our language processing settings. Remove attachments
 from this list by default

---
 includes/Classifai/Helpers.php              | 28 +++++++++++++++++++++
 includes/Classifai/Providers/Watson/NLU.php |  3 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/includes/Classifai/Helpers.php b/includes/Classifai/Helpers.php
index efc292355..c2bd9ecb3 100644
--- a/includes/Classifai/Helpers.php
+++ b/includes/Classifai/Helpers.php
@@ -171,6 +171,34 @@ function get_watson_password() {
 	}
 }
 
+/**
+ * Get post types we want to show in the language processing settings
+ *
+ * @since 1.6.0
+ *
+ * @return array
+ */
+function get_post_types_for_language_settings() {
+	$post_types = get_post_types( [ 'public' => true ], 'objects' );
+
+	// Remove the attachment post type
+	unset( $post_types['attachment'] );
+
+	/**
+	 * Filter post types shown in language processing settings.
+	 *
+	 * @since 1.6.0
+	 * @hook classifai_language_settings_post_types
+	 *
+	 * @param {array} $post_types Array of post types to show in language processing settings.
+	 *
+	 * @return {array} Array of post types.
+	 */
+	$post_types = apply_filters( 'classifai_language_settings_post_types', $post_types );
+
+	return $post_types;
+}
+
 /**
  * The list of post types that get the ClassifAI taxonomies. Defaults
  * to 'post'.
diff --git a/includes/Classifai/Providers/Watson/NLU.php b/includes/Classifai/Providers/Watson/NLU.php
index ef789ba47..2e39ca04c 100644
--- a/includes/Classifai/Providers/Watson/NLU.php
+++ b/includes/Classifai/Providers/Watson/NLU.php
@@ -8,6 +8,7 @@
 use Classifai\Admin\SavePostHandler;
 use Classifai\Providers\Provider;
 use Classifai\Taxonomy\TaxonomyFactory;
+use function Classifai\get_post_types_for_language_settings;
 
 class NLU extends Provider {
 
@@ -390,7 +391,7 @@ class="<?php echo esc_attr( $class ); ?>"
 	 */
 	public function render_post_types_checkboxes( $args ) {
 		echo '<ul>';
-		$post_types = get_post_types( [ 'public' => true ], 'objects' );
+		$post_types = get_post_types_for_language_settings();
 		foreach ( $post_types as $post_type ) {
 			$args = [
 				'label_for'    => $post_type->name,

From be5c43fcfd06df91e56fa8b2ff7b59035b58f784 Mon Sep 17 00:00:00 2001
From: Darin Kotter <darin.kotter@my.eitc.edu>
Date: Fri, 23 Oct 2020 08:41:22 -0600
Subject: [PATCH 2/3] Remove test that is no longer needed

---
 .../NaturalLanguageProcessing.php             | 38 -------------------
 1 file changed, 38 deletions(-)

diff --git a/tests/e2e/wpacceptance/NaturalLanguageProcessing.php b/tests/e2e/wpacceptance/NaturalLanguageProcessing.php
index 77d529cbb..ca5484d76 100644
--- a/tests/e2e/wpacceptance/NaturalLanguageProcessing.php
+++ b/tests/e2e/wpacceptance/NaturalLanguageProcessing.php
@@ -187,44 +187,6 @@ public function testTogglePage() {
 
 	}
 
-	/**
-	 * @testdox When the user enables/disables Media under Post Types to Classify, it shows/hides Watson Keywords and other submenus under Media menu.
-	 */
-	public function testToggleMedia() {
-
-		$I = $this->openBrowserPage();
-
-		$I->login();
-
-		$I->moveTo( 'wp-admin/upload.php' );
-
-		$I->dontSeeLink( 'Watson Categories', 'edit-tags.php?taxonomy=watson-category&post_type=attachment' );
-
-		$I->dontSeeLink( 'Watson Keywords', 'edit-tags.php?taxonomy=watson-keyword&post_type=attachment' );
-
-		$I->dontSeeLink( 'Watson Concepts', 'edit-tags.php?taxonomy=watson-concept&post_type=attachment' );
-
-		$I->dontSeeLink( 'Watson Entities', 'edit-tags.php?taxonomy=watson-entity&post_type=attachment' );
-
-		$I->moveTo( 'wp-admin/admin.php?page=language_processing' );
-
-		$I->checkOptions( '#classifai-settings-attachment' );
-
-		$I->click( '#submit' );
-
-		$I->waitUntilNavigation();
-
-		$I->moveTo( 'wp-admin/upload.php' );
-
-		$I->seeLink( 'Watson Categories', 'edit-tags.php?taxonomy=watson-category&post_type=attachment' );
-
-		$I->seeLink( 'Watson Keywords', 'edit-tags.php?taxonomy=watson-keyword&post_type=attachment' );
-
-		$I->seeLink( 'Watson Concepts', 'edit-tags.php?taxonomy=watson-concept&post_type=attachment' );
-
-		$I->seeLink( 'Watson Entities', 'edit-tags.php?taxonomy=watson-entity&post_type=attachment' );
-	}
-
 	public function testWatsonWorks() {
 		$I = $this->openBrowserPage();
 

From e2949878150abf99b84a8f8fea3caf361a19b532 Mon Sep 17 00:00:00 2001
From: Tung Du <dinhtungdu@gmail.com>
Date: Mon, 26 Oct 2020 11:10:06 +0700
Subject: [PATCH 3/3] fix: remove imediate returned variable

---
 includes/Classifai/Helpers.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/includes/Classifai/Helpers.php b/includes/Classifai/Helpers.php
index c2bd9ecb3..a575ea15a 100644
--- a/includes/Classifai/Helpers.php
+++ b/includes/Classifai/Helpers.php
@@ -194,9 +194,7 @@ function get_post_types_for_language_settings() {
 	 *
 	 * @return {array} Array of post types.
 	 */
-	$post_types = apply_filters( 'classifai_language_settings_post_types', $post_types );
-
-	return $post_types;
+	return apply_filters( 'classifai_language_settings_post_types', $post_types );
 }
 
 /**