Merge pull request #1067 from woocommerce/fix/reuse-existing-feed

Reuse existing feed

bin/install-wp-tests.sh

@@ -188,17 +188,20 @@ install_wc() {
     # Grab the necessary plugins.
     if [ $WC_VERSION == 'trunk' ]; then
       rm -rf "$TMPDIR"/woocommerce-trunk
-      git clone --quiet --depth=1 --branch="$LATEST_WC_VERSION" https://github.com/woocommerce/woocommerce.git "${TMPDIR}/woocommerce-trunk"
+      git clone --quiet --depth=1 --branch="$LATEST_WC_VERSION" https://github.com/woocommerce/woocommerce.git "$TMPDIR"/woocommerce-trunk
+
+      # Install composer for WooCommerce
+      cd "$TMPDIR"/woocommerce-trunk/plugins/woocommerce
+      composer install --ignore-platform-reqs --no-interaction --no-dev
+
+      # Symlink woocommerce plugin
       mv "$TMPDIR"/woocommerce-trunk/plugins/woocommerce/* "$WC_DIR"
     else
       echo "Test with specified WooCommerce version ${WC_VERSION} is not yet supported."
       exit 1
     fi
 
-    # Install composer for WooCommerce
-    cd "${WC_DIR}"
-    composer install --ignore-platform-reqs --no-interaction --no-dev
-
+    cd "$WC_DIR"
 	# Generate feature config for WooCommerce
 	GENERATE_FEATURE_CONFIG=bin/generate-feature-config.php
 	if [ -f $GENERATE_FEATURE_CONFIG ]; then

i18n/languages/pinterest-for-woocommerce.pot

@@ -2,16 +2,16 @@
 # This file is distributed under the GPL-2.0+.
 msgid ""
 msgstr ""
-"Project-Id-Version: Pinterest for WooCommerce 1.4.6\n"
+"Project-Id-Version: Pinterest for WooCommerce 1.4.10\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/pinterest-for-woocommerce\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-08-26T09:32:11+00:00\n"
+"POT-Creation-Date: 2024-09-19T14:58:29+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"X-Generator: WP-CLI 2.10.0\n"
+"X-Generator: WP-CLI 2.11.0\n"
 "X-Domain: pinterest-for-woocommerce\n"
 
 #. Plugin Name of the plugin
@@ -243,7 +243,7 @@ msgstr ""
 
 #: src/API/Base.php:421
 #: src/API/Base.php:806
-#: src/Merchants.php:140
+#: src/Merchants.php:141
 msgid "Auto-created by Pinterest for WooCommerce"
 msgstr ""
 
@@ -523,11 +523,11 @@ msgid "Could not register feed."
 msgstr ""
 
 #. translators: %1$s is a country ISO 2 code, %2$s is a currency ISO 3 code.
-#: src/Feeds.php:119
+#: src/Feeds.php:125
 msgid "Created by Pinterest for WooCommerce at %1$s %2$s|%3$s|%4$s"
 msgstr ""
 
-#: src/Feeds.php:143
+#: src/Feeds.php:149
 msgid "There was a previous error trying to create a feed."
 msgstr ""
 
@@ -538,32 +538,32 @@ msgid "Pinterest says: %1$s"
 msgstr ""
 
 #. translators: %s is the locale code.
-#: src/LocaleMapper.php:107
+#: src/LocaleMapper.php:109
 msgid "No matching Pinterest API locale found for %s"
 msgstr ""
 
-#: src/Merchants.php:71
+#: src/Merchants.php:72
 msgid "Wrong response when trying to create or update merchant."
 msgstr ""
 
-#: src/Merchants.php:79
+#: src/Merchants.php:80
 msgid "There was an error trying to get the merchant object."
 msgstr ""
 
-#: src/Merchants.php:84
-#: src/Merchants.php:177
+#: src/Merchants.php:85
+#: src/Merchants.php:183
 msgid "Response error when trying to create a merchant or update the existing one."
 msgstr ""
 
-#: src/Merchants.php:107
+#: src/Merchants.php:108
 msgid "Response error when trying to get advertisers."
 msgstr ""
 
-#: src/Merchants.php:113
+#: src/Merchants.php:114
 msgid "No merchant returned in the advertiser's response."
 msgstr ""
 
-#: src/Merchants.php:160
+#: src/Merchants.php:166
 msgid "There was a previous error trying to create or update merchant."
 msgstr ""
 
@@ -617,14 +617,14 @@ msgstr ""
 
 #. translators: %1$s: Pinterest API message (reason of the failure).
 #: src/Notes/FeedDeletionFailure.php:63
-msgid "The Pinterest For WooCommerce plugin has failed to delete the feed.<br/>%1$s<br/>Please, contact support to resolve the issue."
+msgid "The Pinterest For WooCommerce plugin has failed to delete the feed.<br/>%1$s<br/>Please, contact Pinterest support to resolve the issue."
 msgstr ""
 
-#: src/Notes/FeedDeletionFailure.php:75
+#: src/Notes/FeedDeletionFailure.php:80
 msgid "Pinterest For WooCommerce Feed Deletion Failed."
 msgstr ""
 
-#: src/Notes/FeedDeletionFailure.php:84
+#: src/Notes/FeedDeletionFailure.php:89
 msgid "Dismiss"
 msgstr ""
 
@@ -658,12 +658,12 @@ msgid "Tracking advertiser or tag missing"
 msgstr ""
 
 #. translators: plugin version.
-#: src/PluginUpdate.php:176
+#: src/PluginUpdate.php:181
 msgid "Plugin updated to version: %s."
 msgstr ""
 
 #. translators: 1: plugin version, 2: failed procedure, 3: error message.
-#: src/PluginUpdate.php:199
+#: src/PluginUpdate.php:204
 msgid "Plugin update to version %1$s. Procedure: %2$s. Error: %3$s"
 msgstr ""
 
@@ -685,17 +685,17 @@ msgid "The product [%s] has a description longer than the allowed limit."
 msgstr ""
 
 #. translators: 1: The URL of the connection page
-#: src/ProductSync.php:156
+#: src/ProductSync.php:157
 msgid "The domain is not verified, visit the <a href=\"%1$s\">connection</a> page to verify it."
 msgstr ""
 
 #. translators: 1: The URL of the connection page
-#: src/ProductSync.php:172
+#: src/ProductSync.php:173
 msgid "The tracking tag is not configured, visit the <a href=\"%1$s\">connection</a> page to configure it."
 msgstr ""
 
 #. translators: 1: The URL of the settings page
-#: src/ProductSync.php:187
+#: src/ProductSync.php:188
 msgid "Visit the <a href=\"%1$s\">settings</a> page to enable it."
 msgstr ""
 

src/API/Base.php

@@ -120,7 +120,7 @@ public static function make_request( $endpoint, $method = 'POST', $payload = arr
 				'pinterest_for_woocommerce_disconnect_on_authentication_failure',
 				'__return_true'
 			);
-			if ( in_array( $e->getCode(), array( 401, 403 ) ) && $do_disconnect ) {
+			if ( $do_disconnect && 401 === $e->getCode() ) {
 				/**
 				 * Actions to perform disconnecting the merchant from the Pinterest platform.
 				 *

src/Exception/FeedNotFoundException.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * FeedNotFoundException class.
+ *
+ * @package Automattic\WooCommerce\Pinterest\Exception
+ */
+
+declare( strict_types=1 );
+
+namespace Automattic\WooCommerce\Pinterest\Exception;
+
+use Exception;
+
+/**
+ * Exception thrown when there is no matching feed at Pinterest.
+ */
+class FeedNotFoundException extends Exception {}

src/Feeds.php

@@ -13,9 +13,11 @@
 }
 
 use Automattic\WooCommerce\Pinterest\API\APIV5;
