Merge branch 'trunk' into add/emoji-support

Author: obenland

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 * Support for custom emoji in interaction contents and actor names
+* Added a filter to make custom comment types manageable in WP.com Calypso
 
 ### Fixed
 

integration/class-jetpack.php

@@ -7,6 +7,8 @@
 
 namespace Activitypub\Integration;
 
+use Activitypub\Comment;
+
 /**
  * Jetpack integration class.
  */
@@ -17,6 +19,8 @@ class Jetpack {
 	 */
 	public static function init() {
 		\add_filter( 'jetpack_sync_post_meta_whitelist', array( self::class, 'add_sync_meta' ) );
+		\add_filter( 'jetpack_json_api_comment_types', array( self::class, 'add_comment_types' ) );
+		\add_filter( 'jetpack_api_include_comment_types_count', array( self::class, 'add_comment_types' ) );
 	}
 
 	/**
@@ -37,4 +41,14 @@ public static function add_sync_meta( $allow_list ) {
 		);
 		return \array_merge( $allow_list, $activitypub_meta_keys );
 	}
+
+	/**
+	 * Add custom comment types to the list of comment types.
+	 *
+	 * @param array $comment_types Default comment types.
+	 * @return array
+	 */
+	public static function add_comment_types( $comment_types ) {
+		return array_unique( \array_merge( $comment_types, Comment::get_comment_type_slugs() ) );
+	}
 }

readme.txt

@@ -135,6 +135,7 @@ For reasons of data protection, it is not possible to see the followers of other
 = Unreleased =
 
 * Added: Support for custom emoji in interaction contents and actor names
+* Added: A filter to make custom comment types manageable in WP.com Calypso
 * Fixed: Undefined array key warnings in various places
 
 = 4.6.0 =