solid-ui 2.4.27-94bb2a59 → 2.4.27-96e84cf1

package/lib/chat/message.js

@@ -12,7 +12,6 @@ exports.renderMessageEditor = renderMessageEditor;
 exports.renderMessageRow = renderMessageRow;
 exports.switchToEditor = switchToEditor;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _infinite = require("./infinite");
 var _messageTools = require("./messageTools");
@@ -28,11 +27,11 @@ var pad = _interopRequireWildcard(require("../pad"));
 var style = _interopRequireWildcard(require("../style"));
 var utils = _interopRequireWildcard(require("../utils"));
 var widgets = _interopRequireWildcard(require("../widgets"));
+var _signature = require("./signature");
+var _keys = require("./keys");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 var dom = window.document;
@@ -111,232 +110,147 @@ function creatorAndDateHorizontal(td1, creator, date, message) {
 /**
  * Renders a chat message, read-only mode
  */
-function renderMessageRow(_x, _x2, _x3, _x4, _x5) {
-  return _renderMessageRow.apply(this, arguments);
-}
-function _renderMessageRow() {
-  _renderMessageRow = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(channelObject, message, fresh, options, userContext) {
-    var colorizeByAuthor, creator, date, latestVersion, content, versions, replies, thread, straightReplies, _iterator2, _step2, reply, originalMessage, edited, sortDate, messageRow, td1, img, bothDates, td2, text, isURI, para, isImage, _img, anc, bgcolor, getBgColor, strip, td3, toolsButton;
-    return _regenerator["default"].wrap(function _callee9$(_context10) {
-      while (1) switch (_context10.prev = _context10.next) {
-        case 0:
-          getBgColor = function _getBgColor(fresh) {
-            return fresh ? '#e8ffe8' : 'white';
-          };
-          colorizeByAuthor = options.colorizeByAuthor === '1' || options.colorizeByAuthor === true;
-          creator = _solidLogic.store.any(message, ns.foaf('maker'));
-          date = _solidLogic.store.any(message, ns.dct('created'));
-          _context10.next = 6;
-          return (0, _chatLogic.mostRecentVersion)(message);
-        case 6:
-          latestVersion = _context10.sent;
-          content = _solidLogic.store.any(latestVersion, ns.sioc('content')); // const id = store.any(latestVersion, ns.sioc('id'))
-          // const replies = store.each(latestVersion, ns.sioc('has_reply'))
-          _context10.next = 10;
-          return (0, _chatLogic.allVersions)(message);
-        case 10:
-          versions = _context10.sent;
-          if (versions.length > 1) {
-            debug.log('renderMessageRow versions: ', versions.join(',  '));
-          }
-          // be tolerant in accepting replies on any version of a message
-          replies = versions.map(function (version) {
-            return _solidLogic.store.each(version, ns.sioc('has_reply'));
-          }).flat();
-          thread = null;
-          straightReplies = [];
-          _iterator2 = _createForOfIteratorHelper(replies);
-          try {
-            for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-              reply = _step2.value;
-              if (_solidLogic.store.holds(reply, ns.rdf('type'), ns.sioc('Thread'))) {
-                thread = reply;
-                debug.log('renderMessageRow: found thread: ' + thread);
-              } else {
-                straightReplies.push(reply);
-              }
-            }
-          } catch (err) {
-            _iterator2.e(err);
-          } finally {
-            _iterator2.f();
-          }
-          if (straightReplies.length > 1) {
-            debug.log('renderMessageRow: found normal replies: ', straightReplies);
-          }
-          _context10.next = 20;
-          return (0, _chatLogic.originalVersion)(message);
-        case 20:
-          originalMessage = _context10.sent;
-          edited = !message.sameTerm(originalMessage); // @@ load it first  @@   Or display the new data at the old date.
-          // @@@ kludge!
-          sortDate = _solidLogic.store.the(originalMessage, ns.dct('created'), null, originalMessage.doc()) || _solidLogic.store.the(message, ns.dct('created'), null, message.doc()); // In message
-          messageRow = dom.createElement('tr');
-          messageRow.AJAR_date = sortDate.value;
-          messageRow.AJAR_subject = message;
-          td1 = dom.createElement('td');
-          messageRow.appendChild(td1);
-          if (!options.authorDateOnLeft) {
-            img = dom.createElement('img');
-            img.setAttribute('style', 'max-height: 2.5em; max-width: 2.5em; border-radius: 0.5em; margin: auto;');
-            widgets.setImage(img, creator);
-            td1.appendChild(img);
-          } else {
-            creatorAndDate(td1, creator, widgets.shortDate(sortDate.value), message);
-          }
-          bothDates = widgets.shortDate(sortDate.value);
-          if (edited) {
-            bothDates += ' ... ' + widgets.shortDate(date.value);
-          }
+function renderMessageRow(channelObject, message, fresh, options, userContext) {
+  var colorizeByAuthor = options.colorizeByAuthor === '1' || options.colorizeByAuthor === true;
+  var creator = _solidLogic.store.any(message, ns.foaf('maker'));
+  var date = _solidLogic.store.any(message, ns.dct('created'));
+  var latestVersion = (0, _chatLogic.mostRecentVersion)(message);
+  var latestVersionCreator = _solidLogic.store.any(latestVersion, ns.foaf('maker'));
+  // use latest content if same owner, else use original
+  var msgId = creator.uri === latestVersionCreator.uri ? latestVersion : message;
+  var content = _solidLogic.store.any(msgId, ns.sioc('content'));
+  var signature = _solidLogic.store.any(msgId, $rdf.sym("".concat(_signature.SEC, "Proof")));
 
-          // Render the content ot the message itself
-          td2 = messageRow.appendChild(dom.createElement('td'));
-          if (!options.authorDateOnLeft) {
-            creatorAndDateHorizontal(td2, creator, bothDates,
-            // widgets.shortDate(dateString)
-            message);
-          }
-          text = content ? content.value.trim() : '??? no content?';
-          isURI = /^https?:\/[^ <>]*$/i.test(text);
-          para = null;
-          if (isURI) {
-            isImage = /\.(gif|jpg|jpeg|tiff|png|svg)$/i.test(text); // @@ Should use content-type not URI
-            if (isImage && options.expandImagesInline) {
-              _img = elementForImageURI(text, options);
-              td2.appendChild(_img);
-            } else {
-              // Link but not Image
-              anc = td2.appendChild(dom.createElement('a'));
-              para = anc.appendChild(dom.createElement('p'));
-              anc.href = text;
-              para.textContent = text;
-              td2.appendChild(anc);
-            }
-          } else {
-            // text
-            para = dom.createElement('p');
-            td2.appendChild(para);
-            para.textContent = text;
-          }
-          if (para) {
-            bgcolor = colorizeByAuthor ? pad.lightColorHash(creator) : getBgColor(fresh);
-            para.setAttribute('style', messageBodyStyle + 'background-color: ' + bgcolor + ';');
-          }
-          _context10.next = 40;
-          return (0, _messageTools.sentimentStripLinked)(message, message.doc());
-        case 40:
-          strip = _context10.sent;
-          if (strip.children.length) {
-            td2.appendChild(dom.createElement('br'));
-            td2.appendChild(strip);
-          }
+  // verify signature
+  var msg = (0, _signature.getBlankMsg)();
+  msg.id = msgId.uri;
+  msg.created = _solidLogic.store.any(msgId, ns.dct('created')).value;
+  msg.content = content.value;
+  msg.maker = creator.uri;
 
-          // Message tool bar button
-          td3 = dom.createElement('td');
-          messageRow.appendChild(td3);
-          toolsButton = widgets.button(dom, _iconBase.icons.iconBase + 'noun_243787.svg', '...');
-          td3.appendChild(toolsButton);
-          toolsButton.addEventListener('click', /*#__PURE__*/function () {
-            var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(_event) {
-              var toolsTR, tools, toolsTD;
-              return _regenerator["default"].wrap(function _callee8$(_context9) {
-                while (1) switch (_context9.prev = _context9.next) {
-                  case 0:
-                    if (!messageRow.toolTR) {
-                      _context9.next = 4;
-                      break;
-                    }
-                    // already got a toolbar? Toogle
-                    messageRow.parentNode.removeChild(messageRow.toolTR);
-                    delete messageRow.toolTR;
-                    return _context9.abrupt("return");
-                  case 4:
-                    toolsTR = dom.createElement('tr');
-                    _context9.next = 7;
-                    return (0, _messageTools.messageToolbar)(message, messageRow, _objectSpread(_objectSpread({}, userContext), {}, {
-                      chatOptions: options
-                    }), channelObject);
-                  case 7:
-                    tools = _context9.sent;
-                    tools.style = 'border: 0.05em solid #888; border-radius: 0 0 0.7em 0.7em;  border-top: 0; height:3.5em; background-color: #fff;'; // @@ fix
-                    if (messageRow.nextSibling) {
-                      messageRow.parentElement.insertBefore(toolsTR, messageRow.nextSibling);
-                    } else {
-                      messageRow.parentElement.appendChild(toolsTR);
-                    }
-                    messageRow.toolTR = toolsTR;
-                    toolsTR.appendChild(dom.createElement('td')); // left
-                    toolsTD = toolsTR.appendChild(dom.createElement('td'));
-                    toolsTR.appendChild(dom.createElement('td')); // right
-                    toolsTD.appendChild(tools);
-                  case 15:
-                  case "end":
-                    return _context9.stop();
-                }
-              }, _callee8);
-            }));
-            return function (_x20) {
-              return _ref4.apply(this, arguments);
-            };
-          }());
-          if (thread && options.showThread) {
-            debug.log('  message has thread ' + thread);
-            td3.appendChild(widgets.button(dom, _iconBase.icons.iconBase + 'noun_1180164.svg',
-            // right arrow .. @@ think of stg better
-            'see thread', function (_e) {
-              debug.log('@@@@ Calling showThread thread ' + thread);
-              options.showThread(thread, options);
-            }));
-          }
-          return _context10.abrupt("return", messageRow);
-        case 49:
-        case "end":
-          return _context10.stop();
-      }
-    }, _callee9);
-  }));
-  return _renderMessageRow.apply(this, arguments);
+  // unsigned message
+  if (signature !== null && signature !== void 0 && signature.value) debug.warn(msgId.uri + ' is unsigned'); // TODO replace with UI (colored message ?)
+  // get public key and check signature
+  else {
+    (0, _keys.getPublicKey)(creator.uri).then(function (publicKey) {
+      if (!publicKey) debug.warn('message is signed but ' + creator.uri + ' is missing publicKey');
+      // check publicKey is valid hex string
+      var regex = /[0-9A-Fa-f]{6}/g;
+      if (!(publicKey !== null && publicKey !== void 0 && publicKey.match(regex))) debug.warn('invalid publicKey hex string\n' + creator.uri + '\n' + publicKey);
+      // verify signature
+      else if (signature !== null && signature !== void 0 && signature.value && !(0, _signature.verifySignature)(signature.value, msg, publicKey)) debug.warn('invalid signature\n' + msg.id);
+    });
+  }
+  var originalMessage = (0, _chatLogic.originalVersion)(message);
+  var edited = !message.sameTerm(originalMessage);
+  var sortDate = _solidLogic.store.the(originalMessage, ns.dct('created'), null, originalMessage.doc()); // In message
+
+  var messageRow = dom.createElement('tr');
+  messageRow.AJAR_date = sortDate.value;
+  messageRow.AJAR_subject = message;
+  var td1 = dom.createElement('td');
+  messageRow.appendChild(td1);
+  if (!options.authorDateOnLeft) {
+    var img = dom.createElement('img');
+    img.setAttribute('style', 'max-height: 2.5em; max-width: 2.5em; border-radius: 0.5em; margin: auto;');
+    widgets.setImage(img, creator);
+    td1.appendChild(img);
+  } else {
+    creatorAndDate(td1, creator, widgets.shortDate(sortDate.value), message);
+  }
+  var bothDates = widgets.shortDate(sortDate.value);
+  if (edited) {
+    bothDates += ' ... ' + widgets.shortDate(date.value);
+  }
+
+  // Render the content ot the message itself
+  var td2 = messageRow.appendChild(dom.createElement('td'));
+  if (!options.authorDateOnLeft) {
+    creatorAndDateHorizontal(td2, creator, bothDates,
+    // widgets.shortDate(dateString)
+    message);
+  }
+  var text = content.value.trim();
+  var isURI = /^https?:\/[^ <>]*$/i.test(text);
+  var para = null;
+  if (isURI) {
+    var isImage = /\.(gif|jpg|jpeg|tiff|png|svg)$/i.test(text); // @@ Should use content-type not URI
+    if (isImage && options.expandImagesInline) {
+      var _img = elementForImageURI(text, options);
+      td2.appendChild(_img);
+    } else {
+      // Link but not Image
+      var anc = td2.appendChild(dom.createElement('a'));
+      para = anc.appendChild(dom.createElement('p'));
+      anc.href = text;
+      para.textContent = text;
+      td2.appendChild(anc);
+    }
+  } else {
+    // text
+    para = dom.createElement('p');
+    td2.appendChild(para);
+    para.textContent = text;
+  }
+  if (para) {
+    var bgcolor = colorizeByAuthor ? pad.lightColorHash(creator) : getBgColor(fresh);
+    para.setAttribute('style', messageBodyStyle + 'background-color: ' + bgcolor + ';');
+  }
+  function getBgColor(fresh) {
+    return fresh ? '#e8ffe8' : 'white';
+  }
+
+  // Sentiment strip
+  var strip = (0, _messageTools.sentimentStripLinked)(message, message.doc());
+  if (strip.children.length) {
+    td2.appendChild(dom.createElement('br'));
+    td2.appendChild(strip);
+  }
+
+  // Message tool bar button
+  var td3 = dom.createElement('td');
+  messageRow.appendChild(td3);
+  var toolsButton = widgets.button(dom, _iconBase.icons.iconBase + 'noun_243787.svg', '...');
+  td3.appendChild(toolsButton);
+  toolsButton.addEventListener('click', function (_event) {
+    if (messageRow.toolTR) {
+      // already got a toolbar? Toogle
+      messageRow.parentNode.removeChild(messageRow.toolTR);
+      delete messageRow.toolTR;
+      return;
+    }
+    var toolsTR = dom.createElement('tr');
+    var tools = (0, _messageTools.messageToolbar)(message, messageRow, userContext, channelObject);
+    tools.style = 'border: 0.05em solid #888; border-radius: 0 0 0.7em 0.7em;  border-top: 0; height:3.5em; background-color: #fff;'; // @@ fix
+    if (messageRow.nextSibling) {
+      messageRow.parentElement.insertBefore(toolsTR, messageRow.nextSibling);
+    } else {
+      messageRow.parentElement.appendChild(toolsTR);
+    }
+    messageRow.toolTR = toolsTR;
+    toolsTR.appendChild(dom.createElement('td')); // left
+    var toolsTD = toolsTR.appendChild(dom.createElement('td'));
+    toolsTR.appendChild(dom.createElement('td')); // right
+    toolsTD.appendChild(tools);
+  });
+  return messageRow;
 }
