Skip to content

Commit 3845a98

Browse files
dbkrdbkr
committed
Get conf calling working, apart from the end call button showing in the right room.
1 parent 94a6f85 commit 3845a98

3 files changed

Lines changed: 21 additions & 5 deletions

File tree

‎src/controllers/molecules/voip/CallView.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ limitations under the License.
1515
*/
1616

1717
'use strict';
18-
var dis = require("../../../dispatcher");
18+
var dis = require("matrix-react-sdk/lib/dispatcher");
1919
var CallHandler = require("matrix-react-sdk/lib/CallHandler");
20-
var MatrixClientPeg = require("../../../MatrixClientPeg");
20+
var MatrixClientPeg = require("matrix-react-sdk/lib/MatrixClientPeg");
2121

22-
var VectorConferenceHandler = require('./VectorConferenceHandler');
22+
var VectorConferenceHandler = require('../../../modules/VectorConferenceHandler');
2323

2424
/*
2525
* State vars:

‎src/modules/VectorConferenceHandler.js‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ limitations under the License.
1919
var q = require("q");
2020
var Matrix = require("matrix-js-sdk");
2121
var Room = Matrix.Room;
22+
var CallHandler = require('matrix-react-sdk/lib/CallHandler');
2223

2324
// FIXME: This currently forces Vector to try to hit the matrix.org AS for conferencing.
2425
// This is bad because it prevents people running their own ASes from being used.
@@ -108,9 +109,24 @@ module.exports.getConferenceUserIdForRoom = function(roomId) {
108109
};
109110

110111
module.exports.createNewMatrixCall = function(client, roomId) {
111-
return new ConferenceCall(
112+
var confCall = new ConferenceCall(
112113
client, roomId
113114
);
115+
return confCall.setup();
116+
};
117+
118+
module.exports.getConferenceCallForRoom = function(roomId) {
119+
// search for a conference 1:1 call for this group chat room ID
120+
var activeCall = CallHandler.getAnyActiveCall();
121+
if (activeCall && activeCall.confUserId) {
122+
var thisRoomConfUserId = module.exports.getConferenceUserIdForRoom(
123+
roomId
124+
);
125+
if (thisRoomConfUserId === activeCall.confUserId) {
126+
return activeCall;
127+
}
128+
}
129+
return null;
114130
};
115131

116132
module.exports.ConferenceCall = ConferenceCall;

‎src/skins/vector/views/molecules/voip/CallView.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var React = require('react');
2020

2121
var sdk = require('matrix-react-sdk')
2222
var CallViewController = require(
23-
"matrix-react-sdk/lib/controllers/molecules/voip/CallView"
23+
"../../../../../controllers/molecules/voip/CallView"
2424
);
2525

2626
module.exports = React.createClass({

0 commit comments

Comments
 (0)