Dev2.5.16 server translation2 API

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/CaptionApp2x.scala

@@ -46,7 +46,7 @@ class CaptionApp2x(implicit val context: ActorContext) extends RightsManagementT
     }
 
     if (permissionFailed(PermissionCheck.MOD_LEVEL, PermissionCheck.VIEWER_LEVEL, liveMeeting.users2x, msg.header.userId)
-      && isUserCaptionOwner(liveMeeting, msg.header.userId, msg.body.name)) {
+      /*&& isUserCaptionOwner(liveMeeting, msg.header.userId, msg.body.name)*/) {
       val meetingId = liveMeeting.props.meetingProp.intId
       val reason = "No permission to edit caption history in meeting."
       PermissionCheck.ejectUserForFailedPermission(meetingId, msg.header.userId, reason, bus.outGW, liveMeeting)

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/pads/PadUpdatePubMsgHdlr.scala

@@ -21,11 +21,11 @@ trait PadUpdatePubMsgHdlr {
       bus.outGW.send(msgEvent)
     }
 
-    if (Pads.hasAccess(liveMeeting, msg.body.externalId, msg.header.userId)) {
+    //if (Pads.hasAccess(liveMeeting, msg.body.externalId, msg.header.userId)) {
       Pads.getGroup(liveMeeting.pads, msg.body.externalId) match {
         case Some(group) => broadcastEvent(group.groupId, msg.body.externalId, msg.body.text)
         case _           =>
       }
-    }
+    //}
   }
 }

bigbluebutton-html5/imports/api/captions/server/methods.js

@@ -1,12 +1,16 @@
 import { Meteor } from 'meteor/meteor';
 import updateCaptionsOwner from '/imports/api/captions/server/methods/updateCaptionsOwner';
-import startDictation from '/imports/api/captions/server/methods/startDictation';
-import stopDictation from '/imports/api/captions/server/methods/stopDictation';
+import provideSpeech from '/imports/api/captions/server/methods/provideSpeech';
+import retractSpeech from '/imports/api/captions/server/methods/retractSpeech';
 import pushSpeechTranscript from '/imports/api/captions/server/methods/pushSpeechTranscript';
+import addTranslation from '/imports/api/captions/server/methods/addTranslation';
+import removeTranslation from '/imports/api/captions/server/methods/removeTranslation';
 
 Meteor.methods({
   updateCaptionsOwner,
-  startDictation,
-  stopDictation,
+  provideSpeech,
+  retractSpeech,
   pushSpeechTranscript,
+  addTranslation,
+  removeTranslation,
 });

bigbluebutton-html5/imports/api/captions/server/methods/addTranslation.js

@@ -0,0 +1,19 @@
+import { check } from 'meteor/check';
+import { extractCredentials } from '/imports/api/common/server/helpers';
+import Logger from '/imports/startup/server/logger';
+import setAutoTranslation from '/imports/api/captions/server/modifiers/setAutoTranslation';
+
+export default function addTranslation(locale) {
+  try {
+    const { meetingId, requesterUserId } = extractCredentials(this.userId);
+
+    check(locale, String);
+    check(meetingId, String);
+    check(requesterUserId, String);
+
+    //const caption = Captions.findOne({ meetingId, locale }, { fields: { translating:1 } });
+    setAutoTranslation(meetingId, locale, requesterUserId, true);
+  } catch (err) {
+    Logger.error(`Exception while invoking method enableAutoTranslation ${err.stack}`);
+  }
+}

bigbluebutton-html5/imports/api/captions/server/methods/stopDictation.js → bigbluebutton-html5/imports/api/captions/server/methods/provideSpeech.js

@@ -4,7 +4,7 @@ import { extractCredentials } from '/imports/api/common/server/helpers';
 import Logger from '/imports/startup/server/logger';
 import setDictation from '/imports/api/captions/server/modifiers/setDictation';
 
-export default function stopDictation(locale) {
+export default function provideSpeech(locale) {
   try {
     const { meetingId, requesterUserId } = extractCredentials(this.userId);
 
@@ -14,12 +14,11 @@ export default function stopDictation(locale) {
 
     const captions = Captions.findOne({
       meetingId,
-      ownerId: requesterUserId,
       locale,
     });
 
-    if (captions) setDictation(meetingId, locale, false);
+    if (captions) setDictation(meetingId, locale, requesterUserId, true);
   } catch (err) {
-    Logger.error(`Exception while invoking method stopDictation ${err.stack}`);
+    Logger.error(`Exception while invoking method provideSpeech ${err.stack}`);
   }
 }

bigbluebutton-html5/imports/api/captions/server/methods/pushSpeechTranscript.js

@@ -1,11 +1,68 @@
 import { check } from 'meteor/check';
 import Captions from '/imports/api/captions';
+import Users from '/imports/api/users';
 import { extractCredentials } from '/imports/api/common/server/helpers';
 import Logger from '/imports/startup/server/logger';
 import setTranscript from '/imports/api/captions/server/modifiers/setTranscript';
 import updatePad from '/imports/api/pads/server/methods/updatePad';
+import axios from 'axios';
 
-export default function pushSpeechTranscript(locale, transcript, type) {
+const CAPTIONS_CONFIG = Meteor.settings.public.captions;
+
+function sendTranscript(meetingId, requesterUserId, type, dst, text) {
+  const user = Users.findOne({meetingId, userId: requesterUserId}, { fields: {name: 1}});
+  //console.log("sendTranscript", text);
+  //const textWithName = `${user.name}: ${text}`;
+  if (type === 'final') {
+    //const textLf = `\n${textWithName}`;
+    const textLf = `\n${text}`;
+    updatePad(meetingId, requesterUserId, dst, textLf); // Pad and recording
+  }
+  setTranscript(meetingId, dst, text, requesterUserId); // Live
+}
+
+function translateText(meetingId, requesterUserId, textOri, type, src, dst) {
+  if ( !CAPTIONS_CONFIG.enableAutomaticTranslation || textOri === "" || !dst || dst === "" || dst === src || dst.replace(/-..$/,'') === src || dst === src.replace(/-..$/,'') ) {
+    sendTranscript(meetingId, requesterUserId, type, dst, textOri);
+  } else {
+    let url = '';
+    if (CAPTIONS_CONFIG.googleTranslateUrl) {
+      url = CAPTIONS_CONFIG.googleTranslateUrl + '/exec?' +
+            'text=' + encodeURIComponent(textOri) + '&source=' + src + '&target=' + dst.replace(/-..$/,'');
+    } else if (CAPTIONS_CONFIG.deeplTranslateUrl) {
+      url = CAPTIONS_CONFIG.deeplTranslateUrl +
+            '&text=' + encodeURIComponent(textOri) + '&source_lang=' + src.replace(/-..$/,'').toUpperCase() +
+            '&target_lang=' + dst.toUpperCase();
+    } else {
+      Logger.error('Could not get a translation service.');
+      return;
+    }
+
+    axios({
+      method: 'get',
+      url,
+      responseType: 'json',
+    }).then((response) => {
+      if (CAPTIONS_CONFIG.googleTranslateUrl) {
+        const { code, text } = response.data;
+        if (code === 200) {
+          sendTranscript(meetingId, requesterUserId, type, dst, text);
+        } else {
+          Logger.error(`Failed to get Google translation for ${textOri}`);
+        }
+      } else if (CAPTIONS_CONFIG.deeplTranslateUrl) {
+        const { translations } = response.data;
+        if (translations.length > 0 && translations[0].text) {
+          sendTranscript(meetingId, requesterUserId, type, dst, translations[0].text);
+        } else {
+          Logger.error(`Failed to get DeepL translation for ${textOri}`);
+        }
+      }
+    }).catch((error) => Logger.error(`Could not get translation for ${textOri.trim()} on the locale ${dst}: ${error}`));
+  }
+}
+
+export default function pushSpeechTranscript(locale, transcript, type, locales) {
   try {
     const { meetingId, requesterUserId } = extractCredentials(this.userId);
 
@@ -14,22 +71,23 @@ export default function pushSpeechTranscript(locale, transcript, type) {
     check(locale, String);
     check(transcript, String);
     check(type, String);
+    check(locales, Array);
 
-    const captions = Captions.findOne({
-      meetingId,
-      ownerId: requesterUserId,
-      locale,
-      dictating: true,
-    });
+    locales.forEach(function(dstLocale, index) {
+      const caption = Captions.findOne({
+        meetingId,
+        locale: dstLocale,
+      });
 
-    if (captions) {
-      if (type === 'final') {
-        const text = `\n${transcript}`;
-        updatePad(meetingId, requesterUserId, locale, text);
+      if (!caption) {
+        Logger.error(`Could not find the caption's pad for meetingId=${meetingId} locale=${locale}`);
+      } else {
+        if (type === 'final' || ( type === 'interim' && locale === dstLocale ) ) {
+          Logger.debug(`Transcription being translated from ${locale} into ${dstLocale}`);
+          translateText(meetingId, requesterUserId, transcript, type, locale, dstLocale);
+        }
       }
-
-      setTranscript(meetingId, locale, transcript);
-    }
+    });
   } catch (err) {
     Logger.error(`Exception while invoking method pushSpeechTranscript ${err.stack}`);
   }

bigbluebutton-html5/imports/api/captions/server/methods/removeTranslation.js

@@ -0,0 +1,19 @@
+import { check } from 'meteor/check';
+import { extractCredentials } from '/imports/api/common/server/helpers';
+import Logger from '/imports/startup/server/logger';
+import setAutoTranslation from '/imports/api/captions/server/modifiers/setAutoTranslation';
+
+export default function removeTranslation(locale) {
+  try {
+    const { meetingId, requesterUserId } = extractCredentials(this.userId);
+
+    check(locale, String);
+    check(meetingId, String);
+    check(requesterUserId, String);
+
+    //const caption = Captions.findOne({ meetingId, locale }, { fields: { translating:1 } });
+    setAutoTranslation(meetingId, locale, requesterUserId, false);
+  } catch (err) {
+    Logger.error(`Exception while invoking method disbleAutoTranslation ${err.stack}`);
+  }
+}

bigbluebutton-html5/imports/api/captions/server/methods/startDictation.js → bigbluebutton-html5/imports/api/captions/server/methods/retractSpeech.js

@@ -4,7 +4,7 @@ import { extractCredentials } from '/imports/api/common/server/helpers';
 import Logger from '/imports/startup/server/logger';
 import setDictation from '/imports/api/captions/server/modifiers/setDictation';
 
-export default function startDictation(locale) {
+export default function retractSpeech(locale) {
   try {
     const { meetingId, requesterUserId } = extractCredentials(this.userId);
 
@@ -14,12 +14,11 @@ export default function startDictation(locale) {
 
     const captions = Captions.findOne({
       meetingId,
-      ownerId: requesterUserId,
       locale,
     });
 
-    if (captions) setDictation(meetingId, locale, true);
+    if (captions) setDictation(meetingId, locale, requesterUserId, false);
   } catch (err) {
-    Logger.error(`Exception while invoking method startDictation ${err.stack}`);
+    Logger.error(`Exception while invoking method retractSpeech ${err.stack}`);
   }
 }

bigbluebutton-html5/imports/api/captions/server/modifiers/createCaptions.js

@@ -20,6 +20,9 @@ export default function createCaptions(meetingId, locale, name) {
       ownerId: '',
       dictating: false,
       transcript: '',
+      translating: false,
+      translationDoner: {},
+      speechDoner: {},
     };
 
     const numberAffected = Captions.upsert(selector, modifier);

bigbluebutton-html5/imports/api/captions/server/modifiers/setAutoTranslation.js

@@ -0,0 +1,62 @@
+//Do we need this? It just sets "translating" -> seems yes
+import Captions from '/imports/api/captions';
+import Logger from '/imports/startup/server/logger';
+import { check } from 'meteor/check';
+
+export default function setAutoTranslation(meetingId, locale, userId, selecting) {
+  check(meetingId, String);
+  check(locale, String);
+  check(userId, String);
+  check(selecting, Boolean);
+
+  const selector = {
+    meetingId,
+    locale,
+  };
+
+  let modifier;
+  if (selecting) {
+    modifier = {
+      $set: {
+        ['translationDoner.'+userId]: true,
+        translating: true,
+      }
+    };
+  } else {
+    modifier = {
+      $set: {
+        ['translationDoner.'+userId]: false,
+      }
+    };
+  }
+
+  try {
+    const numberAffected = Captions.update(selector, modifier);
+    Logger.info(`Adding/Removing (${selecting}) translationDoner ${locale} from ${userId} meeting=${meetingId}`);
+    if (numberAffected) {
+      Logger.verbose('Captions: updated pad autoTranslation', { locale });
+    }
+  } catch (err) {
+    Logger.error(`Updating captions pad autoTranslation: ${err}`);
+  }
+
+  if (!selecting) {
+    const newcap = Captions.findOne({ meetingId, locale }, { fields: { translationDoner: 1 } });
+    const td = newcap.translationDoner;
+    if (!Object.values(td).includes(true)) {
+      const modifier2 = {
+        $set: {
+          translating: false,
+        },
+      };
+      try {
+        const numberAffected = Captions.upsert({ meetingId, locale }, modifier2);
+        if (numberAffected) {
+          Logger.info(`Updating translating to false; ${locale}, meeting=${meetingId} in Captions`);
+        }
+      } catch (err) {
+        Logger.error(`Updating translating: ${err} in Captions`);
+      }
+    }
+  }
+}

bigbluebutton-html5/imports/api/captions/server/modifiers/setDictation.js

@@ -2,30 +2,56 @@ import { check } from 'meteor/check';
 import Captions from '/imports/api/captions';
 import Logger from '/imports/startup/server/logger';
 
-export default function setDictation(meetingId, locale, dictating) {
+export default function setDictation(meetingId, locale, userId, providing) {
   try {
     check(meetingId, String);
     check(locale, String);
-    check(dictating, Boolean);
+    check(userId, String);
+    check(providing, Boolean);
 
     const selector = {
       meetingId,
       locale,
     };
 
-    const modifier = {
-      $set: {
-        dictating,
-        transcript: '',
-      },
-    };
+    let modifier;
+    if (providing) {
+      modifier = {
+        $set: {
+          ['speechDoner.'+userId]: true,
+          dictating: true,
+        },
+      };
+    } else {
+      modifier = {
+        $set: {
+          ['speechDoner.'+userId]: false,
+        },
+      };
+    }
 
     const numberAffected = Captions.upsert(selector, modifier);
 
     if (numberAffected) {
-      Logger.info(`Set captions=${locale} dictating=${dictating} meeting=${meetingId}`);
+      Logger.info(`Set captions=${locale} provide?=${providing} meeting=${meetingId}, userId=${userId}`);
     } else {
-      Logger.info(`Upserted captions=${locale} dictating=${dictating} meeting=${meetingId}`);
+      Logger.info(`Upserted captions=${locale} provide?=${providing} meeting=${meetingId}, userId=${userId}`);
+    }
+
+    if (!providing) {
+      const newcap = Captions.findOne({ meetingId, locale }, { fields: { speechDoner: 1 } });
+      const sd = newcap.speechDoner;
+      if (!Object.values(sd).includes(true)) {
+        const modifier2 = {
+          $set: {
+            dictating: false,
+          },
+        };
+        const numberAffected = Captions.upsert({ meetingId, locale }, modifier2);
+        if (numberAffected) {
+          Logger.info(`Updating dicatating to false; ${locale}, meeting=${meetingId} in Captions`);
+        }
+      }
     }
   } catch (err) {
     Logger.error(`Setting captions dictation to the collection: ${err}`);