-function switchToEditor(_x6, _x7, _x8, _x9) {
-  return _switchToEditor.apply(this, arguments);
+function switchToEditor(messageRow, message, channelObject, userContext) {
+  var messageTable = messageRow.parentNode;
+  var editRow = renderMessageEditor(channelObject, messageTable, userContext, channelObject.options, (0, _chatLogic.mostRecentVersion)(message));
+  messageTable.insertBefore(editRow, messageRow);
+  editRow.originalRow = messageRow;
+  messageRow.style.visibility = 'hidden'; // Hide the original message. unhide if user cancels edit
 }
 /*       Control for a new message -- or editing an old message ***************
  *
  */
-function _switchToEditor() {
-  _switchToEditor = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10(messageRow, message, channelObject, userContext) {
-    var messageTable, editRow;
-    return _regenerator["default"].wrap(function _callee10$(_context11) {
-      while (1) switch (_context11.prev = _context11.next) {
-        case 0:
-          messageTable = messageRow.parentNode;
-          _context11.t0 = renderMessageEditor;
-          _context11.t1 = channelObject;
-          _context11.t2 = messageTable;
-          _context11.t3 = userContext;
-          _context11.t4 = channelObject.options;
-          _context11.next = 8;
-          return (0, _chatLogic.mostRecentVersion)(message);
-        case 8:
-          _context11.t5 = _context11.sent;
-          editRow = (0, _context11.t0)(_context11.t1, _context11.t2, _context11.t3, _context11.t4, _context11.t5);
-          messageTable.insertBefore(editRow, messageRow);
-          editRow.originalRow = messageRow;
-          messageRow.style.visibility = 'hidden'; // Hide the original message. unhide if user cancels edit
-        case 13:
-        case "end":
-          return _context11.stop();
-      }
-    }, _callee10);
-  }));
-  return _switchToEditor.apply(this, arguments);
-}
 function renderMessageEditor(channelObject, messageTable, userContext, options, originalMessage) {
   function revertEditing(messageEditor) {
     messageEditor.originalRow.style.visibility = 'visible'; // restore read-only version
     messageEditor.parentNode.removeChild(messageEditor);
   }
-  function handleFieldInput(_x10) {
+  function handleFieldInput(_x) {
     return _handleFieldInput.apply(this, arguments);
   }
   function _handleFieldInput() {
@@ -354,87 +268,72 @@ function renderMessageEditor(channelObject, messageTable, userContext, options,
     }));
     return _handleFieldInput.apply(this, arguments);
   }
