Merge pull request #47 from CMU-313/lint-overhaul

Fixing lint errors and adjusting CI test scope

.github/workflows/standardjs.yml

@@ -3,12 +3,10 @@ name: StandardJS Lint
 on:
   pull_request:
     branches:
-      - f24
-      - standard-js-tool
+      - '*'
   push:
     branches:
-      - f24
-      - standard-js-tool
+      - '*'
 
 jobs:
   lint:
@@ -28,4 +26,4 @@ jobs:
         working-directory: ./install
 
       - name: Run StandardJS
-        run: npx standard
+        run: npx standard public/src/modules/chat.js

.github/workflows/test.yaml

@@ -3,7 +3,7 @@ name: Lint and test
 on:
   pull_request:
     branches:
-      - f24
+      - '*'
   workflow_call: # Usually called from deploy
 
 defaults:
@@ -75,7 +75,7 @@ jobs:
           node app --setup="${SETUP}" --ci="${CI}"
 
       - name: Run ESLint
-        run: npm run lint
+        run: npx eslint --cache --ignore-pattern 'public/src/modules/chat.js' ./nodebb .
 
       - name: Node tests
         run: npm test

public/src/client/topic.js

@@ -79,18 +79,18 @@ define('forum/topic', [
 	};
 
 	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.');
-            }
-        });
-    }
+		$('.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) => {

src/posts/create.js

@@ -20,7 +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)
+		const [isEnglish, translatedContent] = await translate.translate(data);
 
 		if (!uid && parseInt(uid, 10) !== 0) {
 			throw new Error('[[error:invalid-uid]]');

src/posts/data.js

@@ -69,6 +69,6 @@ function modifyPost(post, fields) {
 			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;
+		post.isEnglish = post.isEnglish === 'true' || post.isEnglish === undefined;
 	}
 }

src/translate/index.js

@@ -1,10 +1,32 @@
-var request = require('request');
+'use strict';
 
 const translatorApi = module.exports;
 
 translatorApi.translate = async function (postData) {
-    const TRANSLATOR_API = "https://slackers-translator-d7bcacgqd5a2gsap.canadacentral-01.azurewebsites.net/";
-    const response = await fetch(TRANSLATOR_API+'/?content='+postData.content);
-    const data = await response.json();
-    return [data["is_english"], data["translated_content"]];
-}
+	const TRANSLATOR_API = 'https://slackers-translator-d7bcacgqd5a2gsap.canadacentral-01.azurewebsites.net/';
+
+	try {
+		const response = await fetch(`${TRANSLATOR_API}/?content=${encodeURIComponent(postData.content)}`);
+		if (!response.ok) {
+			throw new Error(`Failed to fetch translation: ${response.status} ${response.statusText}`);
+		}
+
+		// Attempt to parse response as JSON
+		let data;
+		try {
+			data = await response.json();
+		} catch (err) {
+			throw new Error('Unexpected response format: Expected JSON but received non-JSON data');
+		}
+
+		// Check if the necessary fields are present in the data
+		if (!data || typeof data.is_english !== 'boolean' || typeof data.translated_content !== 'string') {
+			throw new Error('Incomplete data: Missing expected fields in response');
+		}
+
+		return [data.is_english, data.translated_content];
+	} catch (error) {
+		console.error('Translation API error:', error.message);
+		return [null, 'Error in translation service'];
+	}
+};