Attachments: dedupe earlier to prevent incorrect max_media (#565)

mattwiebe · web-flow · commit c35ddf1935e4 · 2023-11-17T18:44:59.000+01:00
diff --git a/includes/transformer/class-post.php b/includes/transformer/class-post.php
@@ -185,7 +185,6 @@ protected function get_block_attachments( $max_media ) {
 			$blocks = \parse_blocks( $this->wp_post->post_content );
 			$media_ids = self::get_media_ids_from_blocks( $blocks, $media_ids, $max_media );
 		}
-		$media_ids = \array_unique( $media_ids );
 
 		return \array_filter( \array_map( array( self::class, 'wp_attachment_to_activity_attachment' ), $media_ids ) );
 	}
@@ -279,6 +278,9 @@ protected static function get_media_ids_from_blocks( $blocks, $media_ids, $max_m
 					break;
 			}
 
+			// depupe
+			$media_ids = \array_unique( $media_ids );
+
 			// stop doing unneeded work
 			if ( count( $media_ids ) >= $max_media ) {
 				break;

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,6 @@ protected function get_block_attachments( $max_media ) {`
`185`	`185`	`$blocks = \parse_blocks( $this->wp_post->post_content );`
`186`	`186`	`$media_ids = self::get_media_ids_from_blocks( $blocks, $media_ids, $max_media );`
`187`	`187`	`}`
`188`		`- $media_ids = \array_unique( $media_ids );`
`189`	`188`
`190`	`189`	`return \array_filter( \array_map( array( self::class, 'wp_attachment_to_activity_attachment' ), $media_ids ) );`
`191`	`190`	`}`
`@@ -279,6 +278,9 @@ protected static function get_media_ids_from_blocks( $blocks, $media_ids, $max_m`
`279`	`278`	`break;`
`280`	`279`	`}`
`281`	`280`
	`281`	`+ // depupe`
	`282`	`+ $media_ids = \array_unique( $media_ids );`
	`283`	`+`
`282`	`284`	`// stop doing unneeded work`
`283`	`285`	`if ( count( $media_ids ) >= $max_media ) {`
`284`	`286`	`break;`