Merge pull request #554 from GatherPress/correct-meta-keys

Remove _ from event and venue meta keys.
GatherPress · Feb 18, 2024 · 3dcb9c5 · 3dcb9c5
2 parents 42c0c27 + b93bb61
commit 3dcb9c5
Show file tree

Hide file tree

Showing 28 changed files with 51 additions and 51 deletions.
diff --git a/build/blocks/events-list/events-list.asset.php b/build/blocks/events-list/events-list.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'react-dom', 'wp-api-fetch', 'wp-components', 'wp-data', 'wp-dom-ready', 'wp-element', 'wp-i18n'), 'version' => '544880ff338d8ccff8ca');
+<?php return array('dependencies' => array('react', 'react-dom', 'wp-api-fetch', 'wp-components', 'wp-data', 'wp-dom-ready', 'wp-element', 'wp-i18n'), 'version' => '380b1cff8defae071d12');
diff --git a/build/blocks/events-list/events-list.js b/build/blocks/events-list/events-list.js
diff --git a/build/blocks/events-list/index.asset.php b/build/blocks/events-list/index.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n'), 'version' => '4abed82a496f41f1331c');
+<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n'), 'version' => '0a3fc55d2d1001698116');
diff --git a/build/blocks/events-list/index.js b/build/blocks/events-list/index.js
diff --git a/build/blocks/online-event/index.asset.php b/build/blocks/online-event/index.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n'), 'version' => '9a2c88cc2643e563f963');
+<?php return array('dependencies' => array('react', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n'), 'version' => '3d490eba28b954298b23');
diff --git a/build/blocks/online-event/index.js b/build/blocks/online-event/index.js
diff --git a/build/blocks/online-event/online-event.asset.php b/build/blocks/online-event/online-event.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-components', 'wp-data', 'wp-dom-ready', 'wp-element', 'wp-i18n'), 'version' => 'fc0087c5b56d9367eea5');
+<?php return array('dependencies' => array('react', 'wp-components', 'wp-data', 'wp-dom-ready', 'wp-element', 'wp-i18n'), 'version' => '2885c7db3505b947ee06');
diff --git a/build/blocks/online-event/online-event.js b/build/blocks/online-event/online-event.js
diff --git a/build/blocks/rsvp/index.asset.php b/build/blocks/rsvp/index.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'react-dom', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n'), 'version' => '5f0770103fe9bfa2b0a6');
+<?php return array('dependencies' => array('react', 'react-dom', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n'), 'version' => '77bb891a5092540a12c2');
diff --git a/build/blocks/rsvp/index.js b/build/blocks/rsvp/index.js
diff --git a/build/blocks/rsvp/rsvp.asset.php b/build/blocks/rsvp/rsvp.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'react-dom', 'wp-api-fetch', 'wp-components', 'wp-data', 'wp-dom-ready', 'wp-element', 'wp-i18n'), 'version' => '5cbd53eb1c07d034b630');
+<?php return array('dependencies' => array('react', 'react-dom', 'wp-api-fetch', 'wp-components', 'wp-data', 'wp-dom-ready', 'wp-element', 'wp-i18n'), 'version' => 'd7cc3da7e1f48eaab21c');
diff --git a/build/blocks/rsvp/rsvp.js b/build/blocks/rsvp/rsvp.js
diff --git a/build/blocks/venue/index.asset.php b/build/blocks/venue/index.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('moment', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n'), 'version' => 'c518a05eb64374adcd69');
+<?php return array('dependencies' => array('moment', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n'), 'version' => 'bae7a7b1ab0d4fa8d028');
diff --git a/build/blocks/venue/index.js b/build/blocks/venue/index.js
diff --git a/build/blocks/venue/venue.asset.php b/build/blocks/venue/venue.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-components', 'wp-data', 'wp-dom-ready', 'wp-element', 'wp-i18n'), 'version' => '45799fe7d3784f3e347e');
+<?php return array('dependencies' => array('react', 'wp-components', 'wp-data', 'wp-dom-ready', 'wp-element', 'wp-i18n'), 'version' => 'cb3a95a3f635bb108e85');
diff --git a/build/blocks/venue/venue.js b/build/blocks/venue/venue.js
diff --git a/build/panels.asset.php b/build/panels.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('moment', 'react', 'wp-api-fetch', 'wp-components', 'wp-data', 'wp-date', 'wp-edit-post', 'wp-element', 'wp-i18n', 'wp-plugins'), 'version' => '5cbe33b7e8ac982931fd');
+<?php return array('dependencies' => array('moment', 'react', 'wp-api-fetch', 'wp-components', 'wp-data', 'wp-date', 'wp-edit-post', 'wp-element', 'wp-i18n', 'wp-plugins'), 'version' => '6d392ba00e9ef6095b1e');
diff --git a/build/panels.js b/build/panels.js
diff --git a/includes/core/classes/class-event.php b/includes/core/classes/class-event.php
@@ -170,7 +170,7 @@ public static function get_post_type_registration_args(): array {
 	 */
 	public static function get_post_meta_registration_args(): array {
 		return array(
-			'_online_event_link'    => array(
+			'online_event_link'     => array(
 				'auth_callback'     => function () {
 					return current_user_can( 'edit_posts' );
 				},
@@ -640,7 +640,7 @@ public function get_venue_information(): array {
 		}
 
 		if ( is_a( $venue, 'WP_Post' ) ) {
-			$venue_meta                        = json_decode( get_post_meta( $venue->ID, '_venue_information', true ) );
+			$venue_meta                        = json_decode( get_post_meta( $venue->ID, 'venue_information', true ) );
 			$venue_information['full_address'] = $venue_meta->fullAddress ?? ''; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 			$venue_information['phone_number'] = $venue_meta->phoneNumber ?? ''; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 			$venue_information['website']      = $venue_meta->website ?? '';
@@ -932,7 +932,7 @@ function ( $key ) {
 	 * @return string The online event link if all conditions are met; otherwise, an empty string.
 	 */
 	public function maybe_get_online_event_link(): string {
-		$event_link = (string) get_post_meta( $this->event->ID, '_online_event_link', true );
+		$event_link = (string) get_post_meta( $this->event->ID, 'online_event_link', true );
 
 		/**
 		 * Filters whether to force the display of the online event link.

diff --git a/includes/core/classes/class-rest-api.php b/includes/core/classes/class-rest-api.php
@@ -685,7 +685,7 @@ public function prepare_event_data( WP_REST_Response $response ): WP_REST_Respon
 		// - The user is attending the event.
 		// - The event is in the future.
 		// - The code is not in an admin context.
-		$response->data['meta']['_online_event_link'] = $event->maybe_get_online_event_link();
+		$response->data['meta']['online_event_link'] = $event->maybe_get_online_event_link();
 
 		return $response;
 	}

diff --git a/includes/core/classes/class-venue.php b/includes/core/classes/class-venue.php
@@ -140,7 +140,7 @@ public static function get_post_type_registration_args(): array {
 	 */
 	public static function get_post_meta_registration_args(): array {
 		return array(
-			'_venue_information' => array(
+			'venue_information' => array(
 				'auth_callback'     => static function () {
 					return current_user_can( 'edit_posts' );
 				},
@@ -388,7 +388,7 @@ public function get_venue_meta( int $post_id, string $post_type ): array {
 			$venue_meta['name'] = get_the_title( $venue_post );
 			$venue_meta         = array_merge(
 				$venue_meta,
-				(array) json_decode( get_post_meta( $venue_post->ID, '_venue_information', true ) )
+				(array) json_decode( get_post_meta( $venue_post->ID, 'venue_information', true ) )
 			);
 		}
 

diff --git a/src/blocks/online-event/edit.js b/src/blocks/online-event/edit.js
@@ -32,7 +32,7 @@ const Edit = ({ isSelected }) => {
 	const onlineEventLink = useSelect(
 		(select) =>
 			select('core/editor')?.getEditedPostAttribute('meta')
-				?._online_event_link
+				?.online_event_link
 	);
 
 	return (

diff --git a/src/blocks/venue/edit.js b/src/blocks/venue/edit.js
@@ -54,15 +54,15 @@ const Edit = ({ attributes, setAttributes, isSelected }) => {
 	const onlineEventLink = useSelect(
 		(select) =>
 			select('core/editor')?.getEditedPostAttribute('meta')
-				?._online_event_link
+				?.online_event_link
 	);
 
 	let { mapShow } = attributes;
 
 	let venueInformationMetaData = useSelect(
 		(select) =>
 			select('core/editor')?.getEditedPostAttribute('meta')
-				?._venue_information
+				?.venue_information
 	);
 
 	if (venueInformationMetaData) {

diff --git a/src/components/OnlineEventLink.js b/src/components/OnlineEventLink.js
@@ -28,13 +28,13 @@ const OnlineEventLink = () => {
 	const onlineEventLinkMetaData = useSelect(
 		(select) =>
 			select('core/editor').getEditedPostAttribute('meta')
-				._online_event_link
+				.online_event_link
 	);
 	const [onlineEventLink, setOnlineEventLink] = useState(
 		onlineEventLinkMetaData
 	);
 	const updateEventLink = (value) => {
-		const meta = { _online_event_link: value };
+		const meta = { online_event_link: value };
 
 		editPost({ meta });
 		setOnlineEventLink(value);

diff --git a/src/components/VenueInformation.js b/src/components/VenueInformation.js
@@ -30,15 +30,15 @@ const VenueInformation = () => {
 			...venueInformationMetaData,
 			[key]: value,
 		});
-		const meta = { _venue_information: payload };
+		const meta = { venue_information: payload };
 
 		editPost({ meta });
 	};
 
 	let venueInformationMetaData = useSelect(
 		(select) =>
 			select('core/editor').getEditedPostAttribute('meta')
-				._venue_information
+				.venue_information
 	);
 
 	if (venueInformationMetaData) {

diff --git a/src/components/VenueSelector.js b/src/components/VenueSelector.js
@@ -59,7 +59,7 @@ const VenueSelector = () => {
 		let venueInformation = {};
 
 		if (venueSlug && Array.isArray(venuePost)) {
-			const jsonString = venuePost[0]?.meta?._venue_information ?? '{}';
+			const jsonString = venuePost[0]?.meta?.venue_information ?? '{}';
 
 			if (jsonString) {
 				venueInformation = JSON.parse(jsonString);

diff --git a/test/unit/php/includes/core/classes/class-test-event.php b/test/unit/php/includes/core/classes/class-test-event.php
@@ -72,17 +72,17 @@ public function test_get_post_meta_registration_args(): void {
 		$args = Event::get_post_meta_registration_args();
 
 		$this->assertIsArray(
-			$args['_online_event_link'],
-			'Failed to assert that _online_event_link is an array.'
+			$args['online_event_link'],
+			'Failed to assert that online_event_link is an array.'
 		);
 		$this->assertIsArray(
 			$args['enable_anonymous_rsvp'],
-			'Failed to assert that _online_event_link is an array.'
+			'Failed to assert that online_event_link is an array.'
 		);
 
 		$this->mock->user( 'subscriber' );
 		$this->assertFalse(
-			$args['_online_event_link']['auth_callback'](),
+			$args['online_event_link']['auth_callback'](),
 			'Failed to assert that user cannot edit posts.'
 		);
 		$this->assertFalse(
@@ -92,7 +92,7 @@ public function test_get_post_meta_registration_args(): void {
 
 		$this->mock->user( 'admin' );
 		$this->assertTrue(
-			$args['_online_event_link']['auth_callback'](),
+			$args['online_event_link']['auth_callback'](),
 			'Failed to assert that user can edit posts.'
 		);
 		$this->assertTrue(
@@ -448,7 +448,7 @@ public function test_get_venue_information(): void {
 		$event      = new Event( $event_id );
 		$venue_info = '{"fullAddress":"123 Main Street, Montclair, NJ 07042","phoneNumber":"(123) 123-1234","website":"https://gatherpress.org/"}';
 
-		update_post_meta( $venue->ID, '_venue_information', $venue_info );
+		update_post_meta( $venue->ID, 'venue_information', $venue_info );
 		wp_set_post_terms( $event_id, '_unit-test-venue', Venue::TAXONOMY );
 
 		$response = $event->get_venue_information();
@@ -549,7 +549,7 @@ public function test_get_calendar_links(): void {
 			'datetime_end'   => '2020-05-11 17:00:00',
 		);
 
-		update_post_meta( $venue->ID, '_venue_information', $venue_info );
+		update_post_meta( $venue->ID, 'venue_information', $venue_info );
 		wp_set_post_terms( $post->ID, '_unit-test-venue', Venue::TAXONOMY );
 
 		$event->save_datetimes( $params );
@@ -827,7 +827,7 @@ public function test_maybe_get_online_event_link(): void {
 
 		$event->save_datetimes( $params );
 
-		update_post_meta( $event_id, '_online_event_link', $link );
+		update_post_meta( $event_id, 'online_event_link', $link );
 
 		$this->assertEmpty(
 			$event->maybe_get_online_event_link(),

diff --git a/test/unit/php/includes/core/classes/class-test-venue.php b/test/unit/php/includes/core/classes/class-test-venue.php
@@ -79,19 +79,19 @@ public function test_get_post_type_registration_args(): void {
 	public function test_get_post_meta_registration_args(): void {
 		$args = Venue::get_post_meta_registration_args();
 
-		$this->assertIsArray( $args['_venue_information'], 'Failed to assert that _online_event_link is an array.' );
+		$this->assertIsArray( $args['venue_information'], 'Failed to assert that _online_event_link is an array.' );
 
 		$this->mock->user( 'subscriber' );
 
 		$this->assertFalse(
-			$args['_venue_information']['auth_callback'](),
+			$args['venue_information']['auth_callback'](),
 			'Failed to assert false on auth_callback for subscriber'
 		);
 
 		$this->mock->user( 'admin' );
 
 		$this->assertTrue(
-			$args['_venue_information']['auth_callback'](),
+			$args['venue_information']['auth_callback'](),
 			'Failed to assert true on auth_callback for admin'
 		);
 	}