From 702aadfddd60f80d5bf942e7cb8b95f7dd12eb7a Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Fri, 28 Jan 2022 15:53:55 -0300
Subject: [PATCH] Not require Websocket type definition imports

---
 app/actions/websocket/channel.ts           | 2 --
 app/actions/websocket/index.ts             | 1 -
 app/actions/websocket/posts.ts             | 2 --
 app/actions/websocket/preferences.ts       | 1 -
 app/actions/websocket/teams.ts             | 2 --
 types/api/{websocket.ts => websocket.d.ts} | 4 ++--
 6 files changed, 2 insertions(+), 10 deletions(-)
 rename types/api/{websocket.ts => websocket.d.ts} (81%)

diff --git a/app/actions/websocket/channel.ts b/app/actions/websocket/channel.ts
index 9f64b517b6..dbeebedac2 100644
--- a/app/actions/websocket/channel.ts
+++ b/app/actions/websocket/channel.ts
@@ -18,8 +18,6 @@ import {queryCurrentUser, queryUserById} from '@queries/servers/user';
 import {dismissAllModals, popToRoot} from '@screens/navigation';
 import {isTablet} from '@utils/helpers';
 
-import type {WebSocketMessage} from '@typings/api/websocket';
-
 export async function handleUserAddedToChannelEvent(serverUrl: string, msg: any) {
     const database = DatabaseManager.serverDatabases[serverUrl];
     if (!database) {
diff --git a/app/actions/websocket/index.ts b/app/actions/websocket/index.ts
index aecc0bc15e..6da5ae24d5 100644
--- a/app/actions/websocket/index.ts
+++ b/app/actions/websocket/index.ts
@@ -26,7 +26,6 @@ import {handleLeaveTeamEvent} from './teams';
 import {handleUserUpdatedEvent} from './users';
 
 import type {Model} from '@nozbe/watermelondb';
-import type {WebSocketMessage} from '@typings/api/websocket';
 
 export async function handleFirstConnect(serverUrl: string) {
     const database = DatabaseManager.serverDatabases[serverUrl]?.database;
diff --git a/app/actions/websocket/posts.ts b/app/actions/websocket/posts.ts
index 008be00c58..2b6bf07005 100644
--- a/app/actions/websocket/posts.ts
+++ b/app/actions/websocket/posts.ts
@@ -15,8 +15,6 @@ import {queryPostById} from '@queries/servers/post';
 import {queryCurrentChannelId, queryCurrentUserId} from '@queries/servers/system';
 import {isFromWebhook, isSystemMessage, shouldIgnorePost} from '@utils/post';
 
-import type {WebSocketMessage} from '@typings/api/websocket';
-
 export async function handleNewPostEvent(serverUrl: string, msg: WebSocketMessage) {
     const operator = DatabaseManager.serverDatabases[serverUrl]?.operator;
     if (!operator) {
diff --git a/app/actions/websocket/preferences.ts b/app/actions/websocket/preferences.ts
index 5e24cd1fd6..9fda7351dd 100644
--- a/app/actions/websocket/preferences.ts
+++ b/app/actions/websocket/preferences.ts
@@ -3,7 +3,6 @@
 
 import {deletePreferences} from '@app/queries/servers/preference';
 import DatabaseManager from '@database/manager';
-import {WebSocketMessage} from '@typings/api/websocket';
 
 export async function handlePreferenceChangedEvent(serverUrl: string, msg: WebSocketMessage): Promise<void> {
     const database = DatabaseManager.serverDatabases[serverUrl];
diff --git a/app/actions/websocket/teams.ts b/app/actions/websocket/teams.ts
index 0c55a3b69f..6115bcf7f7 100644
--- a/app/actions/websocket/teams.ts
+++ b/app/actions/websocket/teams.ts
@@ -14,8 +14,6 @@ import {queryLastTeam} from '@queries/servers/team';
 import {queryCurrentUser} from '@queries/servers/user';
 import {dismissAllModals, popToRoot} from '@screens/navigation';
 
-import type {WebSocketMessage} from '@typings/api/websocket';
-
 export async function handleLeaveTeamEvent(serverUrl: string, msg: WebSocketMessage) {
     const database = DatabaseManager.serverDatabases[serverUrl];
     if (!database) {
diff --git a/types/api/websocket.ts b/types/api/websocket.d.ts
similarity index 81%
rename from types/api/websocket.ts
rename to types/api/websocket.d.ts
index a429dc6c52..86ef975b04 100644
--- a/types/api/websocket.ts
+++ b/types/api/websocket.d.ts
@@ -1,14 +1,14 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-export type WebsocketBroadcast = {
+type WebsocketBroadcast = {
     omit_users: Dictionary<boolean>;
     user_id: string;
     channel_id: string;
     team_id: string;
 }
 
-export type WebSocketMessage = {
+type WebSocketMessage = {
     event: string;
     data: any;
     broadcast: WebsocketBroadcast;