Skip to content

Commit

Permalink
Convert rocketchat-videobridge to main module structure (#12881)
Browse files Browse the repository at this point in the history
* Convert rocketchat-videobridge to main module structure

* Remove duplicated import
  • Loading branch information
MarcosSpessatto authored and rodrigok committed Dec 12, 2018
1 parent e1647cc commit db9ff04
Show file tree
Hide file tree
Showing 14 changed files with 42 additions and 24 deletions.
1 change: 1 addition & 0 deletions packages/rocketchat-videobridge/client/actionLink.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Session } from 'meteor/session';
import { TAPi18n } from 'meteor/tap:i18n';
import { RocketChat } from 'meteor/rocketchat:lib';
import toastr from 'toastr';

RocketChat.actionLinks.register('joinJitsiCall', function(message, params, instance) {
Expand Down
13 changes: 13 additions & 0 deletions packages/rocketchat-videobridge/client/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { JitsiMeetExternalAPI } from './public/external_api';
import './views/videoFlexTab.html';
import './views/bbbLiveView.html';
import './views/videoFlexTabBbb.html';
import './views/videoFlexTab';
import './views/videoFlexTabBbb';
import './tabBar';
import './actionLink';
import '../lib/messageType';

export {
JitsiMeetExternalAPI,
};
5 changes: 5 additions & 0 deletions packages/rocketchat-videobridge/client/public/external_api.js
Original file line number Diff line number Diff line change
Expand Up @@ -457,3 +457,8 @@ function Postis(options) {

return postis;
}

export {
JitsiMeetExternalAPI,
};

1 change: 1 addition & 0 deletions packages/rocketchat-videobridge/client/tabBar.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';
import { Session } from 'meteor/session';
import { RocketChat } from 'meteor/rocketchat:lib';

Meteor.startup(function() {

Expand Down
4 changes: 3 additions & 1 deletion packages/rocketchat-videobridge/client/views/videoFlexTab.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/* globals JitsiMeetExternalAPI */
/* eslint new-cap: [2, {"capIsNewExceptions": ["MD5"]}] */
import { Meteor } from 'meteor/meteor';
import { Session } from 'meteor/session';
import { Template } from 'meteor/templating';
import { RocketChat } from 'meteor/rocketchat:lib';
import { t, modal } from 'meteor/rocketchat:ui';
import { JitsiMeetExternalAPI } from '../public/external_api';

Template.videoFlexTab.helpers({
openInNewWindow() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/* eslint new-cap: [2, {"capIsNewExceptions": ["MD5"]}] */
/* globals popout */
import { Meteor } from 'meteor/meteor';
import { Template } from 'meteor/templating';
import { RocketChat } from 'meteor/rocketchat:lib';
import { popout } from 'meteor/rocketchat:ui';

Template.videoFlexTabBbb.helpers({
openInNewWindow() {
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-videobridge/lib/messageType.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { TAPi18n } from 'meteor/tap:i18n';
import { RocketChat } from 'meteor/rocketchat:lib';

Meteor.startup(function() {
RocketChat.MessageTypes.registerType({
Expand Down
25 changes: 3 additions & 22 deletions packages/rocketchat-videobridge/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,9 @@ Package.onUse(function(api) {
'less',
'rocketchat:lib',
'rocketchat:bigbluebutton',
'templating',
]);

api.use('templating', 'client');

api.addAssets('client/public/external_api.js', 'client');

api.addFiles('client/stylesheets/video.less', 'client');
api.addFiles('client/views/videoFlexTab.html', 'client');

api.addFiles('client/views/bbbLiveView.html', 'client');
api.addFiles('client/views/videoFlexTabBbb.html', 'client');
api.addFiles('client/views/videoFlexTab.js', 'client');
api.addFiles('client/views/videoFlexTabBbb.js', 'client');
api.addFiles('client/tabBar.js', 'client');
api.addFiles('client/actionLink.js', 'client');

// Need to register the messageType with both the server and client
api.addFiles('lib/messageType.js', ['client', 'server']);

api.addFiles('server/settings.js', 'server');
api.addFiles('server/models/Rooms.js', 'server');
api.addFiles('server/methods/jitsiSetTimeout.js', 'server');
api.addFiles('server/methods/bbb.js', 'server');
api.addFiles('server/actionLink.js', 'server');
api.mainModule('client/index.js', 'client');
api.mainModule('server/index.js', 'server');
});
2 changes: 2 additions & 0 deletions packages/rocketchat-videobridge/server/actionLink.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { RocketChat } from 'meteor/rocketchat:lib';

RocketChat.actionLinks.register('joinJitsiCall', function(/* message, params*/) {

});
6 changes: 6 additions & 0 deletions packages/rocketchat-videobridge/server/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import '../lib/messageType';
import './settings';
import './models/Rooms';
import './methods/jitsiSetTimeout';
import './methods/bbb';
import './actionLink';
1 change: 1 addition & 0 deletions packages/rocketchat-videobridge/server/methods/bbb.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Meteor } from 'meteor/meteor';
import BigBlueButtonApi from 'meteor/rocketchat:bigbluebutton';
import { RocketChat } from 'meteor/rocketchat:lib';
import { HTTP } from 'meteor/http';
import xml2js from 'xml2js';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { TAPi18n } from 'meteor/tap:i18n';
import { RocketChat } from 'meteor/rocketchat:lib';

Meteor.methods({
'jitsi:updateTimeout': (rid) => {
Expand Down
2 changes: 2 additions & 0 deletions packages/rocketchat-videobridge/server/models/Rooms.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
* @param {string} _id - Room id
* @parm {number} time - time to set
*/
import { RocketChat } from 'meteor/rocketchat:lib';

RocketChat.models.Rooms.setJitsiTimeout = function(_id, time) {
const query = {
_id,
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-videobridge/server/settings.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { RocketChat } from 'meteor/rocketchat:lib';

Meteor.startup(function() {
RocketChat.settings.addGroup('Video Conference', function() {
Expand Down

0 comments on commit db9ff04

Please sign in to comment.