From 53e8d8b2f40d6edbd3b8621546ce10eece76e59a Mon Sep 17 00:00:00 2001
From: Marc Lucraft <marclucraft@gmail.com>
Date: Thu, 24 Jul 2025 14:19:15 +0100
Subject: [PATCH 1/4] fix: the "Send notification" checkbox when a post is
 published would be checked on refresh

---
 v3/onesignal-admin/onesignal-admin.php     |  2 +-
 v3/onesignal-metabox/onesignal-metabox.php | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/v3/onesignal-admin/onesignal-admin.php b/v3/onesignal-admin/onesignal-admin.php
index 956ff48..0b8e8ad 100644
--- a/v3/onesignal-admin/onesignal-admin.php
+++ b/v3/onesignal-admin/onesignal-admin.php
@@ -104,7 +104,7 @@ function onesignal_admin_page()
     }
     ?>
     <form method="post">
-      <label for="appid">OneSignal App ID</label>
+      <label for="appid">OneSignal App ID HELLLO</label>
       <div class="input-with-icon">
         <input type="text" id="appid" name="onesignal_app_id"
               value="<?php echo esc_attr(get_option('OneSignalWPSetting')['app_id'] ?? ''); ?>" />
diff --git a/v3/onesignal-metabox/onesignal-metabox.php b/v3/onesignal-metabox/onesignal-metabox.php
index 277368f..bb7c722 100644
--- a/v3/onesignal-metabox/onesignal-metabox.php
+++ b/v3/onesignal-metabox/onesignal-metabox.php
@@ -57,10 +57,15 @@ function onesignal_metabox($post)
   <label for="os_update">
   <input type="checkbox" name="os_update" id="os_update"
        <?php
-       $os_update_checked = isset($os_meta['os_update'])
-           ? $os_meta['os_update'] === 'on'
-           : (get_option('OneSignalWPSetting')['notification_on_post'] ?? 0) == 1;
-
+       // Determine if this is a new post (never published)
+       $is_new_post = ($post->post_status !== 'publish' || empty($post->post_date_gmt));
+       if ($is_new_post) {
+           // First time publish: use global setting
+           $os_update_checked = (get_option('OneSignalWPSetting')['notification_on_post'] ?? 0) == 1;
+       } else {
+           // Already published: always unchecked
+           $os_update_checked = false;
+       }
        echo $os_update_checked ? 'checked' : '';
        ?>>
 Send notification when post is published or updated

From 52f335b343b083ece3e8981ae6a964c87557940c Mon Sep 17 00:00:00 2001
From: Marc Lucraft <marclucraft@gmail.com>
Date: Thu, 24 Jul 2025 14:21:16 +0100
Subject: [PATCH 2/4] remove test

---
 v3/onesignal-admin/onesignal-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3/onesignal-admin/onesignal-admin.php b/v3/onesignal-admin/onesignal-admin.php
index 0b8e8ad..956ff48 100644
--- a/v3/onesignal-admin/onesignal-admin.php
+++ b/v3/onesignal-admin/onesignal-admin.php
@@ -104,7 +104,7 @@ function onesignal_admin_page()
     }
     ?>
     <form method="post">
-      <label for="appid">OneSignal App ID HELLLO</label>
+      <label for="appid">OneSignal App ID</label>
       <div class="input-with-icon">
         <input type="text" id="appid" name="onesignal_app_id"
               value="<?php echo esc_attr(get_option('OneSignalWPSetting')['app_id'] ?? ''); ?>" />

From 6a70ec50278a26435f07bf36f6ea8a7ac55dfd0c Mon Sep 17 00:00:00 2001
From: Marc Lucraft <marclucraft@gmail.com>
Date: Fri, 25 Jul 2025 09:52:05 +0100
Subject: [PATCH 3/4] same for global pages button.

---
 v3/onesignal-admin/onesignal-admin.php     |  6 +++---
 v3/onesignal-metabox/onesignal-metabox.php | 10 +++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/v3/onesignal-admin/onesignal-admin.php b/v3/onesignal-admin/onesignal-admin.php
