some small refactorings

Author: pfefferle

includes/class-activitypub.php

@@ -54,6 +54,8 @@ public static function init() {
 
 		// Register several post_types.
 		self::register_post_types();
+
+		self::register_oembed_providers();
 	}
 
 	/**
@@ -584,4 +586,16 @@ public static function updated_postmeta( $meta_id, $object_id, $meta_key, $meta_
 			\delete_post_meta( $object_id, 'activitypub_content_visibility' );
 		}
 	}
+
+	/**
+	 * Register some Mastodon oEmbed providers.
+	 */
+	public static function register_oembed_providers() {
+		\wp_oembed_add_provider( '#https?://mastodon\.social/(@.+)/([0-9]+)#i', 'https://mastodon.social/api/oembed', true );
+		\wp_oembed_add_provider( '#https?://mastodon\.online/(@.+)/([0-9]+)#i', 'https://mastodon.online/api/oembed', true );
+		\wp_oembed_add_provider( '#https?://mastodon\.cloud/(@.+)/([0-9]+)#i', 'https://mastodon.cloud/api/oembed', true );
+		\wp_oembed_add_provider( '#https?://mstdn\.social/(@.+)/([0-9]+)#i', 'https://mstdn.social/api/oembed', true );
+		\wp_oembed_add_provider( '#https?://mastodon\.world/(@.+)/([0-9]+)#i', 'https://mastodon.world/api/oembed', true );
+		\wp_oembed_add_provider( '#https?://mas\.to/(@.+)/([0-9]+)#i', 'https://mas.to/api/oembed', true );
+	}
 }

includes/class-blocks.php

@@ -7,8 +7,8 @@
 
 namespace Activitypub;
 
-use Activitypub\Collection\Followers;
 use Activitypub\Collection\Actors;
+use Activitypub\Collection\Followers;
 
 /**
  * Block class.
@@ -339,14 +339,7 @@ public static function render_reply_block( $attrs ) {
 		$html = '';
 
 		if ( ! empty( $attrs['url'] ) ) {
-			wp_oembed_add_provider( '#https?://mastodon\.social/(@.+)/([0-9]+)#i', 'https://mastodon.social/api/oembed', true );
-
-			/**
-			 * Fires to add an oEmbed provider for the reply block.
-			 */
-			do_action( 'activitypub_reply_block_add_oembed_provider' );
-
-			$embed = wp_oembed_get( $attrs['url'] );
+			$embed = embed_get( $attrs['url'] );
 			if ( $embed ) {
 				$html .= $embed;
 			}

includes/functions.php

@@ -1568,3 +1568,19 @@ function is_self_ping( $id ) {
 
 	return false;
 }
+
+/**
+ * Get the embed of a URL.
+ *
+ * This function supports oEmbed URLs, but it is planned to also
+ * support ActivityPub in the future.
+ *
+ * @todo Add ActivityPub support.
+ *
+ * @param string $url The URL to get the embed of.
+ *
+ * @return string|false The embed of the URL or false if not found.
+ */
+function embed_get( $url ) {
+	return wp_oembed_get( $url );
+}