From 47e1f6e95b379bb96a51a7542a8bfcef2d2a199a Mon Sep 17 00:00:00 2001
From: lucasmidlhey <lucasmidlhey@hotmail.com>
Date: Wed, 25 Nov 2020 18:23:21 -0300
Subject: [PATCH 1/3] rename and remove subcribe and unsubscribe

---
 app/lib/rocketchat.js | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/app/lib/rocketchat.js b/app/lib/rocketchat.js
index 9e246cb8e4..77d476a72e 100644
--- a/app/lib/rocketchat.js
+++ b/app/lib/rocketchat.js
@@ -22,6 +22,7 @@ import { disconnect, connectSuccess, connectRequest } from '../actions/connect';
 import { shareSelectServer, shareSetUser, shareSetSettings } from '../actions/share';
 
 import subscribeRooms from './methods/subscriptions/rooms';
+import unsubscribeRooms from './rooms';
 import getUsersPresence, { getUserPresence, subscribeUsersPresence } from './methods/getUsersPresence';
 
 import protectedFunction from './methods/helpers/protectedFunction';
@@ -75,21 +76,8 @@ const RocketChat = {
 	TOKEN_KEY,
 	CURRENT_SERVER,
 	callJitsi,
-	async subscribeRooms() {
-		if (!this.roomsSub) {
-			try {
-				this.roomsSub = await subscribeRooms.call(this);
-			} catch (e) {
-				log(e);
-			}
-		}
-	},
-	unsubscribeRooms() {
-		if (this.roomsSub) {
-			this.roomsSub.stop();
-			this.roomsSub = null;
-		}
-	},
+	subscribeRooms,
+	unsubscribeRooms,
 	canOpenRoom,
 	createChannel({
 		name, users, type, readOnly, broadcast, encrypted
@@ -163,12 +151,11 @@ const RocketChat = {
 	stopListener(listener) {
 		return listener && listener.stop();
 	},
-	// Abort all requests and create a new AbortController
-	abort() {
+	abortRequests() {
 		if (this.controller) {
-			this.controller.abort();
+			this.controller.abortRequests();
 			if (this.sdk) {
-				this.sdk.abort();
+				this.sdk.abortRequests();
 			}
 		}
 		this.controller = new AbortController();
@@ -526,8 +513,8 @@ const RocketChat = {
 			await serversDB.action(async() => {
 				const serverCollection = serversDB.collections.get('servers');
 				const serverRecord = await serverCollection.find(server);
-				await serverRecord.update((s) => {
-					s.roomsUpdatedAt = null;
+				await serverRecord.update((recServer) => {
+					recServer.roomsUpdatedAt = null;
 				});
 			});
 		} catch (e) {

From 12ca10e02df1e26c2397aa40788595bd7f36d8e1 Mon Sep 17 00:00:00 2001
From: lucasmidlhey <lucasmidlhey@hotmail.com>
Date: Wed, 25 Nov 2020 18:25:39 -0300
Subject: [PATCH 2/3] add subscribe and subscribe

---
 app/lib/rooms.js | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 app/lib/rooms.js

diff --git a/app/lib/rooms.js b/app/lib/rooms.js
new file mode 100644
index 0000000000..64bf15f361
--- /dev/null
+++ b/app/lib/rooms.js
@@ -0,0 +1,22 @@
+import subscribeRooms from './methods/subscriptions/rooms';
+import log from '../utils/log';
+
+const Rooms = {
+	async subscribeRooms() {
+		if (!this.roomsSub) {
+			try {
+				this.roomsSub = await subscribeRooms.call(this);
+			} catch (e) {
+				log(e);
+			}
+		}
+	},
+	unsubscribeRooms() {
+		if (this.roomsSub) {
+			this.roomsSub.stop();
+			this.roomsSub = null;
+		}
+	}
+};
+
+export default Rooms;

From e05c1668687b84294feb0235496897f023be3d07 Mon Sep 17 00:00:00 2001
From: lucasmidlhey <lucasmidlhey@hotmail.com>
Date: Thu, 26 Nov 2020 16:14:22 -0300
Subject: [PATCH 3/3] rename error

---
 app/lib/rooms.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/lib/rooms.js b/app/lib/rooms.js
index 64bf15f361..2da1230155 100644
--- a/app/lib/rooms.js
+++ b/app/lib/rooms.js
@@ -6,8 +6,8 @@ const Rooms = {
 		if (!this.roomsSub) {
 			try {
 				this.roomsSub = await subscribeRooms.call(this);
-			} catch (e) {
-				log(e);
+			} catch (error) {
+				log(error);
 			}
 		}
 	},