Load users data earlier

Author: rxu

notification/method/webpush.php

@@ -146,6 +146,9 @@ public function notify()
 	{
 		$insert_buffer = new \phpbb\db\sql_insert_buffer($this->db, $this->notification_webpush_table);
 
+		// Load all users we want to notify
+		$notify_users = $this->load_receivers();
+
 		/** @var type_interface $notification */
 		foreach ($this->queue as $notification)
 		{
@@ -176,41 +179,24 @@ public function notify()
 		// Restore current user's language
 		$this->language->set_user_language($this->user->data['user_lang'], true);
 
-		$this->notify_using_webpush();
+		$this->notify_using_webpush($notify_users);
 
 		return false;
 	}
 
 	/**
 	 * Notify using Web Push
 	 *
+	 * @param array	$notify_users	Array of user ids to notify
 	 * @return void
 	 */
-	protected function notify_using_webpush(): void
+	protected function notify_using_webpush($notify_users = []): void
 	{
 		if (empty($this->queue))
 		{
 			return;
 		}
 
-		// Load all users we want to notify
-		$user_ids = [];
-		foreach ($this->queue as $notification)
-		{
-			$user_ids[] = $notification->user_id;
-		}
-
-		// Do not send push notifications to banned users
-		if (!function_exists('phpbb_get_banned_user_ids'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
-		}
-		$banned_users = phpbb_get_banned_user_ids($user_ids);
-
-		// Load all the users we need
-		$notify_users = array_diff($user_ids, $banned_users);
-		$this->user_loader->load_users($notify_users, array(USER_IGNORE));
-
 		// Get subscriptions for users
 		$user_subscription_map = $this->get_user_subscription_map($notify_users);
 
@@ -532,4 +518,31 @@ protected function set_endpoint_padding(\Minishlink\WebPush\WebPush $web_push, s
 			}
 		}
 	}
+
+	/**
+	 * Load all users data to send notifications
+	 *
+	 * @return array	Array of user ids to notify
+	 */
+	protected function load_receivers(): array
+	{
+		$notify_users = $user_ids = [];
+		foreach ($this->queue as $notification)
+		{
+			$user_ids[] = $notification->user_id;
+		}
+
+		// Do not send push notifications to banned users
+		if (!function_exists('phpbb_get_banned_user_ids'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+		}
+		$banned_users = phpbb_get_banned_user_ids($user_ids);
+
+		// Load all the users we need
+		$notify_users = array_diff($user_ids, $banned_users);
+		$this->user_loader->load_users($notify_users, [USER_IGNORE]);
+
+		return $notify_users;
+	}
 }