-  function sendMessage(_x11, _x12) {
+  function sendMessage(_x2, _x3) {
     return _sendMessage.apply(this, arguments);
   } // sendMessage
   //    DRAG AND DROP
   function _sendMessage() {
-    _sendMessage = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(text, fromMainField) {
-      var sendComplete, _sendComplete, message, statusArea;
-      return _regenerator["default"].wrap(function _callee7$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+    _sendMessage = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(text, fromMainField) {
+      var sendComplete, message, statusArea;
+      return _regenerator["default"].wrap(function _callee6$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            _sendComplete = function _sendComplete3() {
-              _sendComplete = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(message, _text2) {
-                var oldRow;
-                return _regenerator["default"].wrap(function _callee6$(_context7) {
-                  while (1) switch (_context7.prev = _context7.next) {
-                    case 0:
-                      _context7.next = 2;
-                      return (0, _infinite.insertMessageIntoTable)(channelObject, messageTable, message, false, options, userContext);
-                    case 2:
-                      // not green
+            sendComplete = function _sendComplete(message, _text2) {
+              // const dateStamp = store.any(message, ns.dct('created'), null, message.doc())
+              // const content = $rdf.literal(text2)
+              (0, _infinite.insertMessageIntoTable)(channelObject, messageTable, message, false, options, userContext); // not green
 
-                      if (originalMessage) {
-                        // editing another message
-                        oldRow = messageEditor.originalRow; // oldRow.style.display = '' // restore read-only version, re-attack
-                        if (oldRow.parentNode) {
-                          oldRow.parentNode.removeChild(oldRow); // No longer needed old version
-                        } else {
-                          debug.warn('No parentNode on old message ' + oldRow.textContent);
-                          oldRow.style.backgroundColor = '#fee';
-                          oldRow.style.visibility = 'hidden'; // @@ FIX THIS AND REMOVE FROM DOM INSTEAD
-                        }
+              if (originalMessage) {
+                // editing another message
+                var oldRow = messageEditor.originalRow;
+                // oldRow.style.display = '' // restore read-only version, re-attack
+                if (oldRow.parentNode) {
+                  oldRow.parentNode.removeChild(oldRow); // No longer needed old version
+                } else {
+                  debug.warn('No parentNode on old message ' + oldRow.textContent);
+                  oldRow.style.backgroundColor = '#fee';
+                  oldRow.style.visibility = 'hidden'; // @@ FIX THIS AND REMOVE FROM DOM INSTEAD
+                }
 
-                        messageEditor.parentNode.removeChild(messageEditor); // no longer need editor
-                      } else {
-                        if (fromMainField) {
-                          field.value = ''; // clear from out for reuse
-                          field.setAttribute('style', messageBodyStyle);
-                          field.disabled = false;
-                          field.scrollIntoView(options.newestFirst); // allign bottom (top)
-                          field.focus(); // Start typing next line immediately
-                          field.select();
-                        }
-                      }
-                      // await channelObject.div.refresh() // Add new day if nec  @@ add back
-                    case 3:
-                    case "end":
-                      return _context7.stop();
-                  }
-                }, _callee6);
-              }));
-              return _sendComplete.apply(this, arguments);
-            };
-            sendComplete = function _sendComplete2(_x18, _x19) {
-              return _sendComplete.apply(this, arguments);
+                messageEditor.parentNode.removeChild(messageEditor); // no longer need editor
+              } else {
+                if (fromMainField) {
+                  field.value = ''; // clear from out for reuse
+                  field.setAttribute('style', messageBodyStyle);
+                  field.disabled = false;
+                  field.scrollIntoView(options.newestFirst); // allign bottom (top)
+                  field.focus(); // Start typing next line immediately
+                  field.select();
+                }
+              }
+              // await channelObject.div.refresh() // Add new day if nec  @@ add back
             };
+
             // const me = authn.currentUser() // Must be logged on or wuld have got login button
             if (fromMainField) {
               field.setAttribute('style', messageBodyStyle + 'color: #bbb;'); // pendingedit
               field.disabled = true;
             }
-            _context8.prev = 3;
-            _context8.next = 6;
-            return channelObject.updateMessage(text, originalMessage, null, options.thread);
-          case 6:
-            message = _context8.sent;
-            _context8.next = 14;
+            _context7.prev = 2;
+            _context7.next = 5;
+            return channelObject.updateMessage(text, originalMessage);
+          case 5:
+            message = _context7.sent;
+            _context7.next = 13;
             break;
-          case 9:
-            _context8.prev = 9;
-            _context8.t0 = _context8["catch"](3);
+          case 8:
+            _context7.prev = 8;
+            _context7.t0 = _context7["catch"](2);
             statusArea = userContext.statusArea || messageEditor;
-            statusArea.appendChild(widgets.errorMessageBlock(dom, 'Error writing message: ' + _context8.t0));
-            return _context8.abrupt("return");
+            statusArea.appendChild(widgets.errorMessageBlock(dom, 'Error writing message: ' + _context7.t0));
+            return _context7.abrupt("return");
+          case 13:
+            sendComplete(message, text);
           case 14:
-            _context8.next = 16;
-            return sendComplete(message, text);
-          case 16:
           case "end":
-            return _context8.stop();
+            return _context7.stop();
         }
-      }, _callee7, null, [[3, 9]]);
+      }, _callee6, null, [[2, 8]]);
     }));
     return _sendMessage.apply(this, arguments);
   }
