verdnatura-mirror
/
verdnatura-chat
forked from verdnatura-mirror/Rocket.Chat.ReactNative
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into chore.dehydrate-login-methods-from-rocketchatjs

This commit is contained in:
Gerzon Z 2022-03-02 13:49:54 -04:00 committed by GitHub
parent f8fe01bf6b c5023eaeea
commit 0694d7b67f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/definitions/rest/v1/channels.ts
View File

@ -1,3 +1,4 @@
import { ITeam } from '../../ITeam';
import type { IMessage, IMessageFromServer } from '../../IMessage'; import type { IMessage, IMessageFromServer } from '../../IMessage';
import type { IRoom } from '../../IRoom'; import type { IRoom } from '../../IRoom';
import type { IUser } from '../../IUser'; import type { IUser } from '../../IUser';
@ -28,4 +29,7 @@ export type ChannelsEndpoints = {
messages: IMessageFromServer[]; messages: IMessageFromServer[];
}; };
}; };
'channels.convertToTeam': {
POST: (params: { channelId: string; channelName: string }) => { team: ITeam };
};
}; };

4
app/definitions/rest/v1/groups.ts
View File

@ -1,3 +1,4 @@
import { ITeam } from '../../ITeam';
import type { IMessage, IMessageFromServer } from '../../IMessage'; import type { IMessage, IMessageFromServer } from '../../IMessage';
import type { IRoom } from '../../IRoom'; import type { IRoom } from '../../IRoom';
import type { IUser } from '../../IUser'; import type { IUser } from '../../IUser';
@ -22,4 +23,7 @@ export type GroupsEndpoints = {
messages: IMessageFromServer[]; messages: IMessageFromServer[];
}; };
}; };
'groups.convertToTeam': {
POST: (params: { roomId: string; roomName: string }) => { team: ITeam };
};
}; };

4
app/definitions/rest/v1/index.ts
View File

@ -15,6 +15,7 @@ import { UserEndpoints } from './user';
import { UsersEndpoints } from './users'; import { UsersEndpoints } from './users';
import { TeamsEndpoints } from './teams'; import { TeamsEndpoints } from './teams';
import { E2eEndpoints } from './e2e'; import { E2eEndpoints } from './e2e';
import { SubscriptionsEndpoints } from './subscriptions';
export type Endpoints = ChannelsEndpoints & export type Endpoints = ChannelsEndpoints &
ChatEndpoints & ChatEndpoints &
@ -32,4 +33,5 @@ export type Endpoints = ChannelsEndpoints &
UserEndpoints & UserEndpoints &
UsersEndpoints & UsersEndpoints &
TeamsEndpoints & TeamsEndpoints &
E2eEndpoints; E2eEndpoints &
SubscriptionsEndpoints;

5
app/definitions/rest/v1/subscriptions.ts Normal file
View File

@ -0,0 +1,5 @@
export type SubscriptionsEndpoints = {
'subscriptions.unread': {
POST: (params: { firstUnreadMessage: { _id: string } }) => {};
};
};

8
app/lib/rocketchat/services/restApi.ts
View File

@ -220,7 +220,7 @@ export const teamListRoomsOfUser = ({ teamId, userId }: { teamId: string; userId
// @ts-ignore // @ts-ignore
sdk.get('teams.listRoomsOfUser', { teamId, userId }); sdk.get('teams.listRoomsOfUser', { teamId, userId });
export const convertChannelToTeam = ({ rid, name, type }: { rid: string; name: string; type: 'c' | 'p' }): any => { export const convertChannelToTeam = ({ rid, name, type }: { rid: string; name: string; type: 'c' | 'p' }) => {
const params = { const params = {
...(type === 'c' ...(type === 'c'
? { ? {
@ -232,8 +232,6 @@ export const convertChannelToTeam = ({ rid, name, type }: { rid: string; name: s
roomName: name roomName: name
}) })
}; };
// TODO: missing definitions from server
// @ts-ignore
return sdk.post(type === 'c' ? 'channels.convertToTeam' : 'groups.convertToTeam', params); return sdk.post(type === 'c' ? 'channels.convertToTeam' : 'groups.convertToTeam', params);
}; };
@ -264,10 +262,8 @@ export const deleteMessage = (messageId: string, rid: string): any =>
// @ts-ignore // @ts-ignore
sdk.post('chat.delete', { msgId: messageId, roomId: rid }); sdk.post('chat.delete', { msgId: messageId, roomId: rid });
export const markAsUnread = ({ messageId }: { messageId: string }): any => export const markAsUnread = ({ messageId }: { messageId: string }) =>
// RC 0.65.0 // RC 0.65.0
// TODO: missing definitions from server
// @ts-ignore
sdk.post('subscriptions.unread', { firstUnreadMessage: { _id: messageId } }); sdk.post('subscriptions.unread', { firstUnreadMessage: { _id: messageId } });
export const toggleStarMessage = (messageId: string, starred: boolean): any => { export const toggleStarMessage = (messageId: string, starred: boolean): any => {