Unhook the parser included with ActivityPub 0.14

akirk · Dec 30, 2022 · a6556f1 · a6556f1
1 parent c9d946f
commit a6556f1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/feed-parsers/class-feed-parser-activitypub.php b/feed-parsers/class-feed-parser-activitypub.php
@@ -538,7 +538,7 @@ function( $m ) use ( &$protected_tags ) {
 
 	public function replace_with_links( $result ) {
 		$users = $this->get_possible_mentions();
-		if ( isset( $users[ $result[0] ] ) ) {
+		if ( class_exists( '\\Activitypub\\Mention' ) && isset( $users[ $result[0] ] ) ) {
 			return \Activitypub\Mention::replace_with_links( array( $users[ $result[0] ] ) );
 		}
 

diff --git a/friends.php b/friends.php
@@ -120,16 +120,23 @@ function( Feed $friends_feed ) {
 add_action(
 	'friends_load_parsers',
 	function( \Friends\Feed $friends_feed ) {
-		if ( class_exists( 'Friends_Feed_Parser_ActivityPub' ) ) {
-			// Was included in ActivityPub 0.14.
-			return;
-		}
-
 		if ( ! class_exists( '\Activitypub\Activitypub' ) ) {
 			// ActivityPub plugin not active.
 			return;
 		}
 
+		global $wp_filter;
+		if ( isset( $wp_filter['friends_load_parsers']->callbacks[10] ) && class_exists( '\\ReflectionFunction' ) ) {
+			// Unhook the parser from ActivityPub 0.14.
+			foreach ( $wp_filter['friends_load_parsers']->callbacks[10] as $key => $hook ) {
+				$r = new \ReflectionFunction( $hook['function'] );
+				if ( \str_ends_with( $r->getFileName(), 'activitypub.php' ) ) {
+					remove_filter( 'friends_load_parsers', $hook['function'], 10 );
+					break;
+				}
+			}
+		}
+
 		require_once __DIR__ . '/feed-parsers/class-feed-parser-activitypub.php';
 		$friends_feed->register_parser( Feed_Parser_ActivityPub::SLUG, new Feed_Parser_ActivityPub( $friends_feed ) );
 	},