Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IMPROVE] Add more methods to deal with rooms via Rocket.Chat.Apps #12680

Merged
merged 3 commits into from
Nov 22, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions packages/rocketchat-apps/server/bridges/rooms.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@ export class AppRoomBridge {
case RoomType.PRIVATE_GROUP:
method = 'createPrivateGroup';
break;
case RoomType.DIRECT_MESSAGE:
method = 'createDirectMessage';
break;
default:
throw new Error('Only channels and private groups can be created.');
throw new Error('Only channels, private groups and direct messages can be created.');
}

let rid;
Expand All @@ -30,7 +33,13 @@ export class AppRoomBridge {
delete extraData.t;
delete extraData.ro;
delete extraData.customFields;
const info = Meteor.call(method, rcRoom.name, members, rcRoom.ro, rcRoom.customFields, extraData);
let info;
if (room.type === RoomType.DIRECT_MESSAGE) {
members.splice(members.indexOf(room.creator.username), 1);
info = Meteor.call(method, members[0]);
} else {
info = Meteor.call(method, rcRoom.name, members, rcRoom.ro, rcRoom.customFields, extraData);
}
rid = info.rid;
});

Expand Down Expand Up @@ -73,6 +82,21 @@ export class AppRoomBridge {
return this.orch.getConverters().get('users').convertById(room.u._id);
}

async getMembers(roomId, appId) {
console.log(`The App ${ appId } is getting the room's members by room id: "${ roomId }"`);
const subscriptions = await RocketChat.models.Subscriptions.findByRoomId(roomId);
return subscriptions.map((sub) => this.orch.getConverters().get('users').convertById(sub.u && sub.u._id));
}

async getDirectByUsernames(usernames, appId) {
console.log(`The App ${ appId } is getting direct room by usernames: "${ usernames }"`);
const room = await RocketChat.models.Rooms.findDirectRoomContainingAllUsernames(usernames);
if (!room) {
return undefined;
}
return this.orch.getConverters().get('rooms').convertRoom(room);
}

async update(room, members = [], appId) {
console.log(`The App ${ appId } is updating a room.`);

Expand Down
9 changes: 9 additions & 0 deletions packages/rocketchat-lib/server/models/Rooms.js
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,15 @@ class ModelRooms extends RocketChat.models._Base {
return this.find(query, options);
}

findDirectRoomContainingAllUsernames(usernames, options) {
const query = {
t: 'd',
usernames: { $size: usernames.length, $all: usernames },
};

return this.findOne(query, options);
}

findByTypeAndName(type, name, options) {
const query = {
name,
Expand Down