+use Automattic\WooCommerce\Pinterest\Exception\FeedNotFoundException;
 use Automattic\WooCommerce\Pinterest\Exception\PinterestApiLocaleException;
 use Automattic\WooCommerce\Pinterest\Notes\FeedDeletionFailure;
 use Exception;
+use Pinterest_For_Woocommerce;
 use Throwable;
 
 /**
@@ -102,7 +104,11 @@ public static function create_feed(): string {
 		$name             = (string) parse_url( esc_url( get_site_url() ), PHP_URL_HOST );
 		$default_country  = Pinterest_For_Woocommerce()::get_base_country();
 		$default_currency = get_woocommerce_currency();
-		$default_locale   = LocaleMapper::get_locale_for_api();
+		try {
+			$default_locale = LocaleMapper::get_locale_for_api();
+		} catch ( PinterestApiLocaleException $e ) {
+			$default_locale = LocaleMapper::PINTEREST_DEFAULT_LOCALE;
+		}
 
 		/**
 		 * Filters the default feed name: pinterest_for_woocommerce_unique_feed_name.
@@ -276,9 +282,6 @@ public static function invalidate_feeds_cache() {
 	 * @throws PinterestApiLocaleException No valid locale found to check for the registered feed.
 	 */
 	public static function match_local_feed_configuration_to_registered_feeds( array $feeds = array() ): string {
-		$local_country = Pinterest_For_Woocommerce()::get_base_country();
-		$local_locale  = LocaleMapper::get_locale_for_api();
-
 		if ( empty( $feeds ) ) {
 			$feeds = static::get_feeds();
 		}
@@ -287,9 +290,6 @@ public static function match_local_feed_configuration_to_registered_feeds( array
 		$config  = reset( $configs );
 
 		foreach ( $feeds as $feed ) {
-			$old_name_match = is_null( $feed['name'] );
-			$new_name_match = 0 === strpos( $feed['name'] ?? '', 'Created by Pinterest for WooCommerce' );
-
 			/**
 			 * Match feeds created by Pinterest for WooCommerce extension in both API v3 and v5 versions.
 			 *
@@ -299,10 +299,7 @@ public static function match_local_feed_configuration_to_registered_feeds( array
 			 * When trying to match remote feed to a local configuration, we need to check both cases
 			 * not to create a new feed if the feed was created by the extension in the past.
 			 */
-			$does_match = $old_name_match || $new_name_match;
-			$does_match = $does_match && $local_country === $feed['default_country'] ?? '';
-			$does_match = $does_match && $local_locale === $feed['default_locale'] ?? '';
-			$does_match = $does_match && $config['feed_url'] === $feed['location'] ?? '';
+			$does_match = self::does_feed_match( $feed ) && ( $feed['location'] ?? '' ) === $config['feed_url'];
 			if ( $does_match ) {
 				return $feed['id'];
 			}
@@ -311,6 +308,55 @@ public static function match_local_feed_configuration_to_registered_feeds( array
 		return '';
 	}
 
+	/**
+	 * Tests if the feed is a match.
+	 *
+	 * @param array $feed A feed information array from Pinterest API response.
+	 *
+	 * @since x.x.x
+	 * @return bool
+	 */
+	private static function does_feed_match( array $feed ): bool {
+		$local_country = Pinterest_For_Woocommerce::get_base_country();
+		try {
+			$local_locale = LocaleMapper::get_locale_for_api();
+		} catch ( PinterestApiLocaleException $e ) {
+			$local_locale = LocaleMapper::PINTEREST_DEFAULT_LOCALE;
+		}
+
+		$does_match = ( $feed['default_country'] ?? '' ) === $local_country;
+		if ( ! $does_match ) {
+			return false;
+		}
+
+		$does_match = ( $feed['default_locale'] ?? '' ) === $local_locale;
+		if ( ! $does_match ) {
+			return false;
+		}
+
+		return 0 === strpos( $feed['location'] ?? '', get_site_url() );
+	}
+
+	/**
+	 * Compare remote feeds to local configuration to find a matching feed.
+	 *
+	 * @since x.x.x
+	 * @return string - Remote feed ID that matches.
+	 * @throws FeedNotFoundException When there is no matching feed at Pinterest.
+	 */
+	public static function maybe_remote_feed(): string {
+		$feeds = self::get_feeds();
+		foreach ( $feeds as $feed ) {
+			if ( self::does_feed_match( $feed ) ) {
+				$last_dash_position = strrpos( $feed['location'], '-' ) + 1;
+				$last_dot_position  = strrpos( $feed['location'], '.' );
+				$length_of_the_id   = $last_dot_position - $last_dash_position;
+				return substr( $feed['location'], $last_dash_position, $length_of_the_id );
+			}
+		}
+		throw new FeedNotFoundException();
+	}
+
 	/**
 	 * Check if the registered feed is enabled.
 	 *
@@ -319,6 +365,7 @@ public static function match_local_feed_configuration_to_registered_feeds( array
 	 *
 	 * @throws PinterestApiException Pinterest API Exception.
 	 * @since 1.2.13
+	 * @deprecated
 	 */
 	public static function is_local_feed_enabled( string $feed_id ): bool {
 		if ( empty( $feed_id ) ) {

src/LocalFeedConfigs.php

@@ -7,6 +7,8 @@
  */
 namespace Automattic\WooCommerce\Pinterest;
 
+use Automattic\WooCommerce\Pinterest\Exception\FeedNotFoundException;
+
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
@@ -68,7 +70,14 @@ protected function __construct() {
 	private function initialize_local_feeds_config( $locations ) {
 		$feed_ids = Pinterest_For_Woocommerce()::get_data( 'local_feed_ids' );
 		if ( empty( $feed_ids ) ) {
-			$feed_ids = array();
+			try {
+				$remote_feed_id = Feeds::maybe_remote_feed();
+				$feed_ids       = array(
+					Pinterest_For_Woocommerce()::get_base_country() => $remote_feed_id,
+				);
+			} catch ( FeedNotFoundException $e ) {
+				$feed_ids = array();
+			}
 		}
 
 		foreach ( $locations as $location ) {

src/LocaleMapper.php

@@ -77,6 +77,8 @@ class LocaleMapper {
 		'pt-BR'  => 1,
 	);
 
+	const PINTEREST_DEFAULT_LOCALE = 'en-US';
+
 	/**
 	 * Get Pinterest locale code for API.
 	 * Pinterest API uses hyphens instead of underscores in locale codes so we need to replace them.
@@ -112,6 +114,7 @@ public static function get_locale_for_api(): string {
 
 	/**
 	 * Get WordPress locale code.
+	 * WordPress defaults to en_US locale if nothing is found.
 	 *
 	 * @since 1.2.13
 	 * @return string

src/Merchants.php

@@ -13,6 +13,7 @@
 }
 
 use Automattic\WooCommerce\Pinterest\API\Base;
+use Automattic\WooCommerce\Pinterest\Exception\PinterestApiLocaleException;
 use \Exception;
 use \Throwable;
 
@@ -143,12 +144,17 @@ public static function update_or_create_merchant() {
 		$feed_location = parse_url( $config['feed_url'] );
 		$feed_location = ! empty( $feed_location['host'] ) ? $config['feed_url'] : get_home_url() . $feed_location['path'];
 
+		try {
+			$locale = LocaleMapper::get_locale_for_api();
+		} catch ( PinterestApiLocaleException $e ) {
+			$locale = LocaleMapper::PINTEREST_DEFAULT_LOCALE;
+		}
 		$args = array(
 			'merchant_domains' => get_home_url(),
 			'feed_location'    => $feed_location,
 			'feed_format'      => 'XML',
 			'country'          => Pinterest_For_Woocommerce()::get_base_country(),
-			'locale'           => LocaleMapper::get_locale_for_api(),
+			'locale'           => $locale,
 			'currency'         => get_woocommerce_currency(),
 			'merchant_name'    => $merchant_name,
 		);