Set Rest.{Message, PresenceMessage} directly in the class

Less code, and consistent with Realtime.
ably · May 9, 2023 · bb480b0 · bb480b0
1 parent b79fba5
commit bb480b0
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 32 deletions.
diff --git a/src/common/lib/client/rest.ts b/src/common/lib/client/rest.ts
@@ -241,8 +241,8 @@ class Rest {
   static Callbacks = Rest;
   static Platform = Platform;
   static Crypto?: typeof Platform.Crypto;
-  static Message?: typeof Message;
-  static PresenceMessage?: typeof PresenceMessage;
+  static Message = Message;
+  static PresenceMessage = PresenceMessage;
 }
 
 class Channels {

diff --git a/src/platform/nativescript/index.ts b/src/platform/nativescript/index.ts
@@ -18,8 +18,6 @@ import { getDefaults } from '../../common/lib/util/defaults';
 import WebStorage from './lib/util/webstorage';
 import PlatformDefaults from '../web/lib/util/defaults';
 import msgpack from '../web/lib/util/msgpack';
-import Message from 'common/lib/types/message';
-import PresenceMessage from 'common/lib/types/presencemessage';
 
 Platform.Crypto = Crypto;
 Platform.BufferUtils = BufferUtils;
@@ -31,10 +29,6 @@ Platform.WebStorage = WebStorage;
 Rest.Crypto = Crypto;
 Realtime.Crypto = Crypto;
 
-Rest.Message = Message;
-
-Rest.PresenceMessage = PresenceMessage;
-
 Logger.initLogHandlers();
 
 Platform.Defaults = getDefaults(PlatformDefaults);

diff --git a/src/platform/nodejs/index.ts b/src/platform/nodejs/index.ts
@@ -14,8 +14,6 @@ import Transports from './lib/transport';
 import Logger from '../../common/lib/util/logger';
 import { getDefaults } from '../../common/lib/util/defaults';
 import PlatformDefaults from './lib/util/defaults';
-import Message from 'common/lib/types/message';
-import PresenceMessage from 'common/lib/types/presencemessage';
 
 Platform.Crypto = Crypto;
 Platform.BufferUtils = BufferUtils;
@@ -27,10 +25,6 @@ Platform.WebStorage = null;
 Rest.Crypto = Crypto;
 Realtime.Crypto = Crypto;
 
-Rest.Message = Message;
-
-Rest.PresenceMessage = PresenceMessage;
-
 Logger.initLogHandlers();
 
 Platform.Defaults = getDefaults(PlatformDefaults);

diff --git a/src/platform/react-native/index.ts b/src/platform/react-native/index.ts
@@ -16,8 +16,6 @@ import { getDefaults } from '../../common/lib/util/defaults';
 import WebStorage from '../web/lib/util/webstorage';
 import PlatformDefaults from '../web/lib/util/defaults';
 import msgpack from '../web/lib/util/msgpack';
-import Message from 'common/lib/types/message';
-import PresenceMessage from 'common/lib/types/presencemessage';
 
 Platform.Crypto = Crypto;
 Platform.BufferUtils = BufferUtils;
@@ -29,10 +27,6 @@ Platform.WebStorage = WebStorage;
 Rest.Crypto = Crypto;
 Realtime.Crypto = Crypto;
 
-Rest.Message = Message;
-
-Rest.PresenceMessage = PresenceMessage;
-
 Logger.initLogHandlers();
 
 Platform.Defaults = getDefaults(PlatformDefaults);

diff --git a/src/platform/web-noencryption/index.ts b/src/platform/web-noencryption/index.ts
@@ -15,8 +15,6 @@ import { getDefaults } from '../../common/lib/util/defaults';
 import WebStorage from '../web/lib/util/webstorage';
 import PlatformDefaults from '../web/lib/util/defaults';
 import msgpack from '../web/lib/util/msgpack';
-import Message from 'common/lib/types/message';
-import PresenceMessage from 'common/lib/types/presencemessage';
 
 Platform.Crypto = null;
 Platform.BufferUtils = BufferUtils;
@@ -28,10 +26,6 @@ Platform.WebStorage = WebStorage;
 Rest.Crypto = Crypto;
 Realtime.Crypto = Crypto;
 
-Rest.Message = Message;
-
-Rest.PresenceMessage = PresenceMessage;
-
 Logger.initLogHandlers();
 
 Platform.Defaults = getDefaults(PlatformDefaults);

diff --git a/src/platform/web/index.ts b/src/platform/web/index.ts
@@ -16,8 +16,6 @@ import { getDefaults } from '../../common/lib/util/defaults';
 import WebStorage from './lib/util/webstorage';
 import PlatformDefaults from './lib/util/defaults';
 import msgpack from './lib/util/msgpack';
-import Message from 'common/lib/types/message';
-import PresenceMessage from 'common/lib/types/presencemessage';
 
 Platform.Crypto = Crypto;
 Platform.BufferUtils = BufferUtils;
@@ -29,10 +27,6 @@ Platform.WebStorage = WebStorage;
 Rest.Crypto = Crypto;
 Realtime.Crypto = Crypto;
 
-Rest.Message = Message;
-
-Rest.PresenceMessage = PresenceMessage;
-
 Logger.initLogHandlers();
 
 Platform.Defaults = getDefaults(PlatformDefaults);