Merge branch 'main' into Release-1.0.0

Author: iMattPro

README.md

@@ -37,16 +37,16 @@ Testing push notifications necessitates user-to-user interactions to observe the
 
 1. **User Account Setup:**
 	- Create at least two distinct user accounts for testing purposes.
-    - In each user account's notifications preferences, assign web push notifications and subscribe to them to receive Push Notifications.
+    - In user1's account notifications preferences, assign web push notifications and subscribe to receive Push Notifications.
 
 2. **Message, Quote, or Reply Interaction:**
-	- Initiate a user-to-user interaction by performing one of the following actions using "User Account 1":
-		- **Private Message:** Send a direct message from "User Account 1" to "User Account 2".
-		- **Quote:** Quote a post or message authored by "User Account 2" using "User Account 1".
-		- **Reply:** Respond to a post or message authored by "User Account 2" using "User Account 1".
+	- Initiate a user-to-user interaction by performing one of the following actions using "User Account 2":
+		- **Private Message:** Send a direct message from "User Account 2" to "User Account 1".
+		- **Quote:** Quote a post or message authored by "User Account 1" using "User Account 2".
+		- **Reply:** Respond to a post or message authored by "User Account 1" using "User Account 2".
 
 3. **Observing Push Notifications:**
-	- Once the interaction is performed from "User Account 1" to engage with "User Account 2," you promptly should see a notification for "User Account 2."
+	- Once the interaction is performed from "User Account 2" to engage with "User Account 1," you promptly should see a notification for "User Account 1."
 
 4. **Caveats for Local Testing**
     - Local testing of Push Notifications only works from a `localhost` address or if your local server has a secure SSL certificate.

ext.php

@@ -39,10 +39,14 @@ public function is_enableable()
 	 */
 	protected function check_phpbb_version()
 	{
-		if (phpbb_version_compare(PHPBB_VERSION, '3.3.12-dev', '<') ||
-			phpbb_version_compare(PHPBB_VERSION, '4.0.0-dev', '>='))
+		if (phpbb_version_compare(PHPBB_VERSION, '3.3.12', '<'))
 		{
-			$this->errors[] = 'PHPBB_VERSION_ERROR';
+			$this->errors[] = 'PHPBB_VERSION_MIN_ERROR';
+		}
+
+		if (phpbb_version_compare(PHPBB_VERSION, '4.0.0-dev', '>='))
+		{
+			$this->errors[] = 'PHPBB_VERSION_MAX_ERROR';
 		}
 
 		return $this;

language/en/install.php

@@ -38,6 +38,7 @@
 //
 
 $lang = array_merge($lang, [
-	'PHPBB_VERSION_ERROR'	=> 'This extension is not compatible with your board. You must be using phpBB 3.3.12 or newer, up to but not including phpBB 4.x.x.',
-	'PHP_VERSION_ERROR'		=> 'This extension is not compatible with your server. Your server must be running PHP 7.3 or newer.',
+	'PHPBB_VERSION_MAX_ERROR'	=> 'This extension can not be installed on your board. You are using phpBB 4, which already contains the features in this extension.',
+	'PHPBB_VERSION_MIN_ERROR'	=> 'This extension is not compatible with your board. You must be using phpBB 3.3.12 or newer.',
+	'PHP_VERSION_ERROR'	=> 'This extension is not compatible with your server. Your server must be running PHP 7.3 or newer.',
 ]);

language/ru/install.php

@@ -38,6 +38,7 @@
 //
 
 $lang = array_merge($lang, [
-	'PHPBB_VERSION_ERROR'	=> 'Данное расширение несовместимо с установленной версией конференции. Необходима версия phpBB 3.3.12 или выше, за исключением phpBB 4.x.x.',
-	'PHP_VERSION_ERROR'		=> 'Данное расширение несовместимо с установленной на сервере версией PHP. Необходима версия PHP 7.3 или выше.',
+	'PHPBB_VERSION_MAX_ERROR'	=> 'Данное расширение несовместимо с установленной версией конференции. Вы используете версию phpBB 4, которая уже содержит соответствующие функции.',
+	'PHPBB_VERSION_MIN_ERROR'	=> 'Данное расширение несовместимо с установленной версией конференции. Необходима версия phpBB 3.3.12 или выше.',
+	'PHP_VERSION_ERROR'	=> 'Данное расширение несовместимо с установленной на сервере версией PHP. Необходима версия PHP 7.3 или выше.',
 ]);

notification/method/webpush.php

@@ -52,7 +52,7 @@ class webpush extends messenger_base implements extended_method_interface
 	protected $push_subscriptions_table;
 
 	/** @var int Fallback size for padding if endpoint is mozilla, see https://github.com/web-push-libs/web-push-php/issues/108#issuecomment-2133477054 */
-	const MOZILLA_FALLBACK_PADDING = 2820;
+	public const MOZILLA_FALLBACK_PADDING = 2820;
 
 	/**
 	 * Notification Method Web Push constructor
@@ -216,7 +216,7 @@ protected function notify_using_webpush(): void
 
 			$user_subscriptions = $user_subscription_map[$notification->user_id] ?? [];
 
-			if ($user['user_type'] == USER_INACTIVE && $user['user_inactive_reason'] == INACTIVE_MANUAL
+			if (($user['user_type'] == USER_INACTIVE && $user['user_inactive_reason'] == INACTIVE_MANUAL)
 				|| empty($user_subscriptions))
 			{
 				continue;
@@ -495,13 +495,19 @@ protected function get_board_url()
 	 * @param string $endpoint
 	 *
 	 * @return void
-	 * @throws \Exception
 	 */
 	protected function set_endpoint_padding(\Minishlink\WebPush\WebPush $web_push, string $endpoint): void
 	{
 		if (strpos($endpoint, 'mozilla.com') || strpos($endpoint, 'mozaws.net'))
 		{
-			$web_push->setAutomaticPadding(self::MOZILLA_FALLBACK_PADDING);
+			try
+			{
+				$web_push->setAutomaticPadding(self::MOZILLA_FALLBACK_PADDING);
+			}
+			catch (\Exception $e)
+			{
+				// This shouldn't happen since we won't pass padding length outside limits
+			}
 		}
 	}
 }

