From 019df789408cd6015e3c8e483b599b7daaf930e1 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 14 May 2022 16:07:03 +0200
Subject: [PATCH] Remove the option to disable desktop notifications

Fixes #4806
---
 com.woltlab.wcf/option.xml                      | 7 +------
 constants.php                                   | 1 -
 wcfsetup/install/files/lib/system/WCF.class.php | 8 +++++---
 wcfsetup/install/lang/de.xml                    | 4 ++--
 wcfsetup/install/lang/en.xml                    | 4 ++--
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 361692e213..dd1ce33cf5 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -453,12 +453,6 @@
 				<options>module_wcf_ad</options>
 			</option>
 			<option name="enable_polling">
-				<categoryname>general.page</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>1</defaultvalue>
-				<enableoptions>enable_desktop_notifications,desktop_notification_package_id</enableoptions>
-			</option>
-			<option name="enable_desktop_notifications">
 				<categoryname>general.page</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>1</defaultvalue>
@@ -1675,5 +1669,6 @@ DESC:wcf.global.sortOrder.descending</selectoptions>
 		<option name="url_legacy_mode"/>
 		<option name="enable_censorship"/>
 		<option name="search_use_captcha" />
+		<option name="enable_desktop_notifications"/>
 	</delete>
 </data>
diff --git a/constants.php b/constants.php
index 6144dfe294..3bf8a29881 100644
--- a/constants.php
+++ b/constants.php
@@ -202,7 +202,6 @@
 \define('ARTICLE_ENABLE_VISIT_TRACKING', 1);
 \define('ENABLE_AD_ROTATION', 1);
 \define('ENABLE_POLLING', 1);
-\define('ENABLE_DESKTOP_NOTIFICATIONS', 1);
 \define('FB_SHARE_APP_ID', '');
 \define('MODULE_CONTACT_FORM', 0);
 \define('SITEMAP_INDEX_TIME_FRAME', 365);
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index f8da53a2df..7fec9f3b3c 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -495,6 +495,10 @@ class WCF
 
         // The captcha option related to the removed SearchForm was removed in 5.5.
         \define('SEARCH_USE_CAPTCHA', 0);
+
+        // The prompt for desktop notifications is no longer obtrusive since 5.5.
+        // https://github.com/WoltLab/WCF/issues/4806
+        \define('ENABLE_DESKTOP_NOTIFICATIONS', 1);
     }
 
     /**
@@ -1178,9 +1182,7 @@ class WCF
      */
     public function useDesktopNotifications()
     {
-        if (!ENABLE_DESKTOP_NOTIFICATIONS) {
-            return false;
-        } elseif (ApplicationHandler::getInstance()->isMultiDomainSetup()) {
+        if (ApplicationHandler::getInstance()->isMultiDomainSetup()) {
             $application = ApplicationHandler::getInstance()->getApplicationByID(DESKTOP_NOTIFICATION_PACKAGE_ID);
             // mismatch, default to Core
             if ($application === null) {
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index e03b18975b..7c0bf15973 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1695,8 +1695,6 @@ Als Benachrichtigungs-URL in der Konfiguration der sofortigen Zahlungsbestätigu
 		<item name="wcf.acp.option.fb_share_app_id.description"><![CDATA[Die App ID kann direkt über das <a href="https://developers.facebook.com/docs/apps/register?locale=de_DE" class="externalURL">App-Dashboard angefordert werden</a>, und wird für die Open Graph-Tags zum Teilen verwendet.]]></item>
 		<item name="wcf.acp.option.enable_polling"><![CDATA[Hintergrund-Aktualisierung von Benachrichtigungen aktivieren]]></item>
 		<item name="wcf.acp.option.enable_polling.description"><![CDATA[Neue Benachrichtigungen werden in periodischen Abständen automatisch abgerufen. Das Aktualisierungs-Intervall beträgt 5 Minuten und wird bei Inaktivität schrittweise auf 15 Minuten reduziert.]]></item>
-		<item name="wcf.acp.option.enable_desktop_notifications"><![CDATA[Desktop-Benachrichtigungen verwenden]]></item>
-		<item name="wcf.acp.option.enable_desktop_notifications.description"><![CDATA[Neue Benachrichtigungen, die im Hintergrund abgerufen wurden, werden als kleines Benachrichtigungsfenster unmittelbar angezeigt.]]></item>
 		<item name="wcf.acp.option.module_contact_form"><![CDATA[Kontaktformular aktivieren]]></item>
 		<item name="wcf.acp.option.module_contact_form.description"><![CDATA[Aktiviert das Kontaktformular, nach Aktivierung können Sie die <a href="{link controller='ContactSettings'}{/link}">Eingabefelder und Empfänger</a> individuell konfigurieren.]]></item>
 		<item name="wcf.acp.option.module_trophy"><![CDATA[Trophäen]]></item>
@@ -5618,5 +5616,7 @@ Benachrichtigungen auf <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phra
 	<item name="wcf.user.panel.markAsRead" />
 	<item name="wcf.user.profile.user" />
 	<item name="wcf.user.profile.customization" />
+	<item name="wcf.acp.option.enable_desktop_notifications"/>
+	<item name="wcf.acp.option.enable_desktop_notifications.description"/>
 </delete>
 </language>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index a46592b2f2..752a3c139f 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1681,8 +1681,6 @@ When prompted for the notification URL for the instant payment notifications, pl
 		<item name="wcf.acp.option.fb_share_app_id.description"><![CDATA[You can obtain the app ID from your <a href="https://developers.facebook.com/docs/apps/register?locale=en_US" class="externalURL">app’s dashboard</a>, and is used with the Open Graph tags for sharing.]]></item>
 		<item name="wcf.acp.option.enable_polling"><![CDATA[Enable Background Notifications]]></item>
 		<item name="wcf.acp.option.enable_polling.description"><![CDATA[Periodically retrieves new notifications in the background, requests are dispatched every 5 minutes. Interval decreases down to 15 minutes on inactivity.]]></item>
-		<item name="wcf.acp.option.enable_desktop_notifications"><![CDATA[Enable Desktop Notifications]]></item>
-		<item name="wcf.acp.option.enable_desktop_notifications.description"><![CDATA[Display a small window for new notifications that have been retrieved in the background.]]></item>
 		<item name="wcf.acp.option.module_contact_form"><![CDATA[Enable contact form]]></item>
 		<item name="wcf.acp.option.module_contact_form.description"><![CDATA[Enables the contact form, once enabled you can customize the <a href="{link controller='ContactSettings'}{/link}">input fields and recipients</a> to better suit your needs.]]></item>
 		<item name="wcf.acp.option.module_trophy"><![CDATA[Trophies]]></item>
@@ -5620,5 +5618,7 @@ your notifications on <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phras
 	<item name="wcf.user.panel.markAsRead" />
 	<item name="wcf.user.profile.user" />
 	<item name="wcf.user.profile.customization" />
+	<item name="wcf.acp.option.enable_desktop_notifications"/>
+	<item name="wcf.acp.option.enable_desktop_notifications.description"/>
 </delete>
 </language>
-- 
2.20.1