From ab267ce38dcabd946a5a31d36f0208859c825f99 Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Sun, 18 Apr 2021 18:58:26 -0700 Subject: [PATCH] fix: Disable polling on custom domain, closes #2041 --- app/components/SocketProvider.js | 5 ++++- shared/i18n/locales/en_US/translation.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/components/SocketProvider.js b/app/components/SocketProvider.js index 3bc4a7ed..0e1c654b 100644 --- a/app/components/SocketProvider.js +++ b/app/components/SocketProvider.js @@ -101,7 +101,10 @@ class SocketProvider extends React.Component { // on reconnection, reset the transports option, as the Websocket // connection may have failed (caused by proxy, firewall, browser, ...) this.socket.on("reconnect_attempt", () => { - this.socket.io.opts.transports = ["polling", "websocket"]; + this.socket.io.opts.transports = + auth.team && auth.team.domain + ? ["websocket"] + : ["websocket", "polling"]; }); this.socket.on("authenticated", () => { diff --git a/shared/i18n/locales/en_US/translation.json b/shared/i18n/locales/en_US/translation.json index a8b3071e..a4f77c24 100644 --- a/shared/i18n/locales/en_US/translation.json +++ b/shared/i18n/locales/en_US/translation.json @@ -388,9 +388,9 @@ "Whoops, you need to accept the permissions in Slack to connect Outline to your team. Try again?": "Whoops, you need to accept the permissions in Slack to connect Outline to your team. Try again?", "Something went wrong while authenticating your request. Please try logging in again?": "Something went wrong while authenticating your request. Please try logging in again?", "Get rich previews of Outline links shared in Slack and use the {{ command }} slash command to search for documents without leaving your chat.": "Get rich previews of Outline links shared in Slack and use the {{ command }} slash command to search for documents without leaving your chat.", + "Disconnect": "Disconnect", "Connect Outline collections to Slack channels and messages will be automatically posted to Slack when documents are published or updated.": "Connect Outline collections to Slack channels and messages will be automatically posted to Slack when documents are published or updated.", "Connected to the {{ channelName }} channel": "Connected to the {{ channelName }} channel", - "Disconnect": "Disconnect", "Connect": "Connect", "You’ve not starred any documents yet.": "You’ve not starred any documents yet.", "There are no templates just yet.": "There are no templates just yet.",