WordPress.org
Get WordPress

Plugin Directory

Changeset 3482124


Ignore:
Timestamp:
03/13/2026 04:13:57 PM (3 weeks ago)
Author:
grocerslist
Message:

Release v1.20.0

Location:
grocerslist
Files:
209 added
5 edited

Legend:

Unmodified
Added
Removed

  • grocerslist/trunk/README.md

    r3481252 r3482124  
    44Author: Grocers List, Engineering
    55Tested up to: 6.8
    6 Stable tag: 1.19.0
     6Stable tag: 1.20.0
    77Requires PHP: 7.0
    88License: GPLv3
    … …  
    8686#### - 03/12/2026 - 1.19.0 - Leverage WP user records
    8787
     88#### - 03/13/2026 - 1.20.0 - Raptive server side ad removal and PHP 7.4 issue
     89
    8890### Resources:
    8991

  • grocerslist/trunk/grocerslist.php

    r3481252 r3482124  
    77Requires PHP: 7.0
    88Tested up to: 6.8
    9 Version: 1.19.0
    10 Stable tag: 1.19.0
     9Version: 1.20.0
     10Stable tag: 1.20.0
    1111Author: Grocers List Engineering
    1212License: GPLv3
    … …  
    1818if (!defined('ABSPATH')) exit;
    1919
    20 define('GROCERS_LIST_VERSION', '1.19.0');
     20define('GROCERS_LIST_VERSION', '1.20.0');
    2121define('GROCERS_LIST_PLUGIN_FILE', __FILE__);
    2222define('GROCERS_LIST_PLUGIN_DIR', __DIR__);

  • grocerslist/trunk/includes/Frontend/ClientScripts.php

    r3481252 r3482124  
    4444        add_action('wp_enqueue_scripts', [$this, 'enqueueScripts']);
    4545        add_action('wp_head', [$this, 'addPreloadHints']);
    46         // Add script to bottom of body for detecting and disabling ads
    47         add_action('wp_footer', [$this, 'disable_ads_inline_script']);
     46        add_filter('body_class', [$this, 'add_ad_removal_classes']);
    4847        // Inject HTML to disable mediavine ads if applicable
    4948        add_action('wp_footer', [$this, 'mediavine_disable_ads']);
    5049    }
    5150
    52     public function disable_ads_inline_script(): void {
    53         $inline_script = <<<EOD
    54             <script id="gl-disable-ads">
    55                 (function() {
    56                     const isPaidMember = localStorage.getItem('gl_is_paid_member');
     51    public function add_ad_removal_classes(): array {
     52        $creatorSettings = $this->creatorSettingsFetcher->getCreatorSettings();
     53        list($email, , $is_paid) = $this->memberService->getMemberData($creatorSettings->creatorAccountId);
    5754
    58                     if (isPaidMember === 'true') {
    59                         document.body.classList.add('adthrive-disable-all', 'gl-paid-member');
    60                     }
    61                 })();
    62             </script>
    63         EOD;
     55        if (!$email || !$is_paid) {
     56            return [];
     57        }
    6458
    65         echo $inline_script;
     59        $classes = ['adthrive-disable-all', 'gl-paid-member'];
     60        return $classes;
    6661    }
    6762
    6863    public function mediavine_disable_ads(): void {
    6964        $creatorSettings = $this->creatorSettingsFetcher->getCreatorSettings();
    70         [$email, , $is_paid] = $this->memberService->getMemberData($creatorSettings->creatorAccountId);
     65        list($email, , $is_paid) = $this->memberService->getMemberData($creatorSettings->creatorAccountId);
    7166
    7267        if (!$email || !$is_paid) {
    … …  
    7772        $mediavine_element = <<<EOD
    7873            <div id="mediavine-settings" data-blocklist-all="1"></div>
    79         EOD;
     74EOD;
    8075
    8176        echo $mediavine_element;
    … …  
    9691        }
    9792
    98         [$email, $subscription_status, $is_paid_member, $is_past_due, $subscription_management_link] = $this->memberService->getMemberData($creatorSettings->creatorAccountId);
     93        list($email, $subscription_status, $is_paid_member, $is_past_due, $subscription_management_link) = $this->memberService->getMemberData($creatorSettings->creatorAccountId);
    9994
    10095        $window_grocersList = [

  • grocerslist/trunk/includes/Service/MemberService.php

    r3481252 r3482124  
    1717    }
    1818
    19     protected function _getWordpressUserMetaData(string|null $creator_id) {
     19    protected function _getWordpressUserMetaData(string $creator_id = null) {
    2020        // TODO: NMML - need to put a limit on how long we trust WP_User... e.g., hit GL servers once every 24 hours per user to ensure active subscriptions via Stripe API check
    2121        // TODO: NMML - can we kill JWT if we start using WP_User?
    … …  
    4343    }
    4444
    45     public function getMemberData(string|null $creator_id) {
     45    public function getMemberData(string $creator_id = null) {
    4646        return $this->_getWordpressUserMetaData($creator_id);
    4747    }
    … …  
    7070    }
    7171
    72     public function createOrUpdateMember(string $email, string $subscription_status, bool $is_paid_member, bool $is_past_due, string $subscription_management_link, string|null $creator_id) {
    73 
     72    public function createOrUpdateMember(string $email, string $subscription_status, bool $is_paid_member, bool $is_past_due, string $subscription_management_link, string $creator_id = null) {
    7473        $creator_id = $creator_id ?? '';
    7574        if (!empty($email)) {
    … …  
    127126    }
    128127
    129     public function shouldUpdateMemberData(string|null $creator_id) {
     128    public function shouldUpdateMemberData(string $creator_id = null) {
    130129        if (is_user_logged_in()) {
    131             [, , , , , $last_updated]= $this->getMemberData($creator_id);
     130            list(, , , , , $last_updated) = $this->getMemberData($creator_id);
    132131            // One day in seconds
    133132            $one_day = 86400;

  • grocerslist/trunk/vendor/composer/installed.php

    r3481252 r3482124  
    22    'root' => array(
    33        'name' => '__root__',
    4         'pretty_version' => '1.19.0.x-dev',
    5         'version' => '1.19.0.9999999-dev',
    6         'reference' => 'c86c544a7f20840b99504c82ab86628196500336',
     4        'pretty_version' => 'dev-master',
     5        'version' => 'dev-master',
     6        'reference' => 'c7bb9f6c26aeb61147d38118f344cb6d463f31c1',
    77        'type' => 'library',
    88        'install_path' => __DIR__ . '/../../',
    … …  
    1212    'versions' => array(
    1313        '__root__' => array(
    14             'pretty_version' => '1.19.0.x-dev',
    15             'version' => '1.19.0.9999999-dev',
    16             'reference' => 'c86c544a7f20840b99504c82ab86628196500336',
     14            'pretty_version' => 'dev-master',
     15            'version' => 'dev-master',
     16            'reference' => 'c7bb9f6c26aeb61147d38118f344cb6d463f31c1',
    1717            'type' => 'library',
    1818            'install_path' => __DIR__ . '/../../',
Note: See TracChangeset for help on using the changeset viewer.