sergiodt
/
vn-verdnaturachat
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FIX] Join discussion (#1000)

This commit is contained in:
Diego Mello 2019-06-20 16:02:50 -03:00 committed by GitHub
parent 1383b9b735
commit e52739e305
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/lib/rocketchat.js
View File

@ -447,9 +447,12 @@ const RocketChat = {
// RC 0.59.0 // RC 0.59.0
return this.sdk.post('im.create', { username }); return this.sdk.post('im.create', { username });
}, },
joinRoom(roomId) { joinRoom(roomId, type) {
// TODO: join code // TODO: join code
// RC 0.48.0 // RC 0.48.0
if (type === 'p') {
return this.sdk.methodCall('joinRoom', roomId);
}
return this.sdk.post('channels.join', { roomId }); return this.sdk.post('channels.join', { roomId });
}, },
sendFileMessage, sendFileMessage,

10
app/views/RoomView/index.js
View File

@ -437,12 +437,10 @@ export default class RoomView extends React.Component {
joinRoom = async() => { joinRoom = async() => {
try { try {
const result = await RocketChat.joinRoom(this.rid); await RocketChat.joinRoom(this.rid, this.t);
if (result.success) { this.internalSetState({
this.internalSetState({ joined: true
joined: true });
});
}
} catch (e) { } catch (e) {
log('err_join_room', e); log('err_join_room', e);
} }