index 956ff48..e182818 100644
--- a/v3/onesignal-admin/onesignal-admin.php
+++ b/v3/onesignal-admin/onesignal-admin.php
@@ -104,7 +104,7 @@ function onesignal_admin_page()
     }
     ?>
     <form method="post">
-      <label for="appid">OneSignal App ID</label>
+      <label for="appid">OneSignal App ID HELLLO</label>
       <div class="input-with-icon">
         <input type="text" id="appid" name="onesignal_app_id"
               value="<?php echo esc_attr(get_option('OneSignalWPSetting')['app_id'] ?? ''); ?>" />
@@ -213,7 +213,7 @@ function onesignal_admin_page()
           <input id="auto-send" type="checkbox" name="onesignal_auto_send"
                  <?php echo (!empty($settings['notification_on_post'])) ? 'checked' : ''; ?>>
           <span class="checkbox"></span>
-          Automatically send notifications when a post is published or updated
+          Automatically send notifications when a post is published
         </label>
       </div>
 
@@ -223,7 +223,7 @@ function onesignal_admin_page()
           <input id="auto-send-pages" type="checkbox" name="onesignal_auto_send_pages"
                  <?php echo (!empty($settings['notification_on_page'])) ? 'checked' : ''; ?>>
           <span class="checkbox"></span>
-          Automatically send notifications when a page is published or updated
+          Automatically send notifications when a page is published
         </label>
       </div>
 
diff --git a/v3/onesignal-metabox/onesignal-metabox.php b/v3/onesignal-metabox/onesignal-metabox.php
index bb7c722..1a7a6aa 100644
--- a/v3/onesignal-metabox/onesignal-metabox.php
+++ b/v3/onesignal-metabox/onesignal-metabox.php
@@ -59,16 +59,20 @@ function onesignal_metabox($post)
        <?php
        // Determine if this is a new post (never published)
        $is_new_post = ($post->post_status !== 'publish' || empty($post->post_date_gmt));
+       $post_type = $post->post_type;
        if ($is_new_post) {
-           // First time publish: use global setting
-           $os_update_checked = (get_option('OneSignalWPSetting')['notification_on_post'] ?? 0) == 1;
+           if ($post_type === 'page') {
+               $os_update_checked = (get_option('OneSignalWPSetting')['notification_on_page'] ?? 0) == 1;
+           } else {
+               $os_update_checked = (get_option('OneSignalWPSetting')['notification_on_post'] ?? 0) == 1;
+           }
        } else {
            // Already published: always unchecked
            $os_update_checked = false;
        }
        echo $os_update_checked ? 'checked' : '';
        ?>>
-Send notification when post is published or updated
+Send notification when <?php echo $post_type === 'page' ? 'page' : 'post'; ?> is published
 </label>
   <div id="os_options">
     <label for="os_segment">Send to segment</label>

From 42112f3a9282016808c900ce121d25b0870f47b5 Mon Sep 17 00:00:00 2001
From: Sherwin Heydarbeygi <sherwin@onesignal.com>
Date: Fri, 8 Aug 2025 16:15:40 -0400
Subject: [PATCH 4/4] chore: clean up debugging text

---
 v3/onesignal-admin/onesignal-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3/onesignal-admin/onesignal-admin.php b/v3/onesignal-admin/onesignal-admin.php
index e182818..e8cb1a8 100644
--- a/v3/onesignal-admin/onesignal-admin.php
+++ b/v3/onesignal-admin/onesignal-admin.php
@@ -104,7 +104,7 @@ function onesignal_admin_page()
     }
     ?>
     <form method="post">
-      <label for="appid">OneSignal App ID HELLLO</label>
+      <label for="appid">OneSignal App ID</label>
       <div class="input-with-icon">
         <input type="text" id="appid" name="onesignal_app_id"
               value="<?php echo esc_attr(get_option('OneSignalWPSetting')['app_id'] ?? ''); ?>" />