release: fixes

- Fixed issue with import job failing when it has one of the source feeds invalid
- Updated dependencies

Author: vytisbulkevicius

.github/workflows/build-dev-artifacts.yml

@@ -61,6 +61,8 @@ jobs:
       pr_number: ${{ steps.get-pr-number.outputs.num }}
       comment_body: ${{ steps.get-comment-body.outputs.body }}
     steps:
+      - name: Check out source files
+        uses: actions/checkout@v4
       - name: Get PR number
         id: get-pr-number
         run: echo "::set-output name=num::$(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }')"
@@ -76,9 +78,20 @@ jobs:
 
       - name: Get comment body
         id: get-comment-body
+        env:
+          GITHUB_REPO_NAME: ${{ github.event.pull_request.base.repo.name }}
+          DEV_ZIP_BRANCH_NAME: ${{ needs.dev-zip.outputs.branch-name }}
+          DEV_ZIP_GIT_SHA_8: ${{ needs.dev-zip.outputs.git-sha-8 }}
+          GITHUB_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
         run: |
+          previewLink=$(node ./bin/generatePlaygroundPreviewLink.js)
+
           body="Plugin build for ${{ github.event.pull_request.head.sha }} is ready :bellhop_bell:!
-          - Download [build](https://verti-artifacts.s3.amazonaws.com/${{ github.event.pull_request.base.repo.name }}-${{ needs.dev-zip.outputs.branch-name }}-${{ needs.dev-zip.outputs.git-sha-8 }}/feedzy-rss-feeds.zip)"
+          - Download [build](https://verti-artifacts.s3.amazonaws.com/${{ github.event.pull_request.base.repo.name }}-${{ needs.dev-zip.outputs.branch-name }}-${{ needs.dev-zip.outputs.git-sha-8 }}/feedzy-rss-feeds.zip)
+
+          > [!NOTE]
+          > You can preview the changes in the <a href=\"$previewLink\" target=\"_blank\">Playground</a>
+          "
           body="${body//$'\n'/'%0A'}"
           echo "::set-output name=body::$body"
       - name: Create comment on PR with links to plugin builds

bin/generatePlaygroundPreviewLink.js

@@ -0,0 +1,28 @@
+#!/usr/bin/env node
+// Read GitHub Action environment variables.
+const repoName = process.env.GITHUB_REPO_NAME || '';
+const branchName = process.env.DEV_ZIP_BRANCH_NAME || '';
+const gitSha8 = process.env.DEV_ZIP_GIT_SHA_8 || '';
+
+// Create the blueprint object with necessary schema and options.
+const blueprint = {
+	preferredVersions: {
+		php: '8.0',
+	},
+	plugins: [
+		'wpide',
+		`https://verti-artifacts.s3.amazonaws.com/${repoName}-${branchName}-${gitSha8}/feedzy-rss-feeds.zip`,
+	],
+	login: true,
+	landingPage: '/wp-admin/post-new.php?post_type=feedzy_imports',
+	features: {
+		networking: true,
+	},
+};
+
+// Convert the blueprint object to JSON and then encode it in Base64.
+const blueprintJson = JSON.stringify(blueprint);
+const encodedBlueprint = Buffer.from(blueprintJson).toString('base64');
+
+// Output the full preview link.
+process.stdout.write('https://playground.wordpress.net/#' + encodedBlueprint);

composer.lock

@@ -1,4 +1,4 @@
-.feedzy-wrap *{
+.feedzy-wrap > *{
 	box-sizing: border-box;
 	margin: 0;
 	padding: 0;
@@ -115,30 +115,22 @@
 	display: none;
 }
 
-.feedzy-banner:has(.tsdk-banner-cta) {
+:is(.feedzy-banner, .feedzy-banner-dashboard):not(.themeisle-sale) {
+	visibility: hidden;
+}
+
+.feedzy-banner:has(.themeisle-sale) {
 	margin: 0 auto;
 	display: flex;
 	justify-content: center;
 	margin-bottom: 20px;
+	max-width: 1224px;
+	padding: 0 12px;
 }
 
-.feedzy-banner:has(.tsdk-banner-cta) .tsdk-banner-urgency-text {
-	padding: 5px;
-}
-
-.feedzy-banner-dashboard {
-	display: none;
-}
-
-.feedzy-banner-dashboard:has(.tsdk-banner-cta) {
-	display: block;
-	margin: 20px 0;
-
-	/* Remove the properties added by .notice */
-	background: transparent;
-	border: unset;
-	box-shadow: unset;
-	padding: unset;
+.feedzy-banner .themeisle-sale {
+	width: 100%;
+	margin: 0;
 }
 
 .feedzy-container{

css/settings.css

@@ -849,7 +849,7 @@ function( $time ) use ( $cache_time ) {
 		}
 
 		if ( isset( $_SERVER['HTTP_USER_AGENT'] ) ) {
-			$set_server_agent = sanitize_text_field( wp_unslash( $_SERVER['HTTP_USER_AGENT'] ) );
+			$set_server_agent = sanitize_text_field( wp_unslash( $_SERVER['HTTP_USER_AGENT'] ) . SIMPLEPIE_USERAGENT );
 			$feed->set_useragent( apply_filters( 'http_headers_useragent', $set_server_agent ) );
 		}
 

img/black-friday.jpg

@@ -77,6 +77,8 @@ function( $data, $page_slug ) {
 			);
 		}
 
+		add_filter( 'themeisle_sdk_blackfriday_data', array( $this, 'add_black_friday_data' ) );
+
 		/**
 		 * Load SDK dependencies.
 		 */
@@ -89,13 +91,6 @@ function( $data, $page_slug ) {
 				$this->add_banner_anchor();
 			}
 
-			if ( in_array( $page_slug, array( 'imports', 'categories', 'settings' ), true ) ) {
-				$license_data = get_option( 'feedzy_rss_feeds_pro_license_data', array() );
-				if ( self::plan_category( $license_data ) <= 1 ) {
-					do_action( 'themeisle_sdk_load_banner', 'feedzy' );
-				}
-			}
-
 			if (
 				in_array( $page_slug, array( 'imports', 'new-category', 'settings' ), true )
 				&& 'yes' === get_option( 'feedzy_rss_feeds_logger_flag', false )
@@ -2369,4 +2364,44 @@ private function enable_telemetry() {
 		add_filter( 'themeisle_sdk_enable_telemetry', '__return_true' );
 		wp_enqueue_script( $this->plugin_name . '_telemetry', FEEDZY_ABSURL . 'js/telemetry.js', array(), $this->version, true );
 	}
+
+	/**
+	 * Set the black friday data.
+	 *
+	 * @param array $configs The configuration array for the loaded products.
+	 * @return array
+	 */
+	public function add_black_friday_data( $configs ) {
+		$config = $configs['default'];
+
+		// translators: %1$s - HTML tag, %2$s - discount, %3$s - HTML tag, %4$s - product name.
+		$message_template = __( 'Our biggest sale of the year: %1$sup to %2$s OFF%3$s on %4$s. Don\'t miss this limited-time offer.', 'feedzy-rss-feeds' );
+		$product_label    = 'Feedzy';
+		$discount         = '70%';
+
+		$is_pro = feedzy_is_pro();
+
+		if ( $is_pro ) {
+			// translators: %1$s - HTML tag, %2$s - discount, %3$s - HTML tag, %4$s - product name.
+			$message_template = __( 'Get %1$sup to %2$s off%3$s when you upgrade your %4$s plan or renew early.', 'feedzy-rss-feeds' );
+			$product_label    = 'Feedzy Pro';
+			$discount         = '30%';
+		}
+
+		$product_label = sprintf( '<strong>%s</strong>', $product_label );
+		$url_params    = array(
+			'utm_term' => $is_pro ? 'plan-' . apply_filters( 'product_feedzy_license_plan', 0 ) : 'free',
+			'lkey'     => $is_pro ? apply_filters( 'product_feedzy_license_key', false ) : false
+		);
+
+		$config['message']  = sprintf( $message_template, '<strong>', $discount, '</strong>', $product_label );
+		$config['sale_url'] = add_query_arg(
+			$url_params,
+			tsdk_translate_link( tsdk_utmify( 'https://themeisle.link/feedzy-bf', 'bfcm', 'feedzy' ) )
+		);
+
+		$configs[ $this->plugin_name ] = $config;
+
+		return $configs;
+	}
 }