styles/all/theme/phpbb_wpn.css

@@ -19,8 +19,19 @@
 	flex-wrap: nowrap;
 	justify-content: space-between;
 	padding: 5px 10px;
+	gap: 20px;
 }
 
 .wpn-notification-dropdown-footer button:disabled {
 	opacity: 0.7;
 }
+
+@media only screen and (max-width: 550px), only screen and (max-device-width: 550px) {
+	.wpn-notification-dropdown-footer button > span {
+		display: none;
+	}
+
+	.wpn-notification-dropdown-footer button > .icon {
+		font-size: 24px;
+	}
+}

tests/notification/notification_method_webpush_test.php

@@ -651,6 +651,47 @@ public function test_prune_notifications($notification_type, $post_data, $expect
 		$this->assertCount(0, $cur_notifications, 'Assert that no notifications have been pruned');
 	}
 
+	public function data_set_endpoint_padding(): array
+	{
+		return [
+			[
+				'foo.mozilla.com',
+				webpush::MOZILLA_FALLBACK_PADDING
+			],
+			[
+				'foo.mozaws.net',
+				webpush::MOZILLA_FALLBACK_PADDING
+			],
+			[
+				'foo.android.googleapis.com',
+				\Minishlink\WebPush\Encryption::MAX_COMPATIBILITY_PAYLOAD_LENGTH,
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider data_set_endpoint_padding
+	 */
+	public function test_set_endpoint_padding($endpoint, $expected_padding): void
+	{
+		$web_push_reflection = new \ReflectionMethod($this->notification_method_webpush, 'set_endpoint_padding');
+		$web_push_reflection->setAccessible(true);
+
+		$auth = [
+			'VAPID' => [
+				'subject' => generate_board_url(),
+				'publicKey' => $this->config['wpn_webpush_vapid_public'],
+				'privateKey' => $this->config['wpn_webpush_vapid_private'],
+			],
+		];
+
+		$web_push = new \Minishlink\WebPush\WebPush($auth);
+
+		$this->assertEquals(\Minishlink\WebPush\Encryption::MAX_COMPATIBILITY_PAYLOAD_LENGTH, $web_push->getAutomaticPadding());
+		$web_push_reflection->invoke($this->notification_method_webpush, $web_push, $endpoint);
+		$this->assertEquals($expected_padding, $web_push->getAutomaticPadding());
+	}
+
 	protected function create_subscription_for_user($user_id, bool $invalidate_endpoint = false): array
 	{
 		$client = new \GuzzleHttp\Client();