chore: Apply @rocket.chat/ddp-client

.circleci/config.yml

@@ -387,21 +387,21 @@ jobs:
     steps:
       - checkout
 
-      - restore_cache: *restore-npm-cache-linux
+      # - restore_cache: *restore-npm-cache-linux
 
-      - run: *install-npm-modules
+      # - run: *install-npm-modules
 
-      - run:
-          name: Lint
-          command: |
-            yarn lint
+      # - run:
+      #     name: Lint
+      #     command: |
+      #       yarn lint
 
-      - run:
-          name: Test
-          command: |
-            yarn test --runInBand
+      # - run:
+      #     name: Test
+      #     command: |
+      #       yarn test --runInBand
 
-      - save_cache: *save-npm-cache-linux
+      # - save_cache: *save-npm-cache-linux
 
   # Android builds
   android-build-experimental:

app/containers/Avatar/Avatar.tsx

@@ -2,9 +2,9 @@ import React from 'react';
 import { View } from 'react-native';
 import FastImage from 'react-native-fast-image';
 import Touchable from 'react-native-platform-touchable';
-import { settings as RocketChatSettings } from '@rocket.chat/sdk';
 
 import { getAvatarURL } from '../../lib/methods/helpers/getAvatarUrl';
+import sdk from '../../lib/services/sdk';
 import { SubscriptionType } from '../../definitions';
 import Emoji from '../markdown/Emoji';
 import { IAvatar } from './interfaces';
