Merge branch 'development' into bugfix/pro/610

Author: HardeepAsrani

assets/js/build/dashboard.js

@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-editor', 'wp-element', 'wp-notices', 'wp-plugins', 'wp-primitives', 'wp-url'), 'version' => 'eb694ccc60bb285f9067');
+<?php return array('dependencies' => array('lodash', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-editor', 'wp-element', 'wp-notices', 'wp-plugins', 'wp-primitives', 'wp-url'), 'version' => '3000d00121986d2a4045');

assets/js/react/build/index.asset.php

@@ -247,6 +247,7 @@ General Settings data structure:
   "custom_messages": false,
   "custom_messages_share_order": false,
   "instant_share": true,
+  "instant_share_default": true,
   "start_time": 1706886799,
   "minute_interval": 5,
   "available_shorteners": {

assets/js/react/build/index.js

@@ -371,7 +371,7 @@ public function enqueue_scripts() {
 		$rop_api_settings['exclude_apply_limit']             = $this->limit_exclude_list();
 		$rop_api_settings['publish_now']                     = array(
 			'instant_share_enabled' => $settings->get_instant_sharing(),
-			'instant_share_by_default' => $settings->get_instant_sharing_default(),
+			'instant_share_by_default' => $settings->get_instant_sharing_by_default(),
 			'accounts' => $active_accounts,
 		);
 		$rop_api_settings['custom_messages']                 = $settings->get_custom_messages();
@@ -751,6 +751,7 @@ public function publish_now_upsell() {
 	 *
 	 * This is quite complex as it needs to check various conditions:
 	 * - If the Classic Editor plugin is active.
+	 * - If the Disabled Gutenberg plugin is active.
 	 * - If the post is saved with the Classic Editor.
 	 * - If the user has selected the Classic Editor in their profile.
 	 * - If the post is a new post (post_id is 0).
@@ -767,6 +768,11 @@ public static function is_classic_editor() {
 			return true;
 		}
 
+		// disable-gutenberg plugin is active.
+		if ( class_exists( 'DisableGutenberg' ) ) {
+			return true;
+		}
+
 		$post_id = ! empty( $_GET['post'] ) ? (int) $_GET['post'] : 0;
 
 		if ( ! class_exists( 'Classic_Editor' ) ) {

docs/rop.md

@@ -188,6 +188,7 @@ class Rop_Global_Settings {
 		'custom_messages'       => false,
 		'custom_messages_share_order'    => false,
 		'instant_share'         => true,
+		'instant_share_default' => true,
 		'start_time'            => false,
 		'minute_interval'      => 5,
 	);

includes/admin/class-rop-admin.php

@@ -584,10 +584,16 @@ public function get_instant_sharing() {
 	 * @access public
 	 * @return bool
 	 */
-	public function get_instant_sharing_default() {
-		// This option is only kept for backward compatibility.
-		$value = isset( $this->settings['instant_share_default'] ) ? $this->settings['instant_share_default'] : true;
-		return apply_filters( 'rop_instant_sharing_default', $value );
+	public function get_instant_sharing_by_default() {
+		$post_id = get_the_ID();
+		if ( $post_id ) {
+			$post = get_post( $post_id );
+			if ( $post && $post->post_status === 'publish' ) {
+				return false;
+			}
+		}
+
+		return isset( $this->settings['instant_share_default'] ) ? $this->settings['instant_share_default'] : false;
 	}
 
 	/**

includes/admin/class-rop-global-settings.php

@@ -191,6 +191,8 @@ public static function get_labels( $key = '' ) {
 				'custom_share_order_desc'     => __( 'By default message variations are shared randomly. Checking this box will cause them to share in the order they were added.', 'tweet-old-post' ),
 				'instant_share_title'         => __( 'Enable Instant Sharing Feature (Post on Publish)', 'tweet-old-post' ),
 				'instant_share_desc'          => __( 'Allows you to share posts immediately on publish/update. <a href="https://docs.revive.social/article/933-how-to-share-posts-immediately-with-revive-old-posts" target="_blank">Learn more</a>.', 'tweet-old-post' ),
+				'instant_share_default_title' => __( 'Enable Instant Sharing By Default', 'tweet-old-post' ),
+				'instant_share_default_desc'  => __( 'Instant sharing option will be checked by default when creating new posts.', 'tweet-old-post' ),
 				'cron_type_label'                => __( 'Cron Job Type', 'tweet-old-post' ),
 				'cron_type_label_desc'           => sprintf( __( 'Select the between your local built-in WordPress task scheduler, or Revive Social\'s, %1$sLearn More%2$s.', 'tweet-old-post' ), '<a href="https://docs.revive.social/article/1303-rop-local-cron-vs-remote-cron" target="_blank">', '</a>' ),
 				'cron_type_label_desc_terms'           => __( 'I understand that some site data is stored on the Revive Social\'s Remote Cron System to provide this service <a href="https://docs.revive.social/article/1317-info-we-collect-for-remote-cron-service" target="_blank">Read More Here</a>.', 'tweet-old-post' ),

includes/admin/models/class-rop-settings-model.php

@@ -59,7 +59,11 @@ const render = () => {
 	};
 
 	useEffect(() => {
-		if ('initial' === meta.rop_publish_now && postStatus !== 'publish') {
+		if (
+			'initial' === meta.rop_publish_now &&
+			postStatus !== 'publish' &&
+			ropApiSettings.publish_now.instant_share_by_default
+		) {
 			updateMetaValue('rop_publish_now', 'yes');
 		}
 	}, []);