@@ -453,7 +352,7 @@ function renderMessageEditor(channelObject, messageTable, userContext, options,
           }
         }, _callee);
       }));
-      return function (_x13, _x14) {
+      return function (_x4, _x5) {
         return _ref.apply(this, arguments);
       };
     }());
@@ -497,7 +396,7 @@ function renderMessageEditor(channelObject, messageTable, userContext, options,
         }
       }, _callee2, null, [[1, 11, 14, 17]]);
     }));
-    return function droppedURIHandler(_x15) {
+    return function droppedURIHandler(_x6) {
       return _ref2.apply(this, arguments);
     };
   }();
@@ -508,7 +407,7 @@ function renderMessageEditor(channelObject, messageTable, userContext, options,
       imageDoc = $rdf.sym(chatDocument.dir().uri + 'Image_' + Date.now() + '.png');
       return imageDoc;
     }
-    function tookPicture(_x16) {
+    function tookPicture(_x7) {
       return _tookPicture.apply(this, arguments);
     } // Body of turnOnInput
     function _tookPicture() {
@@ -585,7 +484,7 @@ function renderMessageEditor(channelObject, messageTable, userContext, options,
           }
         }, _callee3);
       }));
-      return function (_x17) {
+      return function (_x8) {
         return _ref3.apply(this, arguments);
       };
     }(), false);
@@ -647,7 +546,7 @@ function renderMessageEditor(channelObject, messageTable, userContext, options,
     turnOnInput();
     Object.assign(context, userContext);
     (0, _bookmarks.findBookmarkDocument)(context).then(function (_context) {
-      // debug.log('Bookmark file: ' + context.bookmarkDocument)
+      // console.log('Bookmark file: ' + context.bookmarkDocument)
     });
   });
   return messageEditor;