Improved message escaping (#42)

* Make update-message more consistent with send-message (#39)

* Moved escaper code to shared util

Co-authored-by: Krishna Rajendran <krishna@emptybox.org>

Author: archive

dist/index.js

@@ -1729,7 +1729,12 @@ module.exports = invoke;
 /***/ }),
 
 /***/ 690:
-/***/ ((module) => {
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+const {
+  restoreEscapedNewLine,
+  restoreEscapedTab,
+} = __nccwpck_require__(307);
 
 const buildMessage = (channel = "", text = "", optional = {}) => {
   const message = {
@@ -1747,11 +1752,6 @@ const buildMessage = (channel = "", text = "", optional = {}) => {
   return message;
 };
 
-const restoreEscapedNewLine = (text) =>
-  text.replace(/\\r\\n/g, "\n").replace(/\\n/g, "\n");
-
-const restoreEscapedTab = (text) => text.replace(/\\t/g, "\t");
-
 module.exports = buildMessage;
 
 
@@ -1874,19 +1874,31 @@ module.exports = { addReaction };
 /***/ }),
 
 /***/ 51:
-/***/ ((module) => {
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+const {
+  restoreEscapedNewLine,
+  restoreEscapedTab,
+} = __nccwpck_require__(307);
 
-const buildUpdateMessage = (channelId = "", text = "", ts = "") => {
+const buildMessage = (channel = "", text = "", ts = "", optional = {}) => {
   const message = {
-    channel: channelId,
-    text: text,
-    ts: ts,
+    channel,
+    text,
+    ts,
   };
 
+  message.text = restoreEscapedNewLine(message.text);
+  message.text = restoreEscapedTab(message.text);
+
+  Object.keys(optional).forEach((name) => {
+    message[name] = optional[name];
+  });
+
   return message;
 };
 
-module.exports = buildUpdateMessage;
+module.exports = buildMessage;
 
 
 /***/ }),
@@ -1924,6 +1936,19 @@ const updateMessage = async () => {
 module.exports = { updateMessage };
 
 
+/***/ }),
+
+/***/ 307:
+/***/ ((module) => {
+
+const restoreEscapedNewLine = (text) =>
+  text.replace(/\\r\\n/g, "\n").replace(/\\n/g, "\n");
+
+const restoreEscapedTab = (text) => text.replace(/\\t/g, "\t");
+
+module.exports = { restoreEscapedNewLine, restoreEscapedTab };
+
+
 /***/ }),
 
 /***/ 491:

src/message/build-message.js

@@ -1,3 +1,8 @@
+const {
+  restoreEscapedNewLine,
+  restoreEscapedTab,
+} = require("../util/escaper.js");
+
 const buildMessage = (channel = "", text = "", optional = {}) => {
   const message = {
     channel,
@@ -14,9 +19,4 @@ const buildMessage = (channel = "", text = "", optional = {}) => {
   return message;
 };
 
-const restoreEscapedNewLine = (text) =>
-  text.replace(/\\r\\n/g, "\n").replace(/\\n/g, "\n");
-
-const restoreEscapedTab = (text) => text.replace(/\\t/g, "\t");
-
 module.exports = buildMessage;

src/update-message/build-update-message.js

@@ -1,11 +1,23 @@
-const buildUpdateMessage = (channelId = "", text = "", ts = "") => {
+const {
+  restoreEscapedNewLine,
+  restoreEscapedTab,
+} = require("../util/escaper.js");
+
+const buildMessage = (channel = "", text = "", ts = "", optional = {}) => {
   const message = {
-    channel: channelId,
-    text: text,
-    ts: ts,
+    channel,
+    text,
+    ts,
   };
 
+  message.text = restoreEscapedNewLine(message.text);
+  message.text = restoreEscapedTab(message.text);
+
+  Object.keys(optional).forEach((name) => {
+    message[name] = optional[name];
+  });
+
   return message;
 };
 
-module.exports = buildUpdateMessage;
+module.exports = buildMessage;

src/util/escaper.js

@@ -0,0 +1,6 @@
+const restoreEscapedNewLine = (text) =>
+  text.replace(/\\r\\n/g, "\n").replace(/\\n/g, "\n");
+
+const restoreEscapedTab = (text) => text.replace(/\\t/g, "\t");
+
+module.exports = { restoreEscapedNewLine, restoreEscapedTab };