diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index 15ba6cee1..57c0b0b79 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -35,6 +35,11 @@ Changed this is a "best effort" fix and you should be using the "older browsers" ("legacy") build of PDF.js instead. +Removed +~~~~~~~ + +- The `ua-slack` site-specific quirk, as things seem to work better nowadays without a quirk needed. + Fixed ~~~~~ diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc index 452c741d7..acda18dd6 100644 --- a/doc/help/settings.asciidoc +++ b/doc/help/settings.asciidoc @@ -2772,7 +2772,6 @@ Valid values: * +ua-whatsapp+ * +ua-google+ - * +ua-slack+ * +ua-googledocs+ * +ua-digitecgalaxus+ * +js-whatsapp-web+ diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py index a5c45d5cf..a37a47b8d 100644 --- a/qutebrowser/browser/webengine/webenginesettings.py +++ b/qutebrowser/browser/webengine/webenginesettings.py @@ -26,7 +26,7 @@ from qutebrowser.config import config, websettings from qutebrowser.config.websettings import AttributeInfo as Attr from qutebrowser.misc import pakjoy from qutebrowser.utils import (standarddir, qtutils, message, log, - urlmatch, usertypes, objreg, version) + urlmatch, usertypes, objreg, version, utils) if TYPE_CHECKING: from qutebrowser.browser.webengine import interceptor @@ -514,33 +514,19 @@ def _init_site_specific_quirks(): "Safari/537.36" ) + utils.unused(maybe_newer_chrome_ua) + user_agents = [ # Needed to avoid a ""WhatsApp works with Google Chrome 36+" error # page which doesn't allow to use WhatsApp Web at all. Also see the # additional JS quirk: qutebrowser/javascript/quirks/whatsapp_web.user.js # https://github.com/qutebrowser/qutebrowser/issues/4445 - ("ua-whatsapp", 'https://web.whatsapp.com/', no_qtwe_ua), + ("ua-whatsapp", "https://web.whatsapp.com/", no_qtwe_ua), # Needed to avoid a "you're using a browser [...] that doesn't allow us # to keep your account secure" error. # https://github.com/qutebrowser/qutebrowser/issues/5182 - ("ua-google", 'https://accounts.google.com/*', firefox_ua), - - # Needed because Slack adds an error which prevents using it relatively - # aggressively, despite things actually working fine. - # - # March 2025 situation: - # - https://slack.com/help/articles/1500001836081-Slack-support-lifecycle-for-operating-systems-app-versions-and-browsers - # claims that Chrome 123 is needed - # - Qt 6.9 (130 based) works fine and doesn't display any banner, but is - # not released yet. - # - Qt 6.8 (122 based) displays a "This browser won’t be supported - # starting March 15th, 2025" banner on March 17th, but works just fine - # with the default UA still... - # - With the default UA, Qt 6.7 (118 based) breaks. - # - With the workaround, Qt 6.4 (102 based) still seems to work perfectly fine, - # while Qt 6.3 (94 based) works fine but has some styling issues. - ("ua-slack", 'https://*.slack.com/*', maybe_newer_chrome_ua(123)), + ("ua-google", "https://accounts.google.com/*", firefox_ua), ] for name, pattern, ua in user_agents: diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml index f3a34eec9..19366edfc 100644 --- a/qutebrowser/config/configdata.yml +++ b/qutebrowser/config/configdata.yml @@ -658,7 +658,6 @@ content.site_specific_quirks.skip: valid_values: - ua-whatsapp - ua-google - - ua-slack - ua-googledocs - ua-digitecgalaxus - js-whatsapp-web