Fix loading notifications for users in better way

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

fix

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

Author: iMattPro

config/services.yml

@@ -18,6 +18,7 @@ services:
             - '@phpbb.wpn.form_helper'
             - '@language'
             - '@template'
+            - '@user'
             - '@notification_manager'
             - '%core.root_path%'
         tags:

event/listener.php

@@ -20,6 +20,7 @@
 use phpbb\language\language;
 use phpbb\notification\manager;
 use phpbb\template\template;
+use phpbb\user;
 use phpbb\webpushnotifications\form\form_helper;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
@@ -46,6 +47,9 @@ class listener implements EventSubscriberInterface
 	/* @var template */
 	protected $template;
 
+	/** @var user */
+	protected $user;
+
 	/* @var manager */
 	protected $phpbb_notifications;
 
@@ -61,17 +65,19 @@ class listener implements EventSubscriberInterface
 	 * @param form_helper $form_helper Form helper object
 	 * @param language $language Language object
 	 * @param template $template Template object
+	 * @param user $user
 	 * @param manager $phpbb_notifications Notifications manager object
 	 * @param $root_path
 	 */
-	public function __construct(config $config, controller_helper $controller_helper, FastImageSize $imagesize, form_helper $form_helper, language $language, template $template, manager $phpbb_notifications, $root_path)
+	public function __construct(config $config, controller_helper $controller_helper, FastImageSize $imagesize, form_helper $form_helper, language $language, template $template, user $user, manager $phpbb_notifications, $root_path)
 	{
 		$this->config = $config;
 		$this->controller_helper = $controller_helper;
 		$this->imagesize = $imagesize;
 		$this->form_helper = $form_helper;
 		$this->language = $language;
 		$this->template = $template;
+		$this->user = $user;
 		$this->phpbb_notifications = $phpbb_notifications;
 		$this->root_path = $root_path;
 	}
@@ -92,19 +98,26 @@ public static function getSubscribedEvents()
 	 */
 	public function load_template_data()
 	{
+		if (!$this->can_use_notifications())
+		{
+			return;
+		}
+
 		$methods = $this->phpbb_notifications->get_subscription_methods();
 		$webpush_method = $methods['notification.method.phpbb.wpn.webpush'] ?? null;
 
-		if ($webpush_method !== null)
+		if ($webpush_method === null)
 		{
-			if (!$this->language->is_set('NOTIFICATION_METHOD_PHPBB_WPN_WEBPUSH'))
-			{
-				$this->language->add_lang('webpushnotifications_module_ucp', 'phpbb/webpushnotifications');
-			}
+			return;
+		}
 
-			$template_ary = $webpush_method['method']->get_ucp_template_data($this->controller_helper, $this->form_helper);
-			$this->template->assign_vars($template_ary);
+		if (!$this->language->is_set('NOTIFICATION_METHOD_PHPBB_WPN_WEBPUSH'))
+		{
+			$this->language->add_lang('webpushnotifications_module_ucp', 'phpbb/webpushnotifications');
 		}
+
+		$template_ary = $webpush_method['method']->get_ucp_template_data($this->controller_helper, $this->form_helper);
+		$this->template->assign_vars($template_ary);
 	}
 
 	/**
@@ -217,4 +230,18 @@ protected function add_error($event, $error_key, $param = null)
 		$error[] = $this->language->lang($error_key, $param);
 		$event['error'] = $error;
 	}
+
+	/**
+	 * Can notifications be used by the user?
+	 *
+	 * @return bool
+	 */
+	protected function can_use_notifications()
+	{
+		return $this->config['load_notifications']
+			&& $this->config['allow_board_notifications']
+			&& $this->config['wpn_webpush_enable']
+			&& $this->user->id() !== ANONYMOUS
+			&& (int) $this->user->data['user_type'] !== USER_IGNORE;
+	}
 }

notification/method/webpush.php

@@ -378,7 +378,7 @@ public function get_ucp_template_data(helper $controller_helper, form_helper $fo
 		}
 
 		return [
-			'NOTIFICATIONS_WEBPUSH_ENABLE'	=> $this->allowed_user() && ($this->config['wpn_webpush_dropdown_subscribe'] || stripos($this->user->page['page'], 'notification_options')),
+			'NOTIFICATIONS_WEBPUSH_ENABLE'	=> $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'],
@@ -552,17 +552,4 @@ protected function load_recipients_data(): array
 
 		return $notify_users;
 	}
-
-	/**
-	 * User is allowed to use web push notifications
-	 *
-	 * @return bool
-	 */
-	protected function allowed_user()
-	{
-		return $this->user->id() !== ANONYMOUS
-			&& !$this->user->data['is_bot']
-			&& (int) $this->user->data['user_type'] !== USER_IGNORE
-			&& (int) $this->user->data['user_type'] !== USER_INACTIVE;
-	}
 }

tests/event/listener_test.php

@@ -81,7 +81,11 @@ protected function setUp(): void
 				return $route . '#' . serialize($params);
 			});
 
-		$this->config = new \phpbb\config\config([]);
+		$this->config = new \phpbb\config\config([
+			'load_notifications' => true,
+			'allow_board_notifications' => true,
+			'wpn_webpush_enable' => true,
+		]);
 
 		$this->form_helper = new \phpbb\webpushnotifications\form\form_helper(
 			$this->config,
@@ -127,6 +131,7 @@ protected function set_listener()
 			$this->form_helper,
 			$this->language,
 			$this->template,
+			$this->user,
 			$this->notifications,
 			$this->root_path
 		);