From 4a1d81a507db977c2825dbc7e44bc878824ae61f Mon Sep 17 00:00:00 2001 From: Soare Robert Daniel Date: Mon, 24 Nov 2025 19:33:54 +0200 Subject: [PATCH 01/11] fix: update ThemeIsle link domain in sale URL (#1068) --- includes/admin/class-rop-admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/admin/class-rop-admin.php b/includes/admin/class-rop-admin.php index 0ec3f9bf..3b937035 100644 --- a/includes/admin/class-rop-admin.php +++ b/includes/admin/class-rop-admin.php @@ -1933,7 +1933,7 @@ public static function add_black_friday_data( $configs ) { $config['message'] = sprintf( $message_template, '', $discount, '', $product_label ); $config['sale_url'] = add_query_arg( $url_params, - tsdk_translate_link( tsdk_utmify( 'https://themeisle.com/rs-bf', 'bfcm', 'revive' ) ) + tsdk_translate_link( tsdk_utmify( 'https://themeisle.link/rs-bf', 'bfcm', 'revive' ) ) ); $configs[ ROP_PRODUCT_SLUG ] = $config; From c098832a11aee0b732fa5129d01577083760b1e0 Mon Sep 17 00:00:00 2001 From: girishpanchal30 Date: Mon, 29 Dec 2025 18:52:20 +0530 Subject: [PATCH 02/11] create hashtags on bluesky --- .../admin/helpers/class-rop-bluesky-api.php | 44 ++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/includes/admin/helpers/class-rop-bluesky-api.php b/includes/admin/helpers/class-rop-bluesky-api.php index da2cd566..34a1a304 100644 --- a/includes/admin/helpers/class-rop-bluesky-api.php +++ b/includes/admin/helpers/class-rop-bluesky-api.php @@ -290,12 +290,19 @@ public function create_post( $did, $post, $post_type, $hashtags, $access_token = $now = gmdate( 'Y-m-d\TH:i:s\Z' ); + $text = $post['content'] . $hashtags; + $record = array( '$type' => 'app.bsky.feed.post', - 'text' => $post['content'] . $hashtags, + 'text' => $text, 'createdAt' => $now, ); + $facets = $this->generate_facets( $text ); + if ( ! empty( $facets ) ) { + $record['facets'] = $facets; + } + if ( $post_type === 'link' && isset( $post['post_url'] ) && ! empty( $post['post_url'] ) ) { $record['embed'] = array( '$type' => 'app.bsky.embed.external', @@ -369,6 +376,41 @@ public function create_post( $did, $post, $post_type, $hashtags, $access_token = } } + /** + * Generate facets for hashtags. + * + * @param string $text The text to parse. + * + * @return mixed|array + */ + private function generate_facets( $text ) { + $facets = array(); + preg_match_all( '/#\S+/', $text, $matches, PREG_OFFSET_CAPTURE ); + + if ( ! empty( $matches[0] ) ) { + foreach ( $matches[0] as $match ) { + $hashtag = $match[0]; + $start = $match[1]; + $end = $start + strlen( $hashtag ); + + $facets[] = array( + 'index' => array( + 'byteStart' => $start, + 'byteEnd' => $end, + ), + 'features' => array( + array( + '$type' => 'app.bsky.richtext.facet#tag', + 'tag' => ltrim( $hashtag, '#' ), + ), + ), + ); + } + } + + return $facets; + } + /** * Fetch Website Card embeds. * From 1d099cb0b1ac9ac7d0c2c04b8f86b35f8a6ed308 Mon Sep 17 00:00:00 2001 From: girishpanchal30 Date: Tue, 30 Dec 2025 16:05:32 +0530 Subject: [PATCH 03/11] fix: handle multiple GMB accounts for post sharing --- .../admin/services/class-rop-gmb-service.php | 51 ++++++++++++++----- 1 file changed, 37 insertions(+), 14 deletions(-) diff --git a/includes/admin/services/class-rop-gmb-service.php b/includes/admin/services/class-rop-gmb-service.php index 64cf12e6..ca742c1a 100644 --- a/includes/admin/services/class-rop-gmb-service.php +++ b/includes/admin/services/class-rop-gmb-service.php @@ -210,13 +210,11 @@ public function add_account_with_app( $accounts_data ) { * * @since 8.5.9 * @access private + * @param array $arguments Arguments needed by the method. * * @return array */ - private function gmb_refresh_access_token() { - - $rop_data = get_option( 'rop_data' ); - $rop_services_data = $rop_data['services']; + private function gmb_refresh_access_token( $arguments ) { $id = ''; $access_token = ''; @@ -225,26 +223,51 @@ private function gmb_refresh_access_token() { $gmb_service_id = ''; $refresh_token = ''; + $credentials = isset( $arguments['credentials'] ) ? $arguments['credentials'] : array(); + + if ( ! empty( $credentials ) ) { + $created = isset( $credentials['created'] ) ? $credentials['created'] : ''; + $expires_in = isset( $credentials['expires_in'] ) ? $credentials['expires_in'] : ''; + $access_token = isset( $credentials['access_token'] ) ? $credentials['access_token'] : ''; + + // Check if access token will expire in next 30 seconds. + $expired = ( $created + ( $expires_in - 30 ) ) < time(); + + // If it's not expired then return current access token in DB + if ( ! $expired ) { + // Add an expires_in value to prevent Google Client PHP notice for undefined expires_in index + $access_token = array( 'access_token' => $access_token, 'expires_in' => $expires_in ); + return $access_token; + } + } + + $rop_data = get_option( 'rop_data' ); + $rop_services_data = isset( $rop_data['services'] ) ? $rop_data['services'] : array(); + $account_id = isset( $arguments['id'] ) ? $arguments['id'] : ''; + foreach ( $rop_services_data as $service => $service_data ) { if ( $service_data['service'] === 'gmb' ) { - $id = $service_data['id']; - $access_token = $service_data['credentials']['access_token']; - $created = $service_data['credentials']['created']; - $expires_in = $service_data['credentials']['expires_in']; - $gmb_service_id = $service; - $refresh_token = $service_data['credentials']['refresh_token']; - break; + foreach ( $service_data['available_accounts'] as $account ) { + if ( $account_id === $account['id'] ) { + $id = $service_data['id']; + $access_token = $service_data['credentials']['access_token']; + $created = $service_data['credentials']['created']; + $expires_in = $service_data['credentials']['expires_in']; + $gmb_service_id = $service; + $refresh_token = $service_data['credentials']['refresh_token']; + break; + } + } } } - // $created = '1593273390'; // Check if access token will expire in next 30 seconds. $expired = ( $created + ( $expires_in - 30 ) ) < time(); // If it's not expired then return current access token in DB if ( ! $expired ) { // Add an expires_in value to prevent Google Client PHP notice for undefined expires_in index - $access_token = array('access_token' => $access_token, 'expires_in' => $expires_in); + $access_token = array( 'access_token' => $access_token, 'expires_in' => $expires_in ); return $access_token; } @@ -488,7 +511,7 @@ public function share( $post_details, $args = array() ) { } } - $access_token = $this->gmb_refresh_access_token(); + $access_token = $this->gmb_refresh_access_token( $args ); $client->setAccessToken( $access_token ); $client->setApiFormatV2( true ); From b5a4bd4e3ff3176220d02ae588ac5b1c8ca402ba Mon Sep 17 00:00:00 2001 From: girishpanchal30 Date: Tue, 30 Dec 2025 18:51:32 +0530 Subject: [PATCH 04/11] feat: add cleanup records --- .../abstract/class-rop-model-abstract.php | 2 +- includes/admin/class-rop-rest-api.php | 14 +++ .../admin/models/class-rop-services-model.php | 23 ++++ includes/class-rop-i18n.php | 4 + vue/src/models/rop_store.js | 3 + vue/src/vue-elements/accounts-tab-panel.vue | 102 +++++++++++++++++- 6 files changed, 145 insertions(+), 3 deletions(-) diff --git a/includes/admin/abstract/class-rop-model-abstract.php b/includes/admin/abstract/class-rop-model-abstract.php index ea9a4718..f3a8238d 100644 --- a/includes/admin/abstract/class-rop-model-abstract.php +++ b/includes/admin/abstract/class-rop-model-abstract.php @@ -92,7 +92,7 @@ protected function set( $key, $value = '', $refresh = false ) { $this->data[ $key ] = apply_filters( 'rop_set_key_' . $key, $value ); - return update_option( $this->namespace, $this->data ); + return update_option( $this->namespace, $this->data, false ); } diff --git a/includes/admin/class-rop-rest-api.php b/includes/admin/class-rop-rest-api.php index c90649aa..e9d11892 100644 --- a/includes/admin/class-rop-rest-api.php +++ b/includes/admin/class-rop-rest-api.php @@ -1642,6 +1642,20 @@ private function add_account_bluesky( $data ) { return $this->response->to_array(); } + /** + * API method called to cleanup services. + * + * @access private + * @return array + */ + public function cleanup_accounts() { + $model = new Rop_Services_Model(); + $this->response->set_code( '200' ) + ->set_data( $model->cleanup_accounts() ); + + return $this->response->to_array(); + } + /** * Share API method. * diff --git a/includes/admin/models/class-rop-services-model.php b/includes/admin/models/class-rop-services-model.php index 0bb8a3f7..a0201668 100644 --- a/includes/admin/models/class-rop-services-model.php +++ b/includes/admin/models/class-rop-services-model.php @@ -37,6 +37,13 @@ class Rop_Services_Model extends Rop_Model_Abstract { */ private $accounts_namespace = 'active_accounts'; + /** + * Cleanup account count. + * + * @access private + * @var int $cleanup_account_count + */ + private $cleanup_account_count = 1000; /** * Utility method to clear authenticated services. @@ -520,4 +527,20 @@ public function find_account( $account_id ) { return false; } + /** + * Utility method to cleanup authenticated services. + * + * @access public + * @return array + */ + public function cleanup_accounts() { + $services = $this->get( $this->services_namespace ); + + if ( count( $services ) > $this->cleanup_account_count ) { + $services = array_slice( $services, -( $this->cleanup_account_count ), null, true ); + $this->set( $this->services_namespace, $services ); + } + + return $services; + } } diff --git a/includes/class-rop-i18n.php b/includes/class-rop-i18n.php index 338b1f06..74323f09 100644 --- a/includes/class-rop-i18n.php +++ b/includes/class-rop-i18n.php @@ -139,6 +139,10 @@ public static function get_labels( $key = '' ) { 'upsell_bz_service_body' => __( 'We\'re sorry, %1$s is not available on your plan. Please upgrade to the business plan to unlock all these features and get more traffic.', 'tweet-old-post' ), 'search_account' => __( 'Search account', 'tweet-old-post' ), 'no_account_found' => __( 'No account found for search', 'tweet-old-post' ), + 'cleanup_cta' => __( 'Cleanup accounts', 'tweet-old-post' ), + 'cleanup_title' => __( 'Clean Up Accounts', 'tweet-old-post' ), + 'cleanup_description' => __( 'This will remove older account records and keep only the most recent 1,000 accounts. This helps improve performance and reduce stored data.', 'tweet-old-post' ), + 'cleanup_now' => __( 'Cleanup now', 'tweet-old-post' ), ), 'settings' => array( 'yes_text' => __( 'Yes', 'tweet-old-post' ), diff --git a/vue/src/models/rop_store.js b/vue/src/models/rop_store.js index a8226267..81ff218b 100644 --- a/vue/src/models/rop_store.js +++ b/vue/src/models/rop_store.js @@ -270,6 +270,9 @@ export default new Vuex.Store({ case 'toggle_tracking': break + case 'cleanup_accounts': + state.authenticatedServices = stateData; + break; default: Vue.$log.error('No state request for ', requestName); } diff --git a/vue/src/vue-elements/accounts-tab-panel.vue b/vue/src/vue-elements/accounts-tab-panel.vue index ad2cb37b..8eb00b26 100644 --- a/vue/src/vue-elements/accounts-tab-panel.vue +++ b/vue/src/vue-elements/accounts-tab-panel.vue @@ -89,6 +89,20 @@
+