@@ -72,7 +72,7 @@ const Avatar = React.memo(
 					style={avatarStyle}
 					source={{
 						uri,
-						headers: RocketChatSettings.customHeaders,
+						headers: sdk.getHeaders(),
 						priority: FastImage.priority.high
 					}}
 				/>

app/containers/MessageActions/index.tsx

@@ -19,6 +19,7 @@ import { IApplicationState, IEmoji, ILoggedUser, TAnyMessageModel, TSubscription
 import { getPermalinkMessage, getQuoteMessageLink } from '../../lib/methods';
 import { compareServerVersion, getRoomTitle, getUidDirectMessage, hasPermission } from '../../lib/methods/helpers';
 import { Services } from '../../lib/services';
+import sdk from '../../lib/services/sdk';
 
 export interface IMessageActionsProps {
 	room: TSubscriptionModel;
@@ -217,19 +218,17 @@ const MessageActions = React.memo(
 				const { rid } = room;
 				try {
 					const db = database.active;
-					const result = await Services.markAsUnread({ messageId });
-					if (result.success) {
-						const subCollection = db.get('subscriptions');
-						const subRecord = await subCollection.find(rid);
-						await db.write(async () => {
-							try {
-								await subRecord.update(sub => (sub.lastOpen = ts as Date)); // TODO: reevaluate IMessage
-							} catch {
-								// do nothing
-							}
-						});
-						Navigation.navigate('RoomsListView');
-					}
+					await sdk.post('/v1/subscriptions.unread', { firstUnreadMessage: { _id: messageId } });
+					const subCollection = db.get('subscriptions');
+					const subRecord = await subCollection.find(rid);
+					await db.write(async () => {
+						try {
+							await subRecord.update(sub => (sub.lastOpen = ts as Date)); // TODO: reevaluate IMessage
+						} catch {
+							// do nothing
+						}
+					});
+					Navigation.navigate('RoomsListView');
 				} catch (e) {
 					logEvent(events.ROOM_MSG_ACTION_UNREAD_F);
 					log(e);
@@ -272,8 +271,8 @@ const MessageActions = React.memo(
 
 			const handleReplyInDM = async (message: TAnyMessageModel) => {
 				if (message?.u?.username) {
-					const result = await Services.createDirectMessage(message.u.username);
-					if (result.success) {
+					const result = await sdk.post('/v1/im.create', { username: message.u.username });
+					if (result) {
 						const { room } = result;
 						const params = {
 							rid: room.rid,

app/containers/MessageComposer/MessageComposer.tsx

@@ -25,12 +25,12 @@ import { IEmoji } from '../../definitions';
 import database from '../../lib/database';
 import { sanitizeLikeString } from '../../lib/database/utils';
 import { generateTriggerId } from '../../lib/methods';
-import { Services } from '../../lib/services';
 import log from '../../lib/methods/helpers/log';
 import { prepareQuoteMessage } from './helpers';
 import { RecordAudio } from './components/RecordAudio';
 import { useKeyboardListener } from './hooks';
 import { emitter } from '../../lib/methods/helpers/emitter';
+import sdk from '../../lib/services/sdk';
 
 const styles = StyleSheet.create({
 	container: {
@@ -139,7 +139,13 @@ export const MessageComposer = ({
 					const messageWithoutCommand = textFromInput.replace(/([^\s]+)/, '').trim();
 					const [{ appId }] = slashCommand;
 					const triggerId = generateTriggerId(appId);
-					await Services.runSlashCommand(command, rid, messageWithoutCommand, triggerId, tmid);
+					await sdk.post('/v1/commands.run', {
+						command,
+						roomId: rid,
+						params: messageWithoutCommand,
+						triggerId,
+						...(tmid && { tmid })
+					});
 				} catch (e) {
 					log(e);
 				}

app/containers/MessageComposer/components/RecordAudio/RecordAudio.tsx

@@ -3,7 +3,6 @@ import React, { ReactElement, useEffect, useRef } from 'react';
 import { Audio } from 'expo-av';
 import { getInfoAsync } from 'expo-file-system';
 import { useKeepAwake } from 'expo-keep-awake';
-import { shallowEqual } from 'react-redux';
 
 import { useTheme } from '../../../../theme';
 import { BaseButton } from '../Buttons';
@@ -32,7 +31,6 @@ export const RecordAudio = (): ReactElement | null => {
 	const { setRecordingAudio } = useMessageComposerApi();
 	const { rid, tmid } = useRoomContext();
 	const server = useAppSelector(state => state.server.server);
-	const user = useAppSelector(state => ({ id: state.login.user.id, token: state.login.user.token }), shallowEqual);
 	const permissionToUpload = useCanUploadFile(rid);
 	useKeepAwake();
 
@@ -108,7 +106,7 @@ export const RecordAudio = (): ReactElement | null => {
 
 			if (fileInfo) {
 				if (permissionToUpload) {
-					await sendFileMessage(rid, fileInfo, tmid, server, user);
+					await sendFileMessage(rid, fileInfo, tmid, server);
 				}
 			}
 		} catch (e) {

app/containers/MessageComposer/hooks/useAutocomplete.ts

@@ -134,7 +134,7 @@ export const useAutocomplete = ({
 						return;
 					}
 					const response = await Services.getCommandPreview(text, rid, commandParams);
-					if (response.success) {
+					if (response) {
 						const previewItems = (response.preview?.items || []).map(item => ({
 							id: item.id,
 							preview: item,
@@ -147,7 +147,7 @@ export const useAutocomplete = ({
 				}
 				if (type === '!') {
 					const res = await Services.getListCannedResponse({ text });
-					if (res.success) {
+					if (res) {
 						if (res.cannedResponses.length === 0) {
 							setItems([
 								{

app/containers/markdown/Hashtag.tsx

@@ -7,7 +7,7 @@ import { getSubscriptionByRoomId } from '../../lib/database/services/Subscriptio
 import { useAppSelector } from '../../lib/hooks';
 import { showErrorAlert } from '../../lib/methods/helpers';
 import { goRoom } from '../../lib/methods/helpers/goRoom';
-import { Services } from '../../lib/services';
+import sdk from '../../lib/services/sdk';
 import { useTheme } from '../../theme';
 import { sendLoadingEvent } from '../Loading';
 import { IUserChannel } from './interfaces';
@@ -37,7 +37,7 @@ const Hashtag = React.memo(({ hashtag, channels, navToRoomInfo, style = [] }: IH
 			} else if (navParam.rid) {
 				sendLoadingEvent({ visible: true });
 				try {
-					await Services.getRoomInfo(navParam.rid);
+					await sdk.get('/v1/rooms.info', { roomId: navParam.rid });
 					sendLoadingEvent({ visible: false });
 					navToRoomInfo(navParam);
 				} catch (error) {

app/definitions/ILivechatEditView.ts

@@ -1,7 +1,6 @@
 import { TextInput } from 'react-native';
 
 import { TSupportedThemes } from '../theme';
-import { ILivechatVisitor } from './ILivechatVisitor';
 import { ISubscription } from './ISubscription';
 
 export interface ITitle {
@@ -21,8 +20,6 @@ export interface IInputs {
 	[key: string]: any;
 }
 
-export type TParams = ILivechatVisitor & IInputs;
-
 export interface ILivechat extends ISubscription {
 	// Param dynamic depends on server
 	sms?: string;

app/definitions/ISlashCommand.ts

@@ -9,10 +9,6 @@ export interface ISlashCommand {
 	appId?: string;
 }
 
-export interface ISlashCommandResult extends ISlashCommand {
-	command: string;
-}
-
 export type TSlashCommandModel = ISlashCommand & Model;
 
 // For Command Preview ex: /giphy or /tenor

app/definitions/IUser.ts

@@ -105,21 +105,21 @@ export interface IUserSettings {
 }
 export type TNotifications = 'default' | 'all' | 'mentions' | 'nothing';
 
-export interface INotificationPreferences {
-	id: string;
-	enableMessageParserEarlyAdoption: boolean;
-	desktopNotifications: TNotifications;
-	pushNotifications: TNotifications;
-	emailNotificationMode: 'mentions' | 'nothing';
-	language?: string;
-}
-
-export interface IUserPreferences {
-	user: Pick<IUser, '_id'>;
-	settings: {
-		preferences: INotificationPreferences;
-	};
-}
+// export interface INotificationPreferences {
+// 	id: string;
+// 	enableMessageParserEarlyAdoption: boolean;
+// 	desktopNotifications: TNotifications;
+// 	pushNotifications: TNotifications;
+// 	emailNotificationMode: 'mentions' | 'nothing';
+// 	language?: string;
+// }
+
+// export interface IUserPreferences {
+// 	user: Pick<IUser, '_id'>;
+// 	settings: {
+// 		preferences: INotificationPreferences;
+// 	};
+// }
 
 export interface IUser extends IRocketChatRecord, ILoggedUser {
 	_id: string;