From 3f3e0e76db2f7afde9b75892032eac9ad07bfffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Espino=20Garc=C3=ADa?= Date: Thu, 12 May 2022 18:45:29 +0200 Subject: [PATCH] Remove unneeded actions on team switch (#6265) --- app/actions/remote/team.ts | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/app/actions/remote/team.ts b/app/actions/remote/team.ts index 84ea899d9..ae68f0446 100644 --- a/app/actions/remote/team.ts +++ b/app/actions/remote/team.ts @@ -11,7 +11,7 @@ import DatabaseManager from '@database/manager'; import NetworkManager from '@managers/network_manager'; import {prepareCategories, prepareCategoryChannels} from '@queries/servers/categories'; import {prepareMyChannelsForTeam, getDefaultChannelForTeam} from '@queries/servers/channel'; -import {prepareCommonSystemValues, getCurrentTeamId, getWebSocketLastDisconnected} from '@queries/servers/system'; +import {prepareCommonSystemValues, getCurrentTeamId} from '@queries/servers/system'; import {addTeamToTeamHistory, prepareDeleteTeam, prepareMyTeams, getNthLastChannelFromTeam, queryTeamsById, syncTeamTable} from '@queries/servers/team'; import EphemeralStore from '@store/ephemeral_store'; import {isTablet} from '@utils/helpers'; @@ -279,7 +279,6 @@ export async function handleTeamChange(serverUrl: string, teamId: string) { await switchToChannelById(serverUrl, channelId, teamId); } DeviceEventEmitter.emit(Events.TEAM_SWITCH, false); - completeTeamChange(serverUrl, teamId, channelId); return; } } @@ -298,25 +297,4 @@ export async function handleTeamChange(serverUrl: string, teamId: string) { await operator.batchRecords(models); } DeviceEventEmitter.emit(Events.TEAM_SWITCH, false); - - completeTeamChange(serverUrl, teamId, channelId); } - -const completeTeamChange = async (serverUrl: string, teamId: string, channelId: string) => { - const database = DatabaseManager.serverDatabases[serverUrl]?.database; - if (!database) { - return; - } - - // If WebSocket is not disconnected we fetch everything since this moment - const lastDisconnectedAt = (await getWebSocketLastDisconnected(database)) || Date.now(); - const {channels, memberships, error} = await fetchMyChannelsForTeam(serverUrl, teamId, true, lastDisconnectedAt, false, true); - - if (error) { - DeviceEventEmitter.emit(Events.TEAM_LOAD_ERROR, serverUrl, error); - } - - if (channels?.length && memberships?.length) { - fetchPostsForUnreadChannels(serverUrl, channels, memberships, channelId); - } -};