ep_comments_page 1.0.37 → 1.0.39

package/index.js

@@ -204,7 +204,7 @@ exports.clientVars = (hook, context, cb) => {
 };
 
 exports.expressCreateServer = (hookName, args, callback) => {
-  args.app.get('/p/:pad/:rev?/comments', async (req, res) => {
+  const handlePadRevComments = async (req, res) => {
     const fields = req.query;
     // check the api key
     if (!apiUtils.validateApiKey(fields, res)) return;
@@ -222,9 +222,17 @@ exports.expressCreateServer = (hookName, args, callback) => {
     }
     if (data == null) return;
     res.json({code: 0, data});
+  }
+
+  args.app.get('/p/:pad/:rev/comments', async (req, res) => {
+   await handlePadRevComments(req, res)
   });
 
-  args.app.post('/p/:pad/:rev?/comments', async (req, res) => {
+  args.app.get('/p/:pad/comments', async (req, res) => {
+    await handlePadRevComments(req, res)
+  });
+
+  const postRevision = async (req, res)=>{
     const fields = await new Promise((resolve, reject) => {
       new Formidable().parse(req, (err, fields) => err ? reject(err) : resolve(fields));
     });
@@ -260,9 +268,18 @@ exports.expressCreateServer = (hookName, args, callback) => {
       io.to(padIdReceived).emit('pushAddComment', commentIds[i], comments[i]);
     }
     res.json({code: 0, commentIds});
+  }
+
+  args.app.post('/p/:pad/:rev/comments', async (req, res) => {
+    await postRevision(req, res);
+  });
+
+  args.app.post('/p/:pad/comments', async (req, res) => {
+    await postRevision(req, res);
   });
 
-  args.app.get('/p/:pad/:rev?/commentReplies', async (req, res) => {
+
+  const getCommentReplies = async (req, res) => {
     // it's the same thing as the formidable's fields
     const fields = req.query;
     // check the api key
@@ -282,9 +299,17 @@ exports.expressCreateServer = (hookName, args, callback) => {
     }
     if (data == null) return;
     res.json({code: 0, data});
+  }
+
+  args.app.get('/p/:pad/commentReplies', async (req, res) => {
+      await getCommentReplies(req, res);
   });
 
-  args.app.post('/p/:pad/:rev?/commentReplies', async (req, res) => {
+  args.app.get('/p/:pad/:rev/commentReplies', async (req, res) => {
+    await getCommentReplies(req, res);
+  });
+
+  const postCommentReplies = async (req, res) => {
     const fields = await new Promise((resolve, reject) => {
       new Formidable().parse(req, (err, fields) => err ? reject(err) : resolve(fields));
     });
@@ -321,6 +346,15 @@ exports.expressCreateServer = (hookName, args, callback) => {
       io.to(padIdReceived).emit('pushAddCommentReply', replyIds[i], replies[i]);
     }
     res.json({code: 0, replyIds});
+  }
+
+  args.app.post('/p/:pad/:rev/commentReplies', async (req, res) => {
+    await postCommentReplies(req, res);
+  });
+
+  args.app.post('/p/:pad/commentReplies', async (req, res) => {
+    await postCommentReplies(req, res);
   });
+
   return callback();
 };

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.37",
+  "version": "1.0.39",
   "author": {
     "name": "Nicolas Lescop",
     "email": "limplementeur@gmail.com"
@@ -23,27 +23,31 @@
   ],
   "dependencies": {
     "cheerio": "^1.0.0-rc.12",
-    "formidable": "^3.5.1",
+    "formidable": "^3.5.4",
     "underscore": "^1.13.6"
   },
   "devDependencies": {
-    "eslint": "^8.57.0",
+    "eslint": "^9.24.0",
     "eslint-config-etherpad": "^4.0.4",
     "socket.io-client": "*",
-    "superagent": "^8.1.2",
-    "typescript": "^5.4.2"
+    "superagent": "^10.2.0",
+    "typescript": "^5.4.3"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/ether/ep_comments"
+    "url": "https://github.com/ether/ether-plugins.git"
   },
   "funding": {
     "type": "individual",
     "url": "https://etherpad.org/"
   },
+  "bugs": {
+    "url": "https://github.com/ether/ether-plugins/issues"
+  },
+  "homepage": "https://github.com/ether/ether-plugins/tree/main/ep_comments_page#readme",
   "scripts": {
     "lint": "eslint .",
     "lint:fix": "eslint --fix ."

package/static/js/index.js

@@ -791,12 +791,7 @@ EpComments.prototype.getCommentData = function () {
 
 // Delete a pad comment
 EpComments.prototype.deleteComment = function (commentId) {
-  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){
-    $('iframe[name="ace_outer"]').contents().find(`#icon-${commentId}`).remove();
-  }
+  $('iframe[name="ace_outer"]').contents().find(`#${commentId}`).remove();
 };
 
 const cloneLine = (line) => {