feat: load survey via internal pages

Author: Soare-Robert-Daniel

includes/admin/class-rop-admin.php

@@ -421,7 +421,11 @@ public function enqueue_scripts() {
 			wp_deregister_script( 'vue-libs' );
 		}
 
-		$this->register_survey();
+		if ( ! defined( 'TI_E2E_TESTING' ) || ! TI_E2E_TESTING ) {
+			add_filter( 'themeisle-sdk/survey/' . ROP_PRODUCT_SLUG, array( $this, 'get_survey_metadata'), 10, 2 );
+		}
+		do_action( 'themeisle_internal_page', ROP_PRODUCT_SLUG, 'dashboard' );
+
 		if ( ! defined( 'ROP_PRO_VERSION' ) ) {
 			do_action( 'themeisle_sdk_load_banner', 'rop' );
 		}
@@ -1735,65 +1739,52 @@ public static function rop_check_reached_sharing_limit( $sharing_type = 'tw' ) {
 	/**
 	 * Get the data used for the survey.
 	 *
+	 * @param array  $data The data for survey in Formbricks format.
+	 * @param string $page_slug The slug of the page.
+	 *
 	 * @return array The survey metadata.
 	 */
-	public function get_survey_metadata() {
+	public function get_survey_metadata( $data, $page_slug ) {
 		$license_data = get_option( 'tweet_old_post_pro_license_data', array() );
-		$attributes   = array();
-		$user_id      = 'rop_' . ( ! empty( $license_data->key ) ? $license_data->key : preg_replace( '/[^\w\d]*/', '', get_site_url() ) ); // Use a normalized version of the site URL as a user ID for free users.
 
-		$days_since_install = round( ( time() - get_option( 'rop_first_install_date', 0 ) ) / DAY_IN_SECONDS );
-		$install_category   = 0; // Normalized value.
-		if ( 0 === $days_since_install || 1 === $days_since_install ) {
+		$install_days_number = intval( ( time() - get_option( 'rop_first_install_date', time() ) ) / DAY_IN_SECONDS );
+		$install_category    = 0; // Normalized value.
+
+		if ( 0 === $install_days_number || 1 === $install_days_number ) {
 			$install_category = 0;
-		} elseif ( 1 < $days_since_install && 8 > $days_since_install ) {
+		} elseif ( 1 < $install_days_number && 8 > $install_days_number ) {
 			$install_category = 7;
-		} elseif ( 8 <= $days_since_install && 31 > $days_since_install ) {
+		} elseif ( 8 <= $install_days_number && 31 > $install_days_number ) {
 			$install_category = 30;
-		} elseif ( 30 < $days_since_install && 90 > $days_since_install ) {
+		} elseif ( 30 < $install_days_number && 90 > $install_days_number ) {
 			$install_category = 90;
-		} elseif ( 90 <= $days_since_install ) {
+		} elseif ( 90 <= $install_days_number ) {
 			$install_category = 91;
 		}
 
-		$attributes['days_since_install'] = strval( $install_category );
-		$attributes['license_status']     = ! empty( $license_data->license ) ? $license_data->license : 'invalid';
-		$attributes['free_version']       = $this->version;
+		$data = array(
+			'environmentId' => 'clwgcs7ia03df11mgz7gh15od',
+			'attributes'    => array(
+				'days_since_install'  => strval( $install_category ),
+				'license_status'      => ! empty( $license_data->license ) ? $license_data->license : 'invalid',
+				'free_version'        => $this->version,
+				'install_days_number' => $install_days_number,
+			),
+		);
 
 		if ( ! empty( $license_data->plan ) ) {
-			$attributes['plan'] = strval( $license_data->plan );
+			$data['attributes']['plan'] = strval( $license_data->plan );
 		}
 
-		if ( defined( 'ROP_PRO_VERSION' ) ) {
-			$attributes['pro_version'] = ROP_PRO_VERSION;
-		}
-
-		return array(
-			'userId'     => $user_id,
-			'attributes' => $attributes,
-		);
-	}
-
-	/**
-	 * Register the survey script.
-	 *
-	 * It does not register if we are in a testing environment.
-	 *
-	 * @return void
-	 */
-	public function register_survey() {
-
-		if ( defined( 'TI_E2E_TESTING' ) && TI_E2E_TESTING ) {
-			return;
+		if ( ! empty( $license_data->key ) ) {
+			$data['attributes']['license_key'] = apply_filters( 'themeisle_sdk_secret_masking', $license_data->key );
 		}
 
-		$survey_handler = apply_filters( 'themeisle_sdk_dependency_script_handler', 'survey' );
-		if ( empty( $survey_handler ) ) {
-			return;
+		if ( defined( 'ROP_PRO_VERSION' ) ) {
+			$data['attributes']['pro_version'] = ROP_PRO_VERSION;
 		}
 
-		do_action( 'themeisle_sdk_dependency_enqueue_script', 'survey' );
-		wp_localize_script( $survey_handler, 'ropSurveyData', $this->get_survey_metadata() );
+		return $data;
 	}
 
 	/**

tweet-old-post.php

@@ -172,6 +172,7 @@ function run_rop() {
 	define( 'ROP_LITE_URL', plugin_dir_url( __FILE__ ) );
 	define( 'ROP_STATUS_ALERT', 6 ); // How many consecutive errors count towards status alert "Status: Error (check logs)"
 	define( 'ROP_TEMP_IMAGES', plugin_dir_path( __FILE__ ) . 'temp-images/' ); // Path for external images downloaded for sharing
+	define( 'ROP_PRODUCT_SLUG', basename( ROP_PATH ) );
 
 	// Authorization APP Data
 	define( 'ROP_AUTH_APP_URL', 'https://app.revive.social' );

vue/src/rop_main.js

@@ -21,17 +21,4 @@ window.addEventListener( 'load', function () {
 			store.dispatch( 'fetchAJAXPromise', {req: 'get_active_accounts'} )
 		},
 	} );
-} );
-
-/**
- * Initialize the formbricks survey.
- * 
- * @see https://github.com/formbricks/setup-examples/tree/main/html
- */
-window.addEventListener('themeisle:survey:loaded', function () {
-    window?.tsdk_formbricks?.init?.({
-        environmentId: "clwgcs7ia03df11mgz7gh15od",
-        apiHost: "https://app.formbricks.com",
-        ...(window?.ropSurveyData ?? {}),
-    });
-});
+} );