Skip to content

fix(metering): get current user metered views #4227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 16, 2025
Merged

fix(metering): get current user metered views #4227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion includes/class-blocks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public static function enqueue_block_editor_assets() {
$script_data['content_gate_data'] = [
'anonymous_metered_views' => Metering::get_total_metered_views( false ),
'loggedin_metered_views' => Metering::get_total_metered_views( true ),
'metered_views' => Metering::get_metered_views(),
'metered_views' => Metering::get_current_user_metered_views(),
'metering_period' => Metering::get_metering_period(),
];
}
Expand Down
28 changes: 10 additions & 18 deletions includes/plugins/wc-memberships/class-metering.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,30 +315,22 @@ public static function get_metering_period( $post_id = null ) {
}

/**
* Get number of metered views for the user.
*
* @param int|null $user_id User ID. Default is current user.
* Get number of metered views for the current user.
*
* @return int Number of metered views.
*/
public static function get_metered_views( $user_id = null ) {
if ( ! $user_id ) {
$user_id = get_current_user_id();
}
// For anonymous users, return the anonymous count.
if ( ! $user_id ) {
$gate_post_id = Memberships::get_gate_post_id();
return (int) \get_post_meta( $gate_post_id, 'metering_anonymous_count', true );
public static function get_current_user_metered_views() {
if ( ! is_user_logged_in() ) {
return 0;
}

// For logged-in users, calculate the remaining views based on their metering data.
$gate_post_id = Memberships::get_gate_post_id();
$user_meta_key = self::METERING_META_KEY . '_' . $gate_post_id;
$user_metering_data = \get_user_meta( $user_id, $user_meta_key, true );
if ( ! is_array( $user_metering_data ) || ! isset( $user_metering_data['content'] ) ) {
return $count;
$gate_post_id = Memberships::get_gate_post_id();
$meta_key = self::METERING_META_KEY . '_' . $gate_post_id;
$metering_data = \get_user_meta( get_current_user_id(), $meta_key, true );
if ( ! is_array( $metering_data ) || ! isset( $metering_data['content'] ) ) {
return 0;
}
return count( $user_metering_data['content'] );
return count( $metering_data['content'] );
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/blocks/content-gate/countdown/class-content-gate-countdown-block.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public static function render_block( array $attributes, string $content ) {
if ( false === $total_views ) {
return '';
}
$views = Metering::get_metered_views( get_current_user_id() );
$views = Metering::get_current_user_metered_views();
$countdown = sprintf(
/* translators: 1: current number of metered views, 2: total metered views. */
__( '%1$d/%2$d', 'newspack-plugin' ),
Expand Down