haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: add a timer which automatically clears subtitles (#3349)

This commit is contained in:
Nik 2018-08-06 23:30:50 +02:00 committed by virtuacoplenny
parent cac8888b37
commit ef49817eaf
1 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
react/features/subtitles/middleware.js
View File

@ -10,8 +10,6 @@ import {
const logger = require('jitsi-meet-logger').getLogger(__filename); const logger = require('jitsi-meet-logger').getLogger(__filename);
declare var APP: Object;
/** /**
* The type of json-message which indicates that json carries a * The type of json-message which indicates that json carries a
* transcription result. * transcription result.
@ -85,16 +83,15 @@ function _endpointMessageReceived({ dispatch, getState }, next, action) {
const newTranscriptMessage = { const newTranscriptMessage = {
participantName, participantName,
final: json.text final: json.text,
clearTimeOut: undefined
}; };
setClearerOnTranscriptMessage(dispatch,
transcriptMessageID, newTranscriptMessage);
dispatch(updateTranscriptMessage(transcriptMessageID, dispatch(updateTranscriptMessage(transcriptMessageID,
newTranscriptMessage)); newTranscriptMessage));
setTimeout(() => {
dispatch(removeTranscriptMessage(transcriptMessageID));
}, REMOVE_AFTER_MS);
} else if (json.type === JSON_TYPE_TRANSCRIPTION_RESULT } else if (json.type === JSON_TYPE_TRANSCRIPTION_RESULT
&& !translationLanguage) { && !translationLanguage) {
// Displays interim and final results without any translation if // Displays interim and final results without any translation if
@ -109,6 +106,9 @@ function _endpointMessageReceived({ dispatch, getState }, next, action) {
= { ...getState()['features/subtitles'].transcriptMessages = { ...getState()['features/subtitles'].transcriptMessages
.get(transcriptMessageID) || { participantName } }; .get(transcriptMessageID) || { participantName } };
setClearerOnTranscriptMessage(dispatch,
transcriptMessageID, newTranscriptMessage);
// If this is final result, update the state as a final result // If this is final result, update the state as a final result
// and start a count down to remove the subtitle from the state // and start a count down to remove the subtitle from the state
if (!isInterim) { if (!isInterim) {
@ -116,10 +116,6 @@ function _endpointMessageReceived({ dispatch, getState }, next, action) {
newTranscriptMessage.final = text; newTranscriptMessage.final = text;
dispatch(updateTranscriptMessage(transcriptMessageID, dispatch(updateTranscriptMessage(transcriptMessageID,
newTranscriptMessage)); newTranscriptMessage));
setTimeout(() => {
dispatch(removeTranscriptMessage(transcriptMessageID));
}, REMOVE_AFTER_MS);
} else if (stability > 0.85) { } else if (stability > 0.85) {
// If the message has a high stability, we can update the // If the message has a high stability, we can update the
@ -146,3 +142,26 @@ function _endpointMessageReceived({ dispatch, getState }, next, action) {
return next(action); return next(action);
} }
/**
* Set a timeout on a TranscriptMessage object so it clears itself when it's not
* updated.
*
* @param {Function} dispatch - Dispatch remove action to store.
* @param {string} transcriptMessageID - The id of the message to remove.
* @param {Object} transcriptMessage - The message to remove.
*
* @returns {void}
*/
function setClearerOnTranscriptMessage(
dispatch,
transcriptMessageID,
transcriptMessage) {
if (transcriptMessage.clearTimeOut) {
clearTimeout(transcriptMessage.clearTimeOut);
}
transcriptMessage.clearTimeOut = setTimeout(() => {
dispatch(removeTranscriptMessage(transcriptMessageID));
}, REMOVE_AFTER_MS);
}