Merge pull request #44 from iMattPro/fixes

Reverse forcing wpn settings on users

Author: iMattPro

event/listener.php

@@ -31,7 +31,6 @@ public static function getSubscribedEvents()
 			'core.ucp_display_module_before'	=> 'load_language',
 			'core.acp_main_notice'				=> 'compatibility_notice',
 			'core.page_header_after'			=> 'load_template_data',
-			'core.user_add_modify_notifications_data' => 'add_user_notification_data',
 		];
 	}
 
@@ -100,24 +99,4 @@ public function compatibility_notice()
 	{
 		$this->template->assign_var('S_WPN_COMPATIBILITY_NOTICE', phpbb_version_compare(PHPBB_VERSION, '4.0.0-dev', '>='));
 	}
-
-	/**
-	 * Add default web push notification settings for new users
-	 *
-	 * @param \phpbb\event\data $event The event object
-	 * @return void
-	 */
-	public function add_user_notification_data($event)
-	{
-		$notifications_data = $event['notifications_data'];
-		$notifications_data[] = [
-			'item_type'	=> 'notification.type.quote',
-			'method'	=> 'notification.method.phpbb.wpn.webpush',
-		];
-		$notifications_data[] = [
-			'item_type'	=> 'notification.type.pm',
-			'method'	=> 'notification.method.phpbb.wpn.webpush',
-		];
-		$event['notifications_data'] = $notifications_data;
-	}
 }

language/en/webpushnotifications_module_ucp.php

@@ -45,4 +45,5 @@
 	'NOTIFY_WEBPUSH_SUBSCRIBE'		=> 'Subscribe',
 	'NOTIFY_WEBPUSH_UNSUBSCRIBE'	=> 'Unsubscribe',
 	'NOTIFY_WEBPUSH_SUBSCRIBED'		=> 'Subscribed',
+	'NOTIFY_WEBPUSH_DROPDOWN_TITLE'	=> 'Visit notifications settings to set your preferred push notifications.',
 ]);

language/ru/webpushnotifications_module_ucp.php

@@ -45,4 +45,5 @@
 	'NOTIFY_WEBPUSH_SUBSCRIBE'		=> 'Подписаться',
 	'NOTIFY_WEBPUSH_UNSUBSCRIBE'	=> 'Отписаться',
 	'NOTIFY_WEBPUSH_SUBSCRIBED'		=> 'Включено',
+	'NOTIFY_WEBPUSH_DROPDOWN_TITLE'	=> 'Посетите настройки уведомлений, чтобы установить предпочтительные push-уведомления.',
 ]);

migrations/update_user_notifications.php

@@ -1,5 +1,5 @@
-{% if NOTIFICATIONS_WEBPUSH_ENABLE and not notification_types|default and not notification_list|default %}
-	<div class="wpn-notification-dropdown-footer">
+{% if NOTIFICATIONS_WEBPUSH_ENABLE and notification_types is not defined and notification_list is not defined %}
+	<div class="wpn-notification-dropdown-footer" title="{{ lang('NOTIFY_WEBPUSH_DROPDOWN_TITLE') }}">
 		<span class="ellipsis-text">{{ lang('NOTIFY_WEBPUSH_ENABLE_SHORT') ~ lang('COLON') }}</span>
 		<button id="subscribe_webpush" name="subscribe_webpush"><i class="icon fa-toggle-off fa-fw icon-lightgray"></i><span>{{ lang('NOTIFY_WEBPUSH_SUBSCRIBE') }}</span></button>
 		<button id="unsubscribe_webpush" name="unsubscribe_webpush" class="hidden"><i class="icon fa-toggle-on fa-fw icon-blue"></i><span>{{ lang('NOTIFY_WEBPUSH_SUBSCRIBED') }}</span></button>

styles/all/template/event/notification_dropdown_footer_after.html

@@ -1,4 +1,4 @@
-{% if NOTIFICATIONS_WEBPUSH_ENABLE %}
+{% if NOTIFICATIONS_WEBPUSH_ENABLE and notification_types is defined %}
 	<div class="panel">
 		<div class="inner">
 			<fieldset>

styles/prosilver/template/event/ucp_notifications_content_before.html

@@ -125,7 +125,6 @@ public function test_getSubscribedEvents()
 			'core.ucp_display_module_before',
 			'core.acp_main_notice',
 			'core.page_header_after',
-			'core.user_add_modify_notifications_data',
 		], array_keys(\phpbb\webpushnotifications\event\listener::getSubscribedEvents()));
 	}
 

tests/event/listener_test.php

@@ -72,12 +72,6 @@ public function test_ucp_module()
 
 		$this->assertContainsLang('NOTIFY_WEBPUSH_ENABLE', $crawler->filter('label[for="subscribe_webpush"]')->text());
 		$this->assertContainsLang('NOTIFICATION_METHOD_PHPBB_WPN_WEBPUSH', $crawler->filter('th.mark')->eq(2)->text());
-
-		$wp_list = $crawler->filter('.table1');
-		$this->assert_checkbox_is_checked($wp_list, 'notification.type.quote_notification.method.phpbb.wpn.webpush');
-		$this->assert_checkbox_is_checked($wp_list, 'notification.type.pm_notification.method.phpbb.wpn.webpush');
-		$this->assert_checkbox_is_unchecked($wp_list, 'notification.type.bookmark_notification.method.phpbb.wpn.webpush');
-		$this->assert_checkbox_is_unchecked($wp_list, 'notification.type.group_request_notification.method.phpbb.wpn.webpush');
 	}
 
 	public function test_dropdown_subscribe_button()