Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-14 08:19:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce differences with upstream due to import style (#2465)

Browse Source 
Fix relative / VS absolute style imports, and fix whitespace discrepancies
This commit is contained in:
Claire
2023-11-15 12:01:51 +01:00
committed by GitHub
parent f7d3b74e03
commit a97b722ad5
120 changed files with 379 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/javascript/flavours/glitch/stream.js
View File

@@ -1,6 +1,7 @@
// @ts-check
import WebSocketClient from '@gamestdio/websocket';
/**
* @type {WebSocketClient | undefined}
*/
@@ -85,12 +86,12 @@ const unsubscribe = ({ channelName, params, onDisconnect }) => {
};
const sharedCallbacks = {
connected () {
connected() {
subscriptions.forEach(subscription => subscribe(subscription));
},
// @ts-expect-error
received (data) {
received(data) {
const { stream } = data;
subscriptions.filter(({ channelName, params }) => {
@@ -114,11 +115,11 @@ const sharedCallbacks = {
});
},
disconnected () {
disconnected() {
subscriptions.forEach(subscription => unsubscribe(subscription));
},
reconnected () {
reconnected() {
},
};
@@ -151,19 +152,19 @@ export const connectStream = (channelName, params, callbacks) => (dispatch, getS
// to using individual connections for each channel
if (!streamingAPIBaseURL.startsWith('ws')) {
const connection = createConnection(streamingAPIBaseURL, accessToken, channelNameWithInlineParams(channelName, params), {
connected () {
connected() {
onConnect();
},
received (data) {
received(data) {
onReceive(data);
},
disconnected () {
disconnected() {
onDisconnect();
},
reconnected () {
reconnected() {
onConnect();
},
});
@@ -239,10 +240,10 @@ const createConnection = (streamingAPIBaseURL, accessToken, channelName, { conne
const ws = new WebSocketClient(`${streamingAPIBaseURL}/api/v1/streaming/?${params.join('&')}`, accessToken);
// @ts-expect-error
ws.onopen = connected;
ws.onmessage = e => received(JSON.parse(e.data));
ws.onopen = connected;
ws.onmessage = e => received(JSON.parse(e.data));
// @ts-expect-error
ws.onclose = disconnected;
ws.onclose = disconnected;
// @ts-expect-error
ws.onreconnect = reconnected;
@@ -265,7 +266,7 @@ const createConnection = (streamingAPIBaseURL, accessToken, channelName, { conne
};
KNOWN_EVENT_TYPES.forEach(type => {
es.addEventListener(type, e => handleEventSourceMessage(/** @type {MessageEvent} */ (e), received));
es.addEventListener(type, e => handleEventSourceMessage(/** @type {MessageEvent} */(e), received));
});
es.onerror = /** @type {function(): void} */ (disconnected);