From 72b1d5fdc547f575ce10e61b4e523dc3d9d7d036 Mon Sep 17 00:00:00 2001
From: Daigo 3 Dango <zunda@users.noreply.github.com>
Date: Mon, 24 Aug 2020 12:06:45 +0000
Subject: [PATCH] [Glitch] Better manage subscriptionCounters
Port 9669557be1d9c8577564242861bdbad9b821906a to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
---
app/javascript/flavours/glitch/util/stream.js | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/app/javascript/flavours/glitch/util/stream.js b/app/javascript/flavours/glitch/util/stream.js
index 640455b33d..cf1388aed2 100644
--- a/app/javascript/flavours/glitch/util/stream.js
+++ b/app/javascript/flavours/glitch/util/stream.js
@@ -112,11 +112,10 @@ const sharedCallbacks = {
},
disconnected () {
- subscriptions.forEach(({ onDisconnect }) => onDisconnect());
+ subscriptions.forEach(subscription => unsubscribe(subscription));
},
reconnected () {
- subscriptions.forEach(subscription => subscribe(subscription));
},
};
@@ -252,15 +251,8 @@ const createConnection = (streamingAPIBaseURL, accessToken, channelName, { conne
const es = new EventSource(`${streamingAPIBaseURL}/api/v1/streaming/${channelName}?${params.join('&')}`);
- let firstConnect = true;
-
es.onopen = () => {
- if (firstConnect) {
- firstConnect = false;
- connected();
- } else {
- reconnected();
- }
+ connected();
};
KNOWN_EVENT_TYPES.forEach(type => {