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.

Sign up for GitHub

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

Jump to bottom

VideoSIPGW updates #2201

Merged
merged 8 commits into from Nov 21, 2017
Merged

VideoSIPGW updates #2201

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
264b4ee
Adds initial documentation for sipgw jibri.
damencho Nov 15, 2017
ca1fc1d
Fixes add people dialog to invite users and rooms.
damencho Nov 15, 2017
d7dffba
Reuse some recording strings, by using arguments.
damencho Nov 21, 2017
b91d588
Make sure web also dispatches CONFERENCE_WILL_JOIN.
damencho Nov 21, 2017
ec1d564
Introduces new feature videosipgw.
damencho Nov 21, 2017
82a2c96
Fixes lint errors.
damencho Nov 21, 2017
d55dda6
Renames methods to use people, chatRooms and videoRooms.
damencho Nov 21, 2017
c1ba1a5
Updates to latest lib-jitsi-meet (dc3397b18b).
damencho Nov 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions react/features/invite/components/AddPeopleDialog.web.js
View file
Open in desktop
Expand Up @@ -12,8 +12,8 @@ import { Dialog, hideDialog } from '../../base/dialog';
import { translate } from '../../base/i18n';
import { MultiSelectAutocomplete } from '../../base/react';

import { invitePeople, searchPeople } from '../functions';
import { inviteRooms } from '../../videosipgw';
import { invitePeopleAndChatRooms, searchDirectory } from '../functions';
import { inviteVideoRooms } from '../../videosipgw';

declare var interfaceConfig: Object;

Expand Down Expand Up @@ -66,7 +66,7 @@ class AddPeopleDialog extends Component<*, *> {
/**
* Used to invite video rooms.
*/
inviteRooms: PropTypes.func,
inviteVideoRooms: PropTypes.func,

/**
* Invoked to obtain translated strings.
Expand All @@ -85,7 +85,7 @@ class AddPeopleDialog extends Component<*, *> {
} = this.props; // eslint-disable-line no-invalid-this

return (
searchPeople(
searchDirectory(
_peopleSearchUrl,
_jwt,
text,
Expand Down Expand Up @@ -221,12 +221,12 @@ class AddPeopleDialog extends Component<*, *> {
});

this.props._conference
&& this.props.inviteRooms(
&& this.props.inviteVideoRooms(
this.props._conference,
this.state.inviteItems.filter(
i => i.type === 'videosipgw'));

invitePeople(
invitePeopleAndChatRooms(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just noticed, the other actions are put onto this.props but invitePeopleAndChatRooms isn't. Do you care?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My mistake here. Damyan showed this is a function and shouldn't be mapped to props.

this.props._inviteServiceUrl,
this.props._inviteUrl,
this.props._jwt,
Expand Down Expand Up @@ -364,5 +364,5 @@ function _mapStateToProps(state) {

export default translate(connect(_mapStateToProps, {
hideDialog,
inviteRooms })(
inviteVideoRooms })(
AddPeopleDialog));
4 changes: 2 additions & 2 deletions react/features/invite/functions.js
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@ export function getInviteOptionPosition(name: string): number {
* type items to invite.
* @returns {Promise} - The promise created by the request.
*/
export function invitePeople( // eslint-disable-line max-params
export function invitePeopleAndChatRooms( // eslint-disable-line max-params
inviteServiceUrl: string,
inviteUrl: string,
jwt: string,
Expand Down Expand Up @@ -70,7 +70,7 @@ export function isInviteOptionEnabled(name: string) {
* executed - "conferenceRooms" | "user" | "room".
* @returns {Promise} - The promise created by the request.
*/
export function searchPeople( // eslint-disable-line max-params
export function searchDirectory( // eslint-disable-line max-params
serviceUrl: string,
jwt: string,
text: string,
Expand Down
2 changes: 1 addition & 1 deletion react/features/videosipgw/actions.js
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ import { SIP_GW_INVITE_ROOMS } from './actionTypes';
* invite.
* @returns {void}
*/
export function inviteRooms(
export function inviteVideoRooms(
conference: Object,
rooms: Object) {
return {
Expand Down