Merge remote-tracking branch 'upstream/develop' into mm-exporter
commit
60a6a6bc40
|
|
@ -115,6 +115,12 @@ To integrate with an LMS (e.g. Moodle), have a look at [LTI](LTI/LTI.md).
|
||||||
|
|
||||||
* You need an additional [TURN](https://github.com/coturn/coturn)-server for clients located behind restrictive firewalls! Add your server and credentials to `app/config.js`
|
* You need an additional [TURN](https://github.com/coturn/coturn)-server for clients located behind restrictive firewalls! Add your server and credentials to `app/config.js`
|
||||||
|
|
||||||
|
## Community-driven support
|
||||||
|
|
||||||
|
* Open mailing list: community@lists.edumeet.org
|
||||||
|
* Subscribe: lists.edumeet.org/sympa/subscribe/community/
|
||||||
|
* Open archive: lists.edumeet.org/sympa/arc/community/
|
||||||
|
|
||||||
## Authors
|
## Authors
|
||||||
|
|
||||||
* Håvar Aambø Fosstveit
|
* Håvar Aambø Fosstveit
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@
|
||||||
"@material-ui/core": "^4.5.1",
|
"@material-ui/core": "^4.5.1",
|
||||||
"@material-ui/icons": "^4.5.1",
|
"@material-ui/icons": "^4.5.1",
|
||||||
"bowser": "^2.7.0",
|
"bowser": "^2.7.0",
|
||||||
|
"classnames": "^2.2.6",
|
||||||
"create-torrent": "^4.4.1",
|
"create-torrent": "^4.4.1",
|
||||||
"dompurify": "^2.0.7",
|
"dompurify": "^2.0.7",
|
||||||
"domready": "^1.0.8",
|
"domready": "^1.0.8",
|
||||||
|
|
|
||||||
|
|
@ -1295,6 +1295,28 @@ export default class RoomClient
|
||||||
lobbyPeerActions.setLobbyPeerPromotionInProgress(peerId, false));
|
lobbyPeerActions.setLobbyPeerPromotionInProgress(peerId, false));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async clearChat()
|
||||||
|
{
|
||||||
|
logger.debug('clearChat()');
|
||||||
|
|
||||||
|
store.dispatch(
|
||||||
|
roomActions.setClearChatInProgress(true));
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await this.sendRequest('moderator:clearChat');
|
||||||
|
|
||||||
|
store.dispatch(chatActions.clearChat());
|
||||||
|
}
|
||||||
|
catch (error)
|
||||||
|
{
|
||||||
|
logger.error('clearChat() failed: %o', error);
|
||||||
|
}
|
||||||
|
|
||||||
|
store.dispatch(
|
||||||
|
roomActions.setClearChatInProgress(false));
|
||||||
|
}
|
||||||
|
|
||||||
async kickPeer(peerId)
|
async kickPeer(peerId)
|
||||||
{
|
{
|
||||||
logger.debug('kickPeer() [peerId:"%s"]', peerId);
|
logger.debug('kickPeer() [peerId:"%s"]', peerId);
|
||||||
|
|
@ -2152,6 +2174,21 @@ export default class RoomClient
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
case 'moderator:clearChat':
|
||||||
|
{
|
||||||
|
store.dispatch(chatActions.clearChat());
|
||||||
|
|
||||||
|
store.dispatch(requestActions.notify(
|
||||||
|
{
|
||||||
|
text : intl.formatMessage({
|
||||||
|
id : 'moderator.clearChat',
|
||||||
|
defaultMessage : 'Moderator cleared the chat'
|
||||||
|
})
|
||||||
|
}));
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
case 'sendFile':
|
case 'sendFile':
|
||||||
{
|
{
|
||||||
const { peerId, magnetUri } = notification.data;
|
const { peerId, magnetUri } = notification.data;
|
||||||
|
|
@ -2306,8 +2343,8 @@ export default class RoomClient
|
||||||
store.dispatch(requestActions.notify(
|
store.dispatch(requestActions.notify(
|
||||||
{
|
{
|
||||||
text : intl.formatMessage({
|
text : intl.formatMessage({
|
||||||
id : 'moderator.mute',
|
id : 'moderator.muteAudio',
|
||||||
defaultMessage : 'Moderator muted your microphone'
|
defaultMessage : 'Moderator muted your audio'
|
||||||
})
|
})
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
@ -2325,7 +2362,7 @@ export default class RoomClient
|
||||||
store.dispatch(requestActions.notify(
|
store.dispatch(requestActions.notify(
|
||||||
{
|
{
|
||||||
text : intl.formatMessage({
|
text : intl.formatMessage({
|
||||||
id : 'moderator.mute',
|
id : 'moderator.muteVideo',
|
||||||
defaultMessage : 'Moderator stopped your video'
|
defaultMessage : 'Moderator stopped your video'
|
||||||
})
|
})
|
||||||
}));
|
}));
|
||||||
|
|
|
||||||
|
|
@ -15,3 +15,8 @@ export const addChatHistory = (chatHistory) =>
|
||||||
type : 'ADD_CHAT_HISTORY',
|
type : 'ADD_CHAT_HISTORY',
|
||||||
payload : { chatHistory }
|
payload : { chatHistory }
|
||||||
});
|
});
|
||||||
|
|
||||||
|
export const clearChat = () =>
|
||||||
|
({
|
||||||
|
type : 'CLEAR_CHAT'
|
||||||
|
});
|
||||||
|
|
@ -129,6 +129,12 @@ export const setCloseMeetingInProgress = (flag) =>
|
||||||
payload : { flag }
|
payload : { flag }
|
||||||
});
|
});
|
||||||
|
|
||||||
|
export const setClearChatInProgress = (flag) =>
|
||||||
|
({
|
||||||
|
type : 'CLEAR_CHAT_IN_PROGRESS',
|
||||||
|
payload : { flag }
|
||||||
|
});
|
||||||
|
|
||||||
export const setUserRoles = (userRoles) =>
|
export const setUserRoles = (userRoles) =>
|
||||||
({
|
({
|
||||||
type : 'SET_USER_ROLES',
|
type : 'SET_USER_ROLES',
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ import React from 'react';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import { withStyles } from '@material-ui/core/styles';
|
import { withStyles } from '@material-ui/core/styles';
|
||||||
import Paper from '@material-ui/core/Paper';
|
import Paper from '@material-ui/core/Paper';
|
||||||
|
import ChatModerator from './ChatModerator';
|
||||||
import MessageList from './MessageList';
|
import MessageList from './MessageList';
|
||||||
import ChatInput from './ChatInput';
|
import ChatInput from './ChatInput';
|
||||||
|
|
||||||
|
|
@ -25,6 +26,7 @@ const Chat = (props) =>
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Paper className={classes.root}>
|
<Paper className={classes.root}>
|
||||||
|
<ChatModerator />
|
||||||
<MessageList />
|
<MessageList />
|
||||||
<ChatInput />
|
<ChatInput />
|
||||||
</Paper>
|
</Paper>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,104 @@
|
||||||
|
import React from 'react';
|
||||||
|
import { connect } from 'react-redux';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import { withRoomContext } from '../../../RoomContext';
|
||||||
|
import { withStyles } from '@material-ui/core/styles';
|
||||||
|
import { useIntl, FormattedMessage } from 'react-intl';
|
||||||
|
import Button from '@material-ui/core/Button';
|
||||||
|
|
||||||
|
const styles = (theme) =>
|
||||||
|
({
|
||||||
|
root :
|
||||||
|
{
|
||||||
|
padding : theme.spacing(1),
|
||||||
|
width : '100%',
|
||||||
|
overflow : 'hidden',
|
||||||
|
cursor : 'auto',
|
||||||
|
display : 'flex',
|
||||||
|
listStyleType : 'none',
|
||||||
|
boxShadow : '0 2px 5px 2px rgba(0, 0, 0, 0.2)',
|
||||||
|
backgroundColor : 'rgba(255, 255, 255, 1)'
|
||||||
|
},
|
||||||
|
listheader :
|
||||||
|
{
|
||||||
|
padding : theme.spacing(1),
|
||||||
|
fontWeight : 'bolder'
|
||||||
|
},
|
||||||
|
actionButton :
|
||||||
|
{
|
||||||
|
marginLeft : 'auto'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const ChatModerator = (props) =>
|
||||||
|
{
|
||||||
|
const intl = useIntl();
|
||||||
|
|
||||||
|
const {
|
||||||
|
roomClient,
|
||||||
|
isChatModerator,
|
||||||
|
room,
|
||||||
|
classes
|
||||||
|
} = props;
|
||||||
|
|
||||||
|
if (!isChatModerator)
|
||||||
|
return;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<ul className={classes.root}>
|
||||||
|
<li className={classes.listheader}>
|
||||||
|
<FormattedMessage
|
||||||
|
id='room.moderatoractions'
|
||||||
|
defaultMessage='Moderator actions'
|
||||||
|
/>
|
||||||
|
</li>
|
||||||
|
<Button
|
||||||
|
aria-label={intl.formatMessage({
|
||||||
|
id : 'room.clearChat',
|
||||||
|
defaultMessage : 'Clear chat'
|
||||||
|
})}
|
||||||
|
className={classes.actionButton}
|
||||||
|
variant='contained'
|
||||||
|
color='secondary'
|
||||||
|
disabled={room.clearChatInProgress}
|
||||||
|
onClick={() => roomClient.clearChat()}
|
||||||
|
>
|
||||||
|
<FormattedMessage
|
||||||
|
id='room.clearChat'
|
||||||
|
defaultMessage='Clear chat'
|
||||||
|
/>
|
||||||
|
</Button>
|
||||||
|
</ul>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
ChatModerator.propTypes =
|
||||||
|
{
|
||||||
|
roomClient : PropTypes.any.isRequired,
|
||||||
|
isChatModerator : PropTypes.bool,
|
||||||
|
room : PropTypes.object,
|
||||||
|
classes : PropTypes.object.isRequired
|
||||||
|
};
|
||||||
|
|
||||||
|
const mapStateToProps = (state) =>
|
||||||
|
({
|
||||||
|
isChatModerator :
|
||||||
|
state.me.roles.some((role) =>
|
||||||
|
state.room.permissionsFromRoles.MODERATE_CHAT.includes(role)),
|
||||||
|
room : state.room
|
||||||
|
});
|
||||||
|
|
||||||
|
export default withRoomContext(connect(
|
||||||
|
mapStateToProps,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
{
|
||||||
|
areStatesEqual : (next, prev) =>
|
||||||
|
{
|
||||||
|
return (
|
||||||
|
prev.room === next.room &&
|
||||||
|
prev.me === next.me
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)(withStyles(styles)(ChatModerator)));
|
||||||
|
|
@ -9,7 +9,7 @@ import SignalCellular0BarIcon from '@material-ui/icons/SignalCellular0Bar';
|
||||||
import SignalCellular1BarIcon from '@material-ui/icons/SignalCellular1Bar';
|
import SignalCellular1BarIcon from '@material-ui/icons/SignalCellular1Bar';
|
||||||
import SignalCellular2BarIcon from '@material-ui/icons/SignalCellular2Bar';
|
import SignalCellular2BarIcon from '@material-ui/icons/SignalCellular2Bar';
|
||||||
import SignalCellular3BarIcon from '@material-ui/icons/SignalCellular3Bar';
|
import SignalCellular3BarIcon from '@material-ui/icons/SignalCellular3Bar';
|
||||||
import SignalCellular4BarIcon from '@material-ui/icons/SignalCellular4Bar';
|
import SignalCellularAltIcon from '@material-ui/icons/SignalCellularAlt';
|
||||||
|
|
||||||
const styles = (theme) =>
|
const styles = (theme) =>
|
||||||
({
|
({
|
||||||
|
|
@ -217,7 +217,7 @@ class VideoView extends React.PureComponent
|
||||||
case 9:
|
case 9:
|
||||||
case 10:
|
case 10:
|
||||||
{
|
{
|
||||||
quality = <SignalCellular4BarIcon style={{ color: green[500] }}/>;
|
quality = <SignalCellularAltIcon style={{ color: green[500] }}/>;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,11 @@ const chat = (state = [], action) =>
|
||||||
return [ ...state, ...chatHistory ];
|
return [ ...state, ...chatHistory ];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
case 'CLEAR_CHAT':
|
||||||
|
{
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -22,11 +22,13 @@ const initialState =
|
||||||
muteAllInProgress : false,
|
muteAllInProgress : false,
|
||||||
stopAllVideoInProgress : false,
|
stopAllVideoInProgress : false,
|
||||||
closeMeetingInProgress : false,
|
closeMeetingInProgress : false,
|
||||||
|
clearChatInProgress : false,
|
||||||
userRoles : { NORMAL: 'normal' }, // Default role
|
userRoles : { NORMAL: 'normal' }, // Default role
|
||||||
permissionsFromRoles : {
|
permissionsFromRoles : {
|
||||||
CHANGE_ROOM_LOCK : [],
|
CHANGE_ROOM_LOCK : [],
|
||||||
PROMOTE_PEER : [],
|
PROMOTE_PEER : [],
|
||||||
SEND_CHAT : [],
|
SEND_CHAT : [],
|
||||||
|
MODERATE_CHAT : [],
|
||||||
SHARE_SCREEN : [],
|
SHARE_SCREEN : [],
|
||||||
SHARE_FILE : [],
|
SHARE_FILE : [],
|
||||||
MODERATE_ROOM : []
|
MODERATE_ROOM : []
|
||||||
|
|
@ -184,6 +186,9 @@ const room = (state = initialState, action) =>
|
||||||
case 'CLOSE_MEETING_IN_PROGRESS':
|
case 'CLOSE_MEETING_IN_PROGRESS':
|
||||||
return { ...state, closeMeetingInProgress: action.payload.flag };
|
return { ...state, closeMeetingInProgress: action.payload.flag };
|
||||||
|
|
||||||
|
case 'CLEAR_CHAT_IN_PROGRESS':
|
||||||
|
return { ...state, clearChatInProgress: action.payload.flag };
|
||||||
|
|
||||||
case 'SET_USER_ROLES':
|
case 'SET_USER_ROLES':
|
||||||
{
|
{
|
||||||
const { userRoles } = action.payload;
|
const { userRoles } = action.payload;
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,7 @@
|
||||||
"room.muteAll": null,
|
"room.muteAll": null,
|
||||||
"room.stopAllVideo": null,
|
"room.stopAllVideo": null,
|
||||||
"room.closeMeeting": null,
|
"room.closeMeeting": null,
|
||||||
|
"room.clearChat": null,
|
||||||
"room.speechUnsupported": null,
|
"room.speechUnsupported": null,
|
||||||
|
|
||||||
"me.mutedPTT": null,
|
"me.mutedPTT": null,
|
||||||
|
|
@ -143,5 +144,9 @@
|
||||||
"devices.screenSharingError": "访问屏幕时发生错误",
|
"devices.screenSharingError": "访问屏幕时发生错误",
|
||||||
|
|
||||||
"devices.cameraDisconnected": "相机已断开连接",
|
"devices.cameraDisconnected": "相机已断开连接",
|
||||||
"devices.cameraError": "访问相机时发生错误"
|
"devices.cameraError": "访问相机时发生错误",
|
||||||
|
|
||||||
|
"moderator.clearChat": null,
|
||||||
|
"moderator.muteAudio": null,
|
||||||
|
"moderator.muteVideo": null
|
||||||
}
|
}
|
||||||
|
|
@ -51,6 +51,7 @@
|
||||||
"room.muteAll": null,
|
"room.muteAll": null,
|
||||||
"room.stopAllVideo": null,
|
"room.stopAllVideo": null,
|
||||||
"room.closeMeeting": null,
|
"room.closeMeeting": null,
|
||||||
|
"room.clearChat": null,
|
||||||
"room.speechUnsupported": null,
|
"room.speechUnsupported": null,
|
||||||
|
|
||||||
"me.mutedPTT": null,
|
"me.mutedPTT": null,
|
||||||
|
|
@ -138,5 +139,9 @@
|
||||||
"devices.screenSharingError": "Při přístupu k vaší obrazovce se vyskytla chyba",
|
"devices.screenSharingError": "Při přístupu k vaší obrazovce se vyskytla chyba",
|
||||||
|
|
||||||
"devices.cameraDisconnected": "Kamera odpojena",
|
"devices.cameraDisconnected": "Kamera odpojena",
|
||||||
"devices.cameraError": "Při přístupu k vaší kameře se vyskytla chyba"
|
"devices.cameraError": "Při přístupu k vaší kameře se vyskytla chyba",
|
||||||
|
|
||||||
|
"moderator.clearChat": null,
|
||||||
|
"moderator.muteAudio": null,
|
||||||
|
"moderator.muteVideo": null
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,7 @@
|
||||||
"room.muteAll": "Alle stummschalten",
|
"room.muteAll": "Alle stummschalten",
|
||||||
"room.stopAllVideo": "Alle Videos stoppen",
|
"room.stopAllVideo": "Alle Videos stoppen",
|
||||||
"room.closeMeeting": "Meeting schließen",
|
"room.closeMeeting": "Meeting schließen",
|
||||||
|
"room.clearChat": null,
|
||||||
"room.speechUnsupported": "Dein Browser unterstützt keine Spracherkennung",
|
"room.speechUnsupported": "Dein Browser unterstützt keine Spracherkennung",
|
||||||
|
|
||||||
"me.mutedPTT": "Du bist stummgeschalted, Halte die SPACE-Taste um zu sprechen",
|
"me.mutedPTT": "Du bist stummgeschalted, Halte die SPACE-Taste um zu sprechen",
|
||||||
|
|
@ -143,5 +144,9 @@
|
||||||
"devices.screenSharingError": "Fehler bei der Bildschirmfreigabe",
|
"devices.screenSharingError": "Fehler bei der Bildschirmfreigabe",
|
||||||
|
|
||||||
"devices.cameraDisconnected": "Kamera getrennt",
|
"devices.cameraDisconnected": "Kamera getrennt",
|
||||||
"devices.cameraError": "Fehler mit deiner Kamera"
|
"devices.cameraError": "Fehler mit deiner Kamera",
|
||||||
|
|
||||||
|
"moderator.clearChat": null,
|
||||||
|
"moderator.muteAudio": null,
|
||||||
|
"moderator.muteVideo": null
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,7 @@
|
||||||
"room.muteAll": null,
|
"room.muteAll": null,
|
||||||
"room.stopAllVideo": null,
|
"room.stopAllVideo": null,
|
||||||
"room.closeMeeting": null,
|
"room.closeMeeting": null,
|
||||||
|
"room.clearChat": null,
|
||||||
"room.speechUnsupported": null,
|
"room.speechUnsupported": null,
|
||||||
|
|
||||||
"me.mutedPTT": null,
|
"me.mutedPTT": null,
|
||||||
|
|
@ -143,5 +144,9 @@
|
||||||
"devices.screenSharingError": "Der opstod en fejl ved adgang til skærmdeling",
|
"devices.screenSharingError": "Der opstod en fejl ved adgang til skærmdeling",
|
||||||
|
|
||||||
"device.cameraDisconnected": "Kamera frakoblet",
|
"device.cameraDisconnected": "Kamera frakoblet",
|
||||||
"device.cameraError": "Der opstod en fejl ved tilkobling af dit kamera"
|
"device.cameraError": "Der opstod en fejl ved tilkobling af dit kamera",
|
||||||
|
|
||||||
|
"moderator.clearChat": null,
|
||||||
|
"moderator.muteAudio": null,
|
||||||
|
"moderator.muteVideo": null
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,7 @@
|
||||||
"room.muteAll": null,
|
"room.muteAll": null,
|
||||||
"room.stopAllVideo": null,
|
"room.stopAllVideo": null,
|
||||||
"room.closeMeeting": null,
|
"room.closeMeeting": null,
|
||||||
|
"room.clearChat": null,
|
||||||
"room.speechUnsupported": null,
|
"room.speechUnsupported": null,
|
||||||
|
|
||||||
"me.mutedPTT": null,
|
"me.mutedPTT": null,
|
||||||
|
|
@ -143,5 +144,9 @@
|
||||||
"devices.screenSharingError": "Παρουσιάστηκε σφάλμα κατά την πρόσβαση στην οθόνη σας",
|
"devices.screenSharingError": "Παρουσιάστηκε σφάλμα κατά την πρόσβαση στην οθόνη σας",
|
||||||
|
|
||||||
"devices.cameraDisconnected": "Η κάμερα αποσυνδέθηκε",
|
"devices.cameraDisconnected": "Η κάμερα αποσυνδέθηκε",
|
||||||
"devices.cameraError": "Παρουσιάστηκε σφάλμα κατά την πρόσβαση στην κάμερά σας"
|
"devices.cameraError": "Παρουσιάστηκε σφάλμα κατά την πρόσβαση στην κάμερά σας",
|
||||||
|
|
||||||
|
"moderator.clearChat": null,
|
||||||
|
"moderator.muteAudio": null,
|
||||||
|
"moderator.muteVideo": null
|
||||||
}
|
}
|
||||||
|
|
@ -52,6 +52,7 @@
|
||||||
"room.muteAll": "Mute all",
|
"room.muteAll": "Mute all",
|
||||||
"room.stopAllVideo": "Stop all video",
|
"room.stopAllVideo": "Stop all video",
|
||||||
"room.closeMeeting": "Close meeting",
|
"room.closeMeeting": "Close meeting",
|
||||||
|
"room.clearChat": "Clear chat",
|
||||||
"room.speechUnsupported": "Your browser does not support speech recognition",
|
"room.speechUnsupported": "Your browser does not support speech recognition",
|
||||||
|
|
||||||
"me.mutedPTT": "You are muted, hold down SPACE-BAR to talk",
|
"me.mutedPTT": "You are muted, hold down SPACE-BAR to talk",
|
||||||
|
|
@ -143,5 +144,9 @@
|
||||||
"devices.screenSharingError": "An error occured while accessing your screen",
|
"devices.screenSharingError": "An error occured while accessing your screen",
|
||||||
|
|
||||||
"devices.cameraDisconnected": "Camera disconnected",
|
"devices.cameraDisconnected": "Camera disconnected",
|
||||||
"devices.cameraError": "An error occured while accessing your camera"
|
"devices.cameraError": "An error occured while accessing your camera",
|
||||||
|
|
||||||
|
"moderator.clearChat": "Moderator cleared the chat",
|
||||||
|
"moderator.muteAudio": "Moderator muted your audio",
|
||||||
|
"moderator.muteVideo": "Moderator muted your video"
|
||||||
}
|
}
|
||||||
|
|
@ -52,6 +52,7 @@
|
||||||
"room.muteAll": null,
|
"room.muteAll": null,
|
||||||
"room.stopAllVideo": null,
|
"room.stopAllVideo": null,
|
||||||
"room.closeMeeting": null,
|
"room.closeMeeting": null,
|
||||||
|
"room.clearChat": null,
|
||||||
"room.speechUnsupported": null,
|
"room.speechUnsupported": null,
|
||||||
|
|
||||||
"me.mutedPTT": null,
|
"me.mutedPTT": null,
|
||||||
|
|
@ -143,5 +144,9 @@
|
||||||
"devices.screenSharingError": "Hubo un error al acceder a su pantalla",
|
"devices.screenSharingError": "Hubo un error al acceder a su pantalla",
|
||||||
|
|
||||||
"devices.cameraDisconnected": "Cámara desconectada",
|
"devices.cameraDisconnected": "Cámara desconectada",
|
||||||
"devices.cameraError": "Hubo un error al acceder a su cámara"
|
"devices.cameraError": "Hubo un error al acceder a su cámara",
|
||||||
|
|
||||||
|
"moderator.clearChat": null,
|
||||||
|
"moderator.muteAudio": null,
|
||||||
|
"moderator.muteVideo": null
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,7 @@
|
||||||
"room.muteAll": null,
|
"room.muteAll": null,
|
||||||
"room.stopAllVideo": null,
|
"room.stopAllVideo": null,
|
||||||
"room.closeMeeting": null,
|
"room.closeMeeting": null,
|
||||||
|
"room.clearChat": null,
|
||||||
"room.speechUnsupported": null,
|
"room.speechUnsupported": null,
|
||||||
|
|
||||||
"me.mutedPTT": null,
|
"me.mutedPTT": null,
|
||||||
|
|
@ -142,5 +143,9 @@
|
||||||
"devices.screenSharingError": "Une erreur est apparue lors de l'accès à votre partage d'écran",
|
"devices.screenSharingError": "Une erreur est apparue lors de l'accès à votre partage d'écran",
|
||||||
|
|
||||||
"devices.cameraDisconnected": "Caméra déconnectée",
|
"devices.cameraDisconnected": "Caméra déconnectée",
|
||||||
"devices.cameraError": "Une erreur est apparue lors de l'accès à votre caméra"
|
"devices.cameraError": "Une erreur est apparue lors de l'accès à votre caméra",
|
||||||
|
|
||||||
|
"moderator.clearChat": null,
|
||||||
|
"moderator.muteAudio": null,
|
||||||
|
"moderator.muteVideo": null
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,7 @@
|
||||||
"room.muteAll": "Utišaj sve",
|
"room.muteAll": "Utišaj sve",
|
||||||
"room.stopAllVideo": "Ugasi sve kamere",
|
"room.stopAllVideo": "Ugasi sve kamere",
|
||||||
"room.closeMeeting": "Završi sastanak",
|
"room.closeMeeting": "Završi sastanak",
|
||||||
|
"room.clearChat": null,
|
||||||
"room.speechUnsupported": "Vaš preglednik ne podržava prepoznavanje govora",
|
"room.speechUnsupported": "Vaš preglednik ne podržava prepoznavanje govora",
|
||||||
|
|
||||||
"me.mutedPTT": "Utišani ste, pritisnite i držite SPACE tipku za razgovor",
|
"me.mutedPTT": "Utišani ste, pritisnite i držite SPACE tipku za razgovor",
|
||||||
|
|
@ -143,5 +144,9 @@
|
||||||
"devices.screenSharingError": "Greška prilikom pristupa ekranu",
|
"devices.screenSharingError": "Greška prilikom pristupa ekranu",
|
||||||
|
|
||||||
"devices.cameraDisconnected": "Kamera odspojena",
|
"devices.cameraDisconnected": "Kamera odspojena",
|
||||||
"devices.cameraError": "Greška prilikom pristupa kameri"
|
"devices.cameraError": "Greška prilikom pristupa kameri",
|
||||||
|
|
||||||
|
"moderator.clearChat": null,
|
||||||
|
"moderator.muteAudio": null,
|
||||||
|
"moderator.muteVideo": null
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,7 @@
|
||||||
"room.muteAll": null,
|
"room.muteAll": null,
|
||||||
"room.stopAllVideo": null,
|
"room.stopAllVideo": null,
|
||||||
"room.closeMeeting": null,
|
"room.closeMeeting": null,
|
||||||
|
"room.clearChat": null,
|
||||||
"room.speechUnsupported": null,
|
"room.speechUnsupported": null,
|
||||||
|
|
||||||
"me.mutedPTT": null,
|
"me.mutedPTT": null,
|
||||||
|
|
@ -143,5 +144,9 @@
|
||||||
"devices.screenSharingError": "Hiba történt a képernyőd megosztása során",
|
"devices.screenSharingError": "Hiba történt a képernyőd megosztása során",
|
||||||
|
|
||||||
"devices.cameraDisconnected": "A kamera kapcsolata lebomlott",
|
"devices.cameraDisconnected": "A kamera kapcsolata lebomlott",
|
||||||
"devices.cameraError": "Hiba történt a kamera elérése során"
|
"devices.cameraError": "Hiba történt a kamera elérése során",
|
||||||
|
|
||||||
|
"moderator.clearChat": null,
|
||||||
|
"moderator.muteAudio": null,
|
||||||
|
"moderator.muteVideo": null
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,7 @@
|
||||||
"room.muteAll": null,
|
"room.muteAll": null,
|
||||||
"room.stopAllVideo": null,
|
"room.stopAllVideo": null,
|
||||||
"room.closeMeeting": null,
|
"room.closeMeeting": null,
|
||||||
|
"room.clearChat": null,
|
||||||
"room.speechUnsupported": null,
|
"room.speechUnsupported": null,
|
||||||
|
|
||||||
"me.mutedPTT": null,
|
"me.mutedPTT": null,
|
||||||
|
|
@ -142,5 +143,9 @@
|
||||||
"devices.screenSharingError": "Errore con l'accesso al tuo schermo",
|
"devices.screenSharingError": "Errore con l'accesso al tuo schermo",
|
||||||
|
|
||||||
"devices.cameraDisconnected": "Videocamera scollegata",
|
"devices.cameraDisconnected": "Videocamera scollegata",
|
||||||
"devices.cameraError": "Errore con l'accesso alla videocamera"
|
"devices.cameraError": "Errore con l'accesso alla videocamera",
|
||||||
|
|
||||||
|
"moderator.clearChat": null,
|
||||||
|
"moderator.muteAudio": null,
|
||||||
|
"moderator.muteVideo": null
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,7 @@
|
||||||
"room.muteAll": "Demp alle",
|
"room.muteAll": "Demp alle",
|
||||||
"room.stopAllVideo": "Stopp all video",
|
"room.stopAllVideo": "Stopp all video",
|
||||||
"room.closeMeeting": "Avslutt møte",
|
"room.closeMeeting": "Avslutt møte",
|
||||||
|
"room.clearChat": "Tøm chat",
|
||||||
"room.speechUnsupported": "Din nettleser støtter ikke stemmegjenkjenning",
|
"room.speechUnsupported": "Din nettleser støtter ikke stemmegjenkjenning",
|
||||||
|
|
||||||
"me.mutedPTT": "Du er dempet, hold nede SPACE for å snakke",
|
"me.mutedPTT": "Du er dempet, hold nede SPACE for å snakke",
|
||||||
|
|
@ -143,5 +144,9 @@
|
||||||
"devices.screenSharingError": "Det skjedde noe feil med skjermdelingen din",
|
"devices.screenSharingError": "Det skjedde noe feil med skjermdelingen din",
|
||||||
|
|
||||||
"devices.cameraDisconnected": "Kamera koblet fra",
|
"devices.cameraDisconnected": "Kamera koblet fra",
|
||||||
"devices.cameraError": "Det skjedde noe feil med kameraet ditt"
|
"devices.cameraError": "Det skjedde noe feil med kameraet ditt",
|
||||||
|
|
||||||
|
"moderator.clearChat": "Moderator tømte chatten",
|
||||||
|
"moderator.muteAudio": "Moderator mutet lyden din",
|
||||||
|
"moderator.muteVideo": "Moderator mutet videoen din"
|
||||||
}
|
}
|
||||||
|
|
@ -52,6 +52,7 @@
|
||||||
"room.muteAll": null,
|
"room.muteAll": null,
|
||||||
"room.stopAllVideo": null,
|
"room.stopAllVideo": null,
|
||||||
"room.closeMeeting": null,
|
"room.closeMeeting": null,
|
||||||
|
"room.clearChat": null,
|
||||||
"room.speechUnsupported": null,
|
"room.speechUnsupported": null,
|
||||||
|
|
||||||
"me.mutedPTT": null,
|
"me.mutedPTT": null,
|
||||||
|
|
@ -143,5 +144,9 @@
|
||||||
"devices.screenSharingError": "Wystąpił błąd podczas uzyskiwania dostępu do ekranu",
|
"devices.screenSharingError": "Wystąpił błąd podczas uzyskiwania dostępu do ekranu",
|
||||||
|
|
||||||
"devices.cameraDisconnected": "Kamera odłączona",
|
"devices.cameraDisconnected": "Kamera odłączona",
|
||||||
"devices.cameraError": "Wystąpił błąd podczas uzyskiwania dostępu do kamery"
|
"devices.cameraError": "Wystąpił błąd podczas uzyskiwania dostępu do kamery",
|
||||||
|
|
||||||
|
"moderator.clearChat": null,
|
||||||
|
"moderator.muteAudio": null,
|
||||||
|
"moderator.muteVideo": null
|
||||||
}
|
}
|
||||||
|
|
@ -52,6 +52,7 @@
|
||||||
"room.muteAll": null,
|
"room.muteAll": null,
|
||||||
"room.stopAllVideo": null,
|
"room.stopAllVideo": null,
|
||||||
"room.closeMeeting": null,
|
"room.closeMeeting": null,
|
||||||
|
"room.clearChat": null,
|
||||||
"room.speechUnsupported": null,
|
"room.speechUnsupported": null,
|
||||||
|
|
||||||
"me.mutedPTT": null,
|
"me.mutedPTT": null,
|
||||||
|
|
@ -143,5 +144,9 @@
|
||||||
"devices.screenSharingError": "Ocorreu um erro no acesso ao seu ecrã",
|
"devices.screenSharingError": "Ocorreu um erro no acesso ao seu ecrã",
|
||||||
|
|
||||||
"devices.cameraDisconnected": "Câmara desconectada",
|
"devices.cameraDisconnected": "Câmara desconectada",
|
||||||
"devices.cameraError": "Ocorreu um erro no acesso à sua câmara"
|
"devices.cameraError": "Ocorreu um erro no acesso à sua câmara",
|
||||||
|
|
||||||
|
"moderator.clearChat": null,
|
||||||
|
"moderator.muteAudio": null,
|
||||||
|
"moderator.muteVideo": null
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,7 @@
|
||||||
"room.muteAll": null,
|
"room.muteAll": null,
|
||||||
"room.stopAllVideo": null,
|
"room.stopAllVideo": null,
|
||||||
"room.closeMeeting": null,
|
"room.closeMeeting": null,
|
||||||
|
"room.clearChat": null,
|
||||||
"room.speechUnsupported": null,
|
"room.speechUnsupported": null,
|
||||||
|
|
||||||
"me.mutedPTT": null,
|
"me.mutedPTT": null,
|
||||||
|
|
@ -143,5 +144,9 @@
|
||||||
"devices.screenSharingError": "A apărut o eroare la accesarea ecranului",
|
"devices.screenSharingError": "A apărut o eroare la accesarea ecranului",
|
||||||
|
|
||||||
"devices.cameraDisconnected": "Camera video e disconectată",
|
"devices.cameraDisconnected": "Camera video e disconectată",
|
||||||
"devices.cameraError": "A apărut o eroare la accesarea camerei video"
|
"devices.cameraError": "A apărut o eroare la accesarea camerei video",
|
||||||
|
|
||||||
|
"moderator.clearChat": null,
|
||||||
|
"moderator.muteAudio": null,
|
||||||
|
"moderator.muteVideo": null
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -49,6 +49,11 @@
|
||||||
"room.spotlights": "Учасники у центрі уваги",
|
"room.spotlights": "Учасники у центрі уваги",
|
||||||
"room.passive": "Пасивні учасники",
|
"room.passive": "Пасивні учасники",
|
||||||
"room.videoPaused": "Це відео призупинено",
|
"room.videoPaused": "Це відео призупинено",
|
||||||
|
"room.muteAll": null,
|
||||||
|
"room.stopAllVideo": null,
|
||||||
|
"room.closeMeeting": null,
|
||||||
|
"room.clearChat": null,
|
||||||
|
"room.speechUnsupported": null,
|
||||||
|
|
||||||
"tooltip.login": "Увійти",
|
"tooltip.login": "Увійти",
|
||||||
"tooltip.logout": "Вихід",
|
"tooltip.logout": "Вихід",
|
||||||
|
|
@ -136,5 +141,9 @@
|
||||||
"devices.screenSharingError": "Сталася помилка під час доступу до екрану",
|
"devices.screenSharingError": "Сталася помилка під час доступу до екрану",
|
||||||
|
|
||||||
"devices.cameraDisconnected": "Камера відключена",
|
"devices.cameraDisconnected": "Камера відключена",
|
||||||
"devices.cameraError": "Під час доступу до камери сталася помилка"
|
"devices.cameraError": "Під час доступу до камери сталася помилка",
|
||||||
|
|
||||||
|
"moderator.clearChat": null,
|
||||||
|
"moderator.muteAudio": null,
|
||||||
|
"moderator.muteVideo": null
|
||||||
}
|
}
|
||||||
|
|
@ -229,6 +229,8 @@ module.exports =
|
||||||
PROMOTE_PEER : [ userRoles.NORMAL ],
|
PROMOTE_PEER : [ userRoles.NORMAL ],
|
||||||
// The role(s) have permission to send chat messages
|
// The role(s) have permission to send chat messages
|
||||||
SEND_CHAT : [ userRoles.NORMAL ],
|
SEND_CHAT : [ userRoles.NORMAL ],
|
||||||
|
// The role(s) have permission to moderate chat
|
||||||
|
MODERATE_CHAT : [ userRoles.MODERATOR ],
|
||||||
// The role(s) have permission to share screen
|
// The role(s) have permission to share screen
|
||||||
SHARE_SCREEN : [ userRoles.NORMAL ],
|
SHARE_SCREEN : [ userRoles.NORMAL ],
|
||||||
// The role(s) have permission to share files
|
// The role(s) have permission to share files
|
||||||
|
|
|
||||||
|
|
@ -1005,6 +1005,24 @@ class Room extends EventEmitter
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
case 'moderator:clearChat':
|
||||||
|
{
|
||||||
|
if (
|
||||||
|
!peer.roles.some((role) => config.permissionsFromRoles.MODERATE_CHAT.includes(role))
|
||||||
|
)
|
||||||
|
throw new Error('peer not authorized');
|
||||||
|
|
||||||
|
this._chatHistory = [];
|
||||||
|
|
||||||
|
// Spread to others
|
||||||
|
this._notification(peer.socket, 'moderator:clearChat', null, true);
|
||||||
|
|
||||||
|
// Return no error
|
||||||
|
cb();
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
case 'serverHistory':
|
case 'serverHistory':
|
||||||
{
|
{
|
||||||
// Return to sender
|
// Return to sender
|
||||||
|
|
@ -1186,9 +1204,7 @@ class Room extends EventEmitter
|
||||||
throw new Error('peer not authorized');
|
throw new Error('peer not authorized');
|
||||||
|
|
||||||
// Spread to others
|
// Spread to others
|
||||||
this._notification(peer.socket, 'moderator:mute', {
|
this._notification(peer.socket, 'moderator:mute', null, true);
|
||||||
peerId : peer.id
|
|
||||||
}, true);
|
|
||||||
|
|
||||||
cb();
|
cb();
|
||||||
|
|
||||||
|
|
@ -1203,9 +1219,7 @@ class Room extends EventEmitter
|
||||||
throw new Error('peer not authorized');
|
throw new Error('peer not authorized');
|
||||||
|
|
||||||
// Spread to others
|
// Spread to others
|
||||||
this._notification(peer.socket, 'moderator:stopVideo', {
|
this._notification(peer.socket, 'moderator:stopVideo', null, true);
|
||||||
peerId : peer.id
|
|
||||||
}, true);
|
|
||||||
|
|
||||||
cb();
|
cb();
|
||||||
|
|
||||||
|
|
@ -1219,12 +1233,7 @@ class Room extends EventEmitter
|
||||||
)
|
)
|
||||||
throw new Error('peer not authorized');
|
throw new Error('peer not authorized');
|
||||||
|
|
||||||
this._notification(
|
this._notification(peer.socket, 'moderator:kick', null, true);
|
||||||
peer.socket,
|
|
||||||
'moderator:kick',
|
|
||||||
null,
|
|
||||||
true
|
|
||||||
);
|
|
||||||
|
|
||||||
cb();
|
cb();
|
||||||
|
|
||||||
|
|
@ -1248,10 +1257,7 @@ class Room extends EventEmitter
|
||||||
if (!kickPeer)
|
if (!kickPeer)
|
||||||
throw new Error(`peer with id "${peerId}" not found`);
|
throw new Error(`peer with id "${peerId}" not found`);
|
||||||
|
|
||||||
this._notification(
|
this._notification(kickPeer.socket, 'moderator:kick');
|
||||||
kickPeer.socket,
|
|
||||||
'moderator:kick'
|
|
||||||
);
|
|
||||||
|
|
||||||
kickPeer.close();
|
kickPeer.close();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -38,8 +38,8 @@ const promExporter = require('./lib/promExporter');
|
||||||
|
|
||||||
/* eslint-disable no-console */
|
/* eslint-disable no-console */
|
||||||
console.log('- process.env.DEBUG:', process.env.DEBUG);
|
console.log('- process.env.DEBUG:', process.env.DEBUG);
|
||||||
console.log('- config.mediasoup.logLevel:', config.mediasoup.logLevel);
|
console.log('- config.mediasoup.worker.logLevel:', config.mediasoup.worker.logLevel);
|
||||||
console.log('- config.mediasoup.logTags:', config.mediasoup.logTags);
|
console.log('- config.mediasoup.worker.logTags:', config.mediasoup.worker.logTags);
|
||||||
/* eslint-enable no-console */
|
/* eslint-enable no-console */
|
||||||
|
|
||||||
const logger = new Logger();
|
const logger = new Logger();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue