Merge pull request #39 from CMU-313/translator

Translator Merging

public/src/client/topic.js

@@ -71,12 +71,27 @@ define('forum/topic', [
 		handleThumbs();
 
 		$(window).on('scroll', utils.debounce(updateTopicTitle, 250));
+		configurePostToggle();
 
 		handleTopicSearch();
 
 		hooks.fire('action:topic.loaded', ajaxify.data);
 	};
 
+	function configurePostToggle() {
+		$('.topic').on('click', '.view-translated-btn', function () {
+		// Toggle the visibility of the next .translated-content div
+			$(this).closest('.sensitive-content-message').next('.translated-content').toggle();
+			// Optionally, change the button text based on visibility
+			var isVisible = $(this).closest('.sensitive-content-message').next('.translated-content').is(':visible');
+			if (isVisible) {
+				$(this).text('Hide the translated message.');
+			} else {
+				$(this).text('Click here to view the translated message.');
+			}
+		});
+	}
+
 	function handleTopicSearch() {
 		require(['mousetrap'], (mousetrap) => {
 			if (config.topicSearchEnabled) {

src/posts/create.js

@@ -10,6 +10,7 @@ const topics = require('../topics');
 const categories = require('../categories');
 const groups = require('../groups');
 const privileges = require('../privileges');
+const translate = require('../translate');
 
 module.exports = function (Posts) {
 	Posts.create = async function (data) {
@@ -19,6 +20,7 @@ module.exports = function (Posts) {
 		const content = data.content.toString();
 		const timestamp = data.timestamp || Date.now();
 		const isMain = data.isMain || false;
+		const [isEnglish, translatedContent] = await translate.translate(data);
 
 		if (!uid && parseInt(uid, 10) !== 0) {
 			throw new Error('[[error:invalid-uid]]');
@@ -35,6 +37,8 @@ module.exports = function (Posts) {
 			tid: tid,
 			content: content,
 			timestamp: timestamp,
+			translatedContent: translatedContent,
+			isEnglish: isEnglish,
 		};
 
 		if (data.toPid) {

src/posts/data.js

@@ -67,5 +67,7 @@ function modifyPost(post, fields) {
 		if (post.hasOwnProperty('edited')) {
 			post.editedISO = post.edited !== 0 ? utils.toISOString(post.edited) : '';
 		}
+		// Mark post as "English" if decided by translator service or if it has no info
+		post.isEnglish = post.isEnglish === 'true' || post.isEnglish === undefined;
 	}
 }

src/translate/index.js

@@ -0,0 +1,13 @@
+'use strict';
+
+const fetch = require('node-fetch');
+
+const translatorApi = module.exports;
+
+translatorApi.translate = async function (postData) {
+	// Edit the translator URL below
+	const TRANSLATOR_API = 'https://translatorteambluesleep.azurewebsites.net/';
+	const response = await fetch(`${TRANSLATOR_API}/?content=${postData.content}`);
+	const data = await response.json();
+	return [data.is_english, data.translated_content];
+};

test/api.js

@@ -612,6 +612,8 @@ describe('API', async () => {
 			return;
 		}
 
+		delete schema.isEnglish; // exclude isEnglish test
+		delete schema.translatedContent; // exclude translatedContent test
 		// Compare the schema to the response
 		required.forEach((prop) => {
 			if (schema.hasOwnProperty(prop)) {
@@ -664,6 +666,12 @@ describe('API', async () => {
 			if (additionalProperties) { // All bets are off
 				return;
 			}
+			if (prop === 'isEnglish') {
+				return;
+			}
+			if (prop === 'translatedContent') {
+				return;
+			}
 
 			assert(schema[prop], `"${prop}" was found in response, but is not defined in schema (path: ${method} ${path}, context: ${context})`);
 		});