Another attempt at trying to figure out when and what to load

Signed-off-by: Matt Friedman <maf675@gmail.com>

Author: iMattPro

event/listener.php

@@ -247,9 +247,8 @@ protected function add_error($event, $error_key, $param = null)
 	 */
 	protected function can_use_notifications()
 	{
-		return $this->config['allow_board_notifications']
-			&& $this->config['wpn_webpush_enable']
-			&& $this->user->id() !== ANONYMOUS
-			&& (int) $this->user->data['user_type'] !== USER_IGNORE;
+		return $this->config['wpn_webpush_enable']
+			&& ANONYMOUS !== $this->user->id()
+			&& USER_IGNORE !== (int) $this->user->data['user_type'];
 	}
 }

notification/method/webpush.php

@@ -103,7 +103,7 @@ public function get_type(): string
 	*/
 	public function is_available(type_interface $notification_type = null): bool
 	{
-		return parent::is_available($notification_type) && $this->config['allow_board_notifications'] && $this->config['wpn_webpush_enable']
+		return parent::is_available($notification_type) && $this->config['wpn_webpush_enable']
 			&& !empty($this->config['wpn_webpush_vapid_public']) && !empty($this->config['wpn_webpush_vapid_private']);
 	}
 
@@ -378,7 +378,7 @@ public function get_ucp_template_data(helper $controller_helper, form_helper $fo
 		}
 
 		return [
-			'NOTIFICATIONS_WEBPUSH_ENABLE'	=> $this->config['wpn_webpush_dropdown_subscribe'] || stripos($this->user->page['page'], 'notification_options'),
+			'NOTIFICATIONS_WEBPUSH_ENABLE'	=> ($this->config['load_notifications'] && $this->config['allow_board_notifications'] && $this->config['wpn_webpush_dropdown_subscribe']) || stripos($this->user->page['page'], 'notification_options'),
 			'U_WEBPUSH_SUBSCRIBE'			=> $controller_helper->route('phpbb_webpushnotifications_ucp_push_subscribe_controller'),
 			'U_WEBPUSH_UNSUBSCRIBE'			=> $controller_helper->route('phpbb_webpushnotifications_ucp_push_unsubscribe_controller'),
 			'VAPID_PUBLIC_KEY'				=> $this->config['wpn_webpush_vapid_public'],

tests/event/listener_test.php

@@ -82,6 +82,7 @@ protected function setUp(): void
 			});
 
 		$this->config = new \phpbb\config\config([
+			'load_notifications' => true,
 			'allow_board_notifications' => true,
 			'wpn_webpush_enable' => true,
 		]);