ep_comments_page 1.0.38 → 1.0.41

package/README.md

@@ -1,4 +1,5 @@
-![Publish Status](https://github.com/ether/ep_comments_page/workflows/Node.js%20Package/badge.svg) ![Backend Tests Status](https://github.com/ether/ep_comments_page/workflows/Backend%20tests/badge.svg)
+[![Publish Status](https://github.com/ether/ep_comments_page/workflows/Node.js%20Package/badge.svg)](https://github.com/ether/ep_comments_page/actions/workflows/test-and-release.yml)
+[![Backend Tests Status](https://github.com/ether/ep_comments_page/workflows/Backend%20tests/badge.svg)](https://github.com/ether/ep_comments_page/actions/workflows/backend-tests.yml)
 
 # Comments and annotations for Etherpad
 

package/apiUtils.js

@@ -1,31 +1,48 @@
 'use strict';
 
-const absolutePaths = require('ep_etherpad-lite/node/utils/AbsolutePaths');
-const fs = require('fs');
 const padManager = require('ep_etherpad-lite/node/db/PadManager');
 const settings = require('ep_etherpad-lite/node/utils/Settings');
 
-// ensure we have an apiKey
-let apiKey = '';
-try {
-  apiKey = fs.readFileSync(absolutePaths.makeAbsolute('./APIKEY.txt'), 'utf8').trim();
-} catch (e) {
-  console.warn('Could not find APIKEY');
-}
-
-// Checks if api key is correct and prepare response if it is not.
-// Returns true if valid, false otherwise.
-const validateApiKey = (fields, res) => {
-  let valid = true;
+// Validate authorization - checks API key or JWT token depending on auth method
+const validateAuth = async (req, res) => {
+  try {
+    // If API key auth is configured
+    const apiKeyHandler = require('ep_etherpad-lite/node/handler/APIKeyHandler');
+    const apikey = apiKeyHandler.apikey;
+    if (apikey !== null && apikey.trim().length > 0) {
+      const fields = Object.assign({}, req.query, req.body);
+      const receivedKey = fields.apikey || fields.api_key || req.headers.authorization;
+      if (receivedKey !== apikey.trim()) {
+        res.statusCode = 401;
+        res.json({code: 4, message: 'no or wrong API Key', data: null});
+        return false;
+      }
+      return true;
+    }
 
-  const apiKeyReceived = fields.apikey || fields.api_key;
-  if (apiKeyReceived !== apiKey) {
+    // SSO/JWT auth
+    if (!req.headers.authorization) {
+      res.statusCode = 401;
+      res.json({code: 4, message: 'no or wrong API Key', data: null});
+      return false;
+    }
+    const {jwtVerify} = require('jose');
+    const {jwtDecode} = require('jwt-decode');
+    const {publicKeyExported} = require('ep_etherpad-lite/node/security/OAuth2Provider');
+    const clientIds = settings.sso?.clients?.map((client) => client.client_id) ?? [];
+    const jwtToCheck = req.headers.authorization.replace('Bearer ', '');
+    const payload = jwtDecode(jwtToCheck);
+    if (clientIds.includes(payload.sub)) {
+      await jwtVerify(jwtToCheck, publicKeyExported, {algorithms: ['RS256']});
+    } else {
+      await jwtVerify(jwtToCheck, publicKeyExported, {algorithms: ['RS256'], requiredClaims: ['admin']});
+    }
+    return true;
+  } catch (e) {
     res.statusCode = 401;
     res.json({code: 4, message: 'no or wrong API Key', data: null});
-    valid = false;
+    return false;
   }
-
-  return valid;
 };
 
 const validateRequiredField =
@@ -70,7 +87,7 @@ const broadcastUrlFor = (endPoint) => {
 
 /* ********** Available functions/values: ********** */
 
-exports.validateApiKey = validateApiKey;
+exports.validateAuth = validateAuth;
 exports.validateRequiredFields = validateRequiredFields;
 exports.sanitizePadId = sanitizePadId;
 exports.broadcastUrlFor = broadcastUrlFor;

package/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const AttributePool = require('ep_etherpad-lite/static/js/AttributePool');
-const Changeset = require('ep_etherpad-lite/static/js/Changeset');
+const AttributePool = require('ep_etherpad-lite/static/js/AttributePool').default || require('ep_etherpad-lite/static/js/AttributePool');
+const Changeset = require('ep_etherpad-lite/static/js/Changeset').default || require('ep_etherpad-lite/static/js/Changeset');
 const eejs = require('ep_etherpad-lite/node/eejs/');
 const settings = require('ep_etherpad-lite/node/utils/Settings');
 const {Formidable} = require('formidable');
@@ -9,7 +9,7 @@ const commentManager = require('./commentManager');
 const apiUtils = require('./apiUtils');
 const _ = require('underscore');
 const padMessageHandler = require('ep_etherpad-lite/node/handler/PadMessageHandler');
-const readOnlyManager = require('ep_etherpad-lite/node/db/ReadOnlyManager');
+const readOnlyManager = require('ep_etherpad-lite/node/db/ReadOnlyManager').default || require('ep_etherpad-lite/node/db/ReadOnlyManager');
 
 let io;
 
@@ -17,8 +17,8 @@ exports.exportEtherpadAdditionalContent = (hookName, context, callback) => callb
 
 exports.padRemove = async (hookName, context) => {
   await Promise.all([
-    commentManager.deleteCommentReplies(context.padID),
-    commentManager.deleteComments(context.padID),
+    commentManager.deleteCommentReplies(context.pad.id),
+    commentManager.deleteComments(context.pad.id),
   ]);
 };
 
@@ -204,11 +204,8 @@ exports.clientVars = (hook, context, cb) => {
 };
 
 exports.expressCreateServer = (hookName, args, callback) => {
-  args.app.get('/p/:pad/:rev?/comments', async (req, res) => {
-    const fields = req.query;
-    // check the api key
-    if (!apiUtils.validateApiKey(fields, res)) return;
-
+  args.app.get('/p/:pad{/:rev}/comments', async (req, res) => {
+    if (!await apiUtils.validateAuth(req, res)) return;
     // sanitize pad id before continuing
     const padIdReceived = (await readOnlyManager.getIds(apiUtils.sanitizePadId(req))).padId;
 
@@ -224,13 +221,26 @@ exports.expressCreateServer = (hookName, args, callback) => {
     res.json({code: 0, data});
   });
 
-  args.app.post('/p/:pad/:rev?/comments', async (req, res) => {
-    const fields = await new Promise((resolve, reject) => {
+  // Helper that returns request fields from either req.body (when Etherpad's
+  // express body-parser middleware has already parsed JSON or urlencoded) or
+  // by parsing the raw body with Formidable (multipart/form-data uploads).
+  // Formidable v3 returns array values; flatten them so callers can use
+  // fields.data without indexing.
+  const parseRequestFields = async (req) => {
+    if (req.body && Object.keys(req.body).length > 0) return req.body;
+    const raw = await new Promise((resolve, reject) => {
       new Formidable().parse(req, (err, fields) => err ? reject(err) : resolve(fields));
     });
+    const flat = {};
+    for (const [k, v] of Object.entries(raw || {})) {
+      flat[k] = Array.isArray(v) ? v[0] : v;
+    }
+    return flat;
+  };
 
-    // check the api key
-    if (!apiUtils.validateApiKey(fields, res)) return;
+  args.app.post('/p/:pad{/:rev}/comments', async (req, res) => {
+    if (!await apiUtils.validateAuth(req, res)) return;
+    const fields = await parseRequestFields(req);
 
     // check required fields from comment data
     if (!apiUtils.validateRequiredFields(fields, ['data'], res)) return;
@@ -262,12 +272,8 @@ exports.expressCreateServer = (hookName, args, callback) => {
     res.json({code: 0, commentIds});
   });
 
-  args.app.get('/p/:pad/:rev?/commentReplies', async (req, res) => {
-    // it's the same thing as the formidable's fields
-    const fields = req.query;
-    // check the api key
-    if (!apiUtils.validateApiKey(fields, res)) return;
-
+  args.app.get('/p/:pad{/:rev}/commentReplies', async (req, res) => {
+    if (!await apiUtils.validateAuth(req, res)) return;
     // sanitize pad id before continuing
     const padIdReceived = (await readOnlyManager.getIds(apiUtils.sanitizePadId(req))).padId;
 
@@ -284,13 +290,9 @@ exports.expressCreateServer = (hookName, args, callback) => {
     res.json({code: 0, data});
   });
 
-  args.app.post('/p/:pad/:rev?/commentReplies', async (req, res) => {
-    const fields = await new Promise((resolve, reject) => {
-      new Formidable().parse(req, (err, fields) => err ? reject(err) : resolve(fields));
-    });
-
-    // check the api key
-    if (!apiUtils.validateApiKey(fields, res)) return;
+  args.app.post('/p/:pad{/:rev}/commentReplies', async (req, res) => {
+    if (!await apiUtils.validateAuth(req, res)) return;
+    const fields = await parseRequestFields(req);
 
     // check required fields from comment data
     if (!apiUtils.validateRequiredFields(fields, ['data'], res)) return;

package/locales/es.json

@@ -2,21 +2,30 @@
 	"@metadata": {
 		"authors": [
 			"Avengium",
-			"Jakeukalane"
+			"Jakeukalane",
+			"Ovruni"
 		]
 	},
 	"ep_comments_page.comment": "Comentario",
 	"ep_comments_page.comments": "Comentarios",
+	"ep_comments_page.add_comment.title": "Añadir nuevo comentario sobre la selección",
+	"ep_comments_page.add_comment": "Añadir nuevo comentario sobre la selección",
 	"ep_comments_page.add_comment.hint": "Primero selecciona el texto para comentar",
+	"ep_comments_page.delete_comment.title": "Eliminar este comentario",
 	"ep_comments_page.edit_comment.title": "Editar este comentario",
+	"ep_comments_page.show_comments": "Mostrar comentarios",
+	"ep_comments_page.comments_template.suggested_change": "Cambio sugerido",
+	"ep_comments_page.comments_template.from": "De",
 	"ep_comments_page.comments_template.accept_change.value": "Aceptar cambio",
 	"ep_comments_page.comments_template.revert_change.value": "Revertir cambio",
 	"ep_comments_page.comments_template.suggested_change_from": "Cambio sugerido de \"{{changeFrom}}\" a \"{{changeTo}}\"",
 	"ep_comments_page.comments_template.suggest_change_from": "Sugerir cambio de \"{{changeFrom}}\" a",
+	"ep_comments_page.comments_template.to": "Para",
 	"ep_comments_page.comments_template.include_suggestion": "Incluir cambio sugerido",
 	"ep_comments_page.comments_template.comment.value": "Comentario",
 	"ep_comments_page.comments_template.cancel.value": "Cancelar",
 	"ep_comments_page.comments_template.reply.value": "Responder",
+	"ep_comments_page.comments_template.reply.placeholder": "Responder",
 	"ep_comments_page.comments_template.edit_comment.save": "Guardar",
 	"ep_comments_page.comments_template.edit_comment.cancel": "cancelar",
 	"ep_comments_page.error.edit_unauth": "¡No puedes editar los comentarios de otros usuarios!",

package/locales/fr.json

@@ -1,17 +1,18 @@
 {
 	"@metadata": {
 		"authors": [
+			"Meaz",
 			"Verdy p"
 		]
 	},
 	"ep_comments_page.comment": "Annotation",
 	"ep_comments_page.comments": "Annotations",
-	"ep_comments_page.add_comment.title": "Annoter la sélection",
-	"ep_comments_page.add_comment": "Annoter la sélection",
-	"ep_comments_page.add_comment.hint": "Vous devez d'abord sélectionner un texte à annoter",
-	"ep_comments_page.delete_comment.title": "Supprimer cette annotation",
-	"ep_comments_page.edit_comment.title": "Modifier cette annotation",
-	"ep_comments_page.show_comments": "Afficher les annotations",
+	"ep_comments_page.add_comment.title": "Ajouter un nouveau commentaire sur la sélection",
+	"ep_comments_page.add_comment": "Ajouter un nouveau commentaire sur la sélection",
+	"ep_comments_page.add_comment.hint": "Vous devez d'abord sélectionner un texte à commenter",
+	"ep_comments_page.delete_comment.title": "Supprimer ce commentaire",
+	"ep_comments_page.edit_comment.title": "Modifier ce commentaire",
+	"ep_comments_page.show_comments": "Afficher le commentaire",
 	"ep_comments_page.comments_template.suggested_change": "Modification proposée",
 	"ep_comments_page.comments_template.from": "Remplacer",
 	"ep_comments_page.comments_template.accept_change.value": "Appliquer la proposition",
@@ -20,7 +21,7 @@
 	"ep_comments_page.comments_template.suggest_change_from": "Remplacer « {{changeFrom}} » par",
 	"ep_comments_page.comments_template.to": "Par",
 	"ep_comments_page.comments_template.include_suggestion": "Inclure la modification suggérée",
-	"ep_comments_page.comments_template.comment.value": "Annotation",
+	"ep_comments_page.comments_template.comment.value": "Commentaire",
 	"ep_comments_page.comments_template.cancel.value": "Annuler",
 	"ep_comments_page.comments_template.reply.value": "Répondre",
 	"ep_comments_page.comments_template.reply.placeholder": "Répondre",

package/locales/ga.json

@@ -0,0 +1,31 @@
+{
+	"@metadata": {
+		"authors": [
+			"Aindriu80"
+		]
+	},
+	"ep_comments_page.comment": "Trácht",
+	"ep_comments_page.comments": "Tráchtanna",
+	"ep_comments_page.add_comment.title": "Cuir trácht nua leis an rogha",
+	"ep_comments_page.add_comment": "Cuir trácht nua leis an rogha",
+	"ep_comments_page.add_comment.hint": "Roghnaigh an téacs le trácht a dhéanamh air ar dtús",
+	"ep_comments_page.delete_comment.title": "Scrios an trácht seo",
+	"ep_comments_page.edit_comment.title": "Cuir an trácht seo in eagar",
+	"ep_comments_page.show_comments": "Taispeáin Tráchtanna",
+	"ep_comments_page.comments_template.suggested_change": "Athrú Molta",
+	"ep_comments_page.comments_template.from": "Ó",
+	"ep_comments_page.comments_template.accept_change.value": "Glac leis an Athrú",
+	"ep_comments_page.comments_template.revert_change.value": "Athraigh a Chur Ar Ais",
+	"ep_comments_page.comments_template.suggested_change_from": "Athrú molta ó \"{{changeFrom}}\" go \"{{changeTo}}\"",
+	"ep_comments_page.comments_template.suggest_change_from": "Mol athrú ó \"{{changeFrom}}\" go",
+	"ep_comments_page.comments_template.to": "Chuig",
+	"ep_comments_page.comments_template.include_suggestion": "Cuir an t-athrú molta san áireamh",
+	"ep_comments_page.comments_template.comment.value": "Trácht",
+	"ep_comments_page.comments_template.cancel.value": "Cealaigh",
+	"ep_comments_page.comments_template.reply.value": "Freagra",
+	"ep_comments_page.comments_template.reply.placeholder": "Freagra",
+	"ep_comments_page.comments_template.edit_comment.save": "sábháil",
+	"ep_comments_page.comments_template.edit_comment.cancel": "cealaigh",
+	"ep_comments_page.error.edit_unauth": "Ní féidir leat tuairimí úsáideoirí eile a chur in eagar!",
+	"ep_comments_page.error.delete_unauth": "Ní féidir leat tuairimí úsáideoirí eile a scriosadh!"
+}

package/locales/got.json

@@ -0,0 +1,15 @@
+{
+	"@metadata": {
+		"authors": [
+			"Gothicspeaker"
+		]
+	},
+	"ep_comments_page.comment": "𐍅𐌰𐌿𐍂𐌳",
+	"ep_comments_page.comments": "𐍅𐌰𐌿𐍂𐌳𐌰",
+	"ep_comments_page.comments_template.to": "𐌳𐌿",
+	"ep_comments_page.comments_template.cancel.value": "𐌱𐌹𐍅𐌰𐌽𐌳𐌾𐌰𐌽",
+	"ep_comments_page.comments_template.reply.value": "𐌰𐌽𐌳𐌷𐌰𐍆𐌾𐌰𐌽",
+	"ep_comments_page.comments_template.reply.placeholder": "𐌰𐌽𐌳𐌷𐌰𐍆𐌾𐌰𐌽",
+	"ep_comments_page.comments_template.edit_comment.save": "𐌲𐌰𐍆𐌰𐍃𐍄𐌰𐌽",
+	"ep_comments_page.comments_template.edit_comment.cancel": "𐌱𐌹𐍅𐌰𐌽𐌳𐌾𐌰𐌽"
+}

package/locales/hu.json

@@ -1,6 +1,8 @@
 {
 	"@metadata": {
-		"authors": []
+		"authors": [
+			"Urbalazs"
+		]
 	},
 	"ep_comments_page.comment": "Megjegyzés",
 	"ep_comments_page.comments": "Megjegyzések",
@@ -19,7 +21,7 @@
 	"ep_comments_page.comments_template.to": "Címzett:",
 	"ep_comments_page.comments_template.include_suggestion": "Javasolt változtatás tartalmazása",
 	"ep_comments_page.comments_template.comment.value": "Megjegyzés",
-	"ep_comments_page.comments_template.cancel.value": "Mégsem",
+	"ep_comments_page.comments_template.cancel.value": "Mégse",
 	"ep_comments_page.comments_template.reply.value": "Válasz",
 	"ep_comments_page.comments_template.reply.placeholder": "Válasz",
 	"ep_comments_page.comments_template.edit_comment.save": "mentés",

package/locales/kaa.json

@@ -0,0 +1,31 @@
+{
+	"@metadata": {
+		"authors": [
+			"Inabat Allanova"
+		]
+	},
+	"ep_comments_page.comment": "Pikir",
+	"ep_comments_page.comments": "Pikirler",
+	"ep_comments_page.add_comment.title": "Tańlawǵa jańa pikir qosıw",
+	"ep_comments_page.add_comment": "Tańlawǵa jańa pikir qosıw",
+	"ep_comments_page.add_comment.hint": "Dáslep, pikir jazıw ushın tekstti tańlań",
+	"ep_comments_page.delete_comment.title": "Pikirdi óshiriw",
+	"ep_comments_page.edit_comment.title": "Pikirdi redaktorlaw",
+	"ep_comments_page.show_comments": "Pikirlerdi kórsetiw",
+	"ep_comments_page.comments_template.suggested_change": "Usınılǵan ózgeris",
+	"ep_comments_page.comments_template.from": "Usıdan baslap:",
+	"ep_comments_page.comments_template.accept_change.value": "Ózgeristi qabıl etiw",
+	"ep_comments_page.comments_template.revert_change.value": "Ózgeristi qaytarıw",
+	"ep_comments_page.comments_template.suggested_change_from": "«{{changeFrom}}»tan «{{changeTo}}»qa ózgertiw usınıs etildi",
+	"ep_comments_page.comments_template.suggest_change_from": "«{{changeFrom}}» ornına basqasın usınıs etiń",
+	"ep_comments_page.comments_template.to": "Usıǵan shekem",
+	"ep_comments_page.comments_template.include_suggestion": "Usınılǵan ózgeristi kirgiziw",
+	"ep_comments_page.comments_template.comment.value": "Pikir",
+	"ep_comments_page.comments_template.cancel.value": "Biykarlaw",
+	"ep_comments_page.comments_template.reply.value": "Juwap beriw",
+	"ep_comments_page.comments_template.reply.placeholder": "Juwap beriw",
+	"ep_comments_page.comments_template.edit_comment.save": "saqlaw",
+	"ep_comments_page.comments_template.edit_comment.cancel": "biykarlaw",
+	"ep_comments_page.error.edit_unauth": "Siz basqa paydalanıwshılardıń pikirlerin redaktorlay almaysız!",
+	"ep_comments_page.error.delete_unauth": "Siz basqa paydalanıwshılardıń pikirlerin óshire almaysız!"
+}

package/locales/kab.json

@@ -0,0 +1,14 @@
+{
+	"@metadata": {
+		"authors": [
+			"ButterflyOfFire"
+		]
+	},
+	"ep_comments_page.comment": "Awennit",
+	"ep_comments_page.comments": "Iwenniten",
+	"ep_comments_page.comments_template.cancel.value": "Semmet",
+	"ep_comments_page.comments_template.reply.value": "Tiririt",
+	"ep_comments_page.comments_template.reply.placeholder": "Tiririt",
+	"ep_comments_page.comments_template.edit_comment.save": "sekles",
+	"ep_comments_page.comments_template.edit_comment.cancel": "semmet"
+}

package/locales/ko.json

@@ -3,7 +3,8 @@
 		"authors": [
 			"Dr1t jg",
 			"Ykhwong",
-			"그냥기여자"
+			"그냥기여자",
+			"아라"
 		]
 	},
 	"ep_comments_page.comment": "의견",
@@ -14,7 +15,7 @@
 	"ep_comments_page.delete_comment.title": "이 의견 삭제",
 	"ep_comments_page.edit_comment.title": "이 의견 편집하기",
 	"ep_comments_page.show_comments": "의견 표시",
-	"ep_comments_page.comments_template.suggested_change": "제안된 변경 사항",
+	"ep_comments_page.comments_template.suggested_change": "제안된 변경사항",
 	"ep_comments_page.comments_template.from": "출발지",
 	"ep_comments_page.comments_template.accept_change.value": "변경 수락",
 	"ep_comments_page.comments_template.revert_change.value": "변경사항 되돌리기",

package/locales/lb.json

@@ -1,7 +1,8 @@
 {
 	"@metadata": {
 		"authors": [
-			"Robby"
+			"Robby",
+			"Volvox"
 		]
 	},
 	"ep_comments_page.comment": "Bemierkung",
@@ -12,7 +13,7 @@
 	"ep_comments_page.comments_template.suggested_change": "Proposéiert Ännerung",
 	"ep_comments_page.comments_template.from": "Vum",
 	"ep_comments_page.comments_template.accept_change.value": "Ännerung akzeptéieren",
-	"ep_comments_page.comments_template.revert_change.value": "Ännerung zrécksetzen",
+	"ep_comments_page.comments_template.revert_change.value": "Ännerung zerécksetzen",
 	"ep_comments_page.comments_template.to": "Fir",
 	"ep_comments_page.comments_template.comment.value": "Bemierkung",
 	"ep_comments_page.comments_template.cancel.value": "Ofbriechen",

package/locales/nl.json

@@ -26,6 +26,6 @@
 	"ep_comments_page.comments_template.reply.placeholder": "Antwoord",
 	"ep_comments_page.comments_template.edit_comment.save": "bewaar",
 	"ep_comments_page.comments_template.edit_comment.cancel": "annuleer",
-	"ep_comments_page.error.edit_unauth": "You cannot edit other users comments!",
-	"ep_comments_page.error.delete_unauth": "You cannot delete other users comments!"
+	"ep_comments_page.error.edit_unauth": "U kunt de opmerkingen van andere gebruikers niet bewerken!",
+	"ep_comments_page.error.delete_unauth": "U kunt de opmerkingen van andere gebruikers niet verwijderen!"
 }

package/locales/pa.json

@@ -0,0 +1,15 @@
+{
+	"@metadata": {
+		"authors": [
+			"Cabal"
+		]
+	},
+	"ep_comments_page.comments": "ਟਿੱਪਣੀਆਂ",
+	"ep_comments_page.comments_template.from": "ਵੱਲੋਂ",
+	"ep_comments_page.comments_template.accept_change.value": "ਤਬਦੀਲੀ ਸਵੀਕਾਰੋ",
+	"ep_comments_page.comments_template.cancel.value": "ਰੱਦ ਕਰੋ",
+	"ep_comments_page.comments_template.reply.value": "ਜੁਆਬ ਦਿਓ",
+	"ep_comments_page.comments_template.reply.placeholder": "ਜੁਆਬ ਦਿਓ",
+	"ep_comments_page.comments_template.edit_comment.save": "ਸਾਂਭੋ",
+	"ep_comments_page.comments_template.edit_comment.cancel": "ਰੱਦ ਕਰੋ"
+}

package/locales/pl.json

@@ -1,21 +1,23 @@
 {
 	"@metadata": {
-		"authors": []
+		"authors": [
+			"Usagi.02808"
+		]
 	},
 	"ep_comments_page.comment": "Komentarz",
 	"ep_comments_page.comments": "Komentarze",
-	"ep_comments_page.add_comment.title": "Dodaj nowy komentarz do sekcji",
-	"ep_comments_page.add_comment": "Dodaj nowy komentarz do sekcji",
+	"ep_comments_page.add_comment.title": "Dodaj nowy komentarz do zaznaczonego tekstu",
+	"ep_comments_page.add_comment": "Dodaj nowy komentarz do zaznaczonego tekstu",
 	"ep_comments_page.add_comment.hint": "Najpierw wybierz tekst do skomentowania",
 	"ep_comments_page.delete_comment.title": "Usuń komentarz",
-	"ep_comments_page.edit_comment.title": "Edit this comment",
+	"ep_comments_page.edit_comment.title": "Edytuj ten komentarz",
 	"ep_comments_page.show_comments": "Pokaż komentarze",
-	"ep_comments_page.comments_template.suggested_change": "Sugerowane zmiany",
+	"ep_comments_page.comments_template.suggested_change": "Sugerowana zmiana",
 	"ep_comments_page.comments_template.from": "Od",
 	"ep_comments_page.comments_template.accept_change.value": "Zaakceptuj zmiany",
 	"ep_comments_page.comments_template.revert_change.value": "Przywróc zmiany",
-	"ep_comments_page.comments_template.suggested_change_from": "Sugerowana zmiana z",
-	"ep_comments_page.comments_template.suggest_change_from": "Zaproponuj zmiane z",
+	"ep_comments_page.comments_template.suggested_change_from": "Sugerowana zmiana z „{{changeFrom}}” na „{{changeTo}}”",
+	"ep_comments_page.comments_template.suggest_change_from": "Zaproponuj zmianę z „{{changeFrom}}” na",
 	"ep_comments_page.comments_template.to": "Do",
 	"ep_comments_page.comments_template.include_suggestion": "Dołącz sugestie",
 	"ep_comments_page.comments_template.comment.value": "Komentarz",
@@ -24,6 +26,6 @@
 	"ep_comments_page.comments_template.reply.placeholder": "Odpowiedź",
 	"ep_comments_page.comments_template.edit_comment.save": "save",
 	"ep_comments_page.comments_template.edit_comment.cancel": "cancel",
-	"ep_comments_page.error.edit_unauth": "You cannot edit other users comments!",
-	"ep_comments_page.error.delete_unauth": "You cannot delete other users comments!"
+	"ep_comments_page.error.edit_unauth": "Nie możesz edytować komentarzy innych użytkowników!",
+	"ep_comments_page.error.delete_unauth": "Nie możesz usuwać komentarzy innych użytkowników!"
 }

package/locales/pms.json

@@ -0,0 +1,31 @@
+{
+	"@metadata": {
+		"authors": [
+			"Borichèt"
+		]
+	},
+	"ep_comments_page.comment": "Coment",
+	"ep_comments_page.comments": "Coment",
+	"ep_comments_page.add_comment.title": "Gionté un coment neuv an sla selession",
+	"ep_comments_page.add_comment": "Gionté un coment neuv an sla selession",
+	"ep_comments_page.add_comment.hint": "Për piasì, prima ch'a serna ël test da comenté",
+	"ep_comments_page.delete_comment.title": "Eliminé cost coment",
+	"ep_comments_page.edit_comment.title": "Modifiché cost coment",
+	"ep_comments_page.show_comments": "Smon-e ij coment",
+	"ep_comments_page.comments_template.suggested_change": "Modìfiche proponùe",
+	"ep_comments_page.comments_template.from": "Da",
+	"ep_comments_page.comments_template.accept_change.value": "Aceté la modìfica",
+	"ep_comments_page.comments_template.revert_change.value": "Anulé la modìfica",
+	"ep_comments_page.comments_template.suggested_change_from": "Propon-e ëd rampiassé «{{changeFrom}}» con «{{changeTo}}»",
+	"ep_comments_page.comments_template.suggest_change_from": "Propon-e ëd rampiassé «{{changeFrom}}» con",
+	"ep_comments_page.comments_template.to": "A",
+	"ep_comments_page.comments_template.include_suggestion": "Anclude la modìfica sugerìa",
+	"ep_comments_page.comments_template.comment.value": "Coment",
+	"ep_comments_page.comments_template.cancel.value": "Anulé",
+	"ep_comments_page.comments_template.reply.value": "Rësponde",
+	"ep_comments_page.comments_template.reply.placeholder": "Rësponde",
+	"ep_comments_page.comments_template.edit_comment.save": "argistré",
+	"ep_comments_page.comments_template.edit_comment.cancel": "anulé",
+	"ep_comments_page.error.edit_unauth": "A peul pa modifiché ij coment dj'àutri utent!",
+	"ep_comments_page.error.delete_unauth": "A peul nen dëscancelé ij coment ëd j'àutri utent!"
+}

package/locales/ps.json

@@ -0,0 +1,29 @@
+{
+	"@metadata": {
+		"authors": [
+			"شاه زمان پټان"
+		]
+	},
+	"ep_comments_page.comment": "څرگندونه",
+	"ep_comments_page.comments": "څرگندونې",
+	"ep_comments_page.add_comment.title": "په ټاکنې کې نوې څرگندونه ورگډول",
+	"ep_comments_page.add_comment": "په ټاکنې کې نوې څرگندونه ورگډول",
+	"ep_comments_page.add_comment.hint": "مهرباني وکړئ د څرگندونې لپاره لومړی ليکنه وټاکئ",
+	"ep_comments_page.delete_comment.title": "دا څرگندونه ړنگول",
+	"ep_comments_page.edit_comment.title": "دا څرگندونه سمول",
+	"ep_comments_page.show_comments": "څرگندونې ښودل",
+	"ep_comments_page.comments_template.suggested_change": "وړانديزشوی بدلون",
+	"ep_comments_page.comments_template.from": "له",
+	"ep_comments_page.comments_template.accept_change.value": "بدلون منل",
+	"ep_comments_page.comments_template.revert_change.value": "بدلون په‌څټ‌گرځول",
+	"ep_comments_page.comments_template.to": "ته",
+	"ep_comments_page.comments_template.include_suggestion": "وړانديزشوی بدلون رانغاړل",
+	"ep_comments_page.comments_template.comment.value": "څرگندونه",
+	"ep_comments_page.comments_template.cancel.value": "ناگارل",
+	"ep_comments_page.comments_template.reply.value": "ځوابول",
+	"ep_comments_page.comments_template.reply.placeholder": "ځوابول",
+	"ep_comments_page.comments_template.edit_comment.save": "خوندي کول",
+	"ep_comments_page.comments_template.edit_comment.cancel": "ناگارل",
+	"ep_comments_page.error.edit_unauth": "تاسو د نورو کارنانو څرگندونې نشئ سمولی!",
+	"ep_comments_page.error.delete_unauth": "تاسو د نورو کارنانو څرگندونې نشئ ړنگولی!"
+}

package/locales/ro.json

@@ -0,0 +1,15 @@
+{
+	"@metadata": {
+		"authors": [
+			"SZ475"
+		]
+	},
+	"ep_comments_page.comment": "Comentează",
+	"ep_comments_page.comments": "Comentarii",
+	"ep_comments_page.comments_template.from": "De la",
+	"ep_comments_page.comments_template.accept_change.value": "Acceptă schimbarea",
+	"ep_comments_page.comments_template.revert_change.value": "Anulează schimbarea",
+	"ep_comments_page.comments_template.to": "Către",
+	"ep_comments_page.error.edit_unauth": "Nu poți edita comentariile altor utilizatori!",
+	"ep_comments_page.error.delete_unauth": "Nu poți șterge comentariile altor utilizatori!"
+}

package/locales/sq.json

@@ -1,7 +1,8 @@
 {
 	"@metadata": {
 		"authors": [
-			"Besnik b"
+			"Besnik b",
+			"Xhulianoo"
 		]
 	},
 	"ep_comments_page.comment": "Koment",

package/package.json

@@ -1,7 +1,7 @@
 {
   "description": "Adds comments on sidebar and link it to the text.  For no-skin use ep_page_view.",
   "name": "ep_comments_page",
-  "version": "1.0.38",
+  "version": "1.0.41",
   "author": {
     "name": "Nicolas Lescop",
     "email": "limplementeur@gmail.com"
@@ -22,16 +22,16 @@
     }
   ],
   "dependencies": {
-    "cheerio": "^1.0.0-rc.12",
-    "formidable": "^3.5.1",
-    "underscore": "^1.13.6"
+    "cheerio": "^1.2.0",
+    "formidable": "^3.5.4",
+    "underscore": "^1.13.8"
   },
   "devDependencies": {
-    "eslint": "^8.57.0",
+    "eslint": "^8.57.1",
     "eslint-config-etherpad": "^4.0.4",
-    "socket.io-client": "*",
-    "superagent": "^8.1.2",
-    "typescript": "^5.4.2"
+    "socket.io-client": "^4.8.3",
+    "superagent": "^10.3.0",
+    "typescript": "^6.0.2"
   },
   "engines": {
     "node": ">=18.0.0"

package/static/js/index.js

@@ -791,10 +791,10 @@ EpComments.prototype.getCommentData = function () {
 
 // Delete a pad comment
 EpComments.prototype.deleteComment = function (commentId) {
-  while($('iframe[name="ace_outer"]').contents().find(`#${commentId}`).length > 0){
+  while ($('iframe[name="ace_outer"]').contents().find(`#${commentId}`).length > 0) {
     $('iframe[name="ace_outer"]').contents().find(`#${commentId}`).remove();
   }
-  while($('iframe[name="ace_outer"]').contents().find(`#icon-${commentId}`).length > 0){
+  while ($('iframe[name="ace_outer"]').contents().find(`#icon-${commentId}`).length > 0) {
     $('iframe[name="ace_outer"]').contents().find(`#icon-${commentId}`).remove();
   }
 };