In reply to ${mxid}` + + ``; + const lines = body.trim().split('\n'); + if (lines.length > 0) { + lines[0] = `<${mxid}> ${lines[0]}`; + body = lines.map((line) => `> ${line}`).join('\n') + '\n\n'; + } + break; + } + case 'm.image': + html = `
${html || body}
In reply to ${mxid}` + + ``; + body = `> <${mxid}> sent an image.\n\n`; + break; + case 'm.video': + html = `
sent an image.
In reply to ${mxid}` + + ``; + body = `> <${mxid}> sent a video.\n\n`; + break; + case 'm.audio': + html = `
sent a video.
In reply to ${mxid}` + + ``; + body = `> <${mxid}> sent an audio file.\n\n`; + break; + case 'm.file': + html = `
sent an audio file.
In reply to ${mxid}` + + ``; + body = `> <${mxid}> sent a file.\n\n`; + break; + case 'm.emote': { + html = `
sent a file.
In reply to * ` + + `${mxid}`; + const lines = body.trim().split('\n'); + if (lines.length > 0) { + lines[0] = `* <${mxid}> ${lines[0]}`; + body = lines.map((line) => `> ${line}`).join('\n') + '\n\n'; + } + break; + } + default: + return null; + } + + return {body, html}; + } + + static makeReplyMixIn(ev) { + if (!ev) return {}; + return { + 'm.relates_to': { + 'm.in_reply_to': { + 'event_id': ev.getId(), + }, + }, + }; + } + + static makeThread(parentEv, onWidgetLoad, ref) { + if (!SettingsStore.isFeatureEnabled("feature_rich_quoting") || !ReplyThread.getParentEventId(parentEv)) { + return ; + } + return
${html || body}
+ { + _t('Unable to load event that was replied to, ' + + 'it either does not exist or you do not have permission to view it.') + } +; + } else if (this.state.loadedEv) { + const ev = this.state.loadedEv; + const Pill = sdk.getComponent('elements.Pill'); + const room = this.context.matrixClient.getRoom(ev.getRoomId()); + header =
+ { + _t('In reply to; + } else if (this.state.loading) { + const Spinner = sdk.getComponent("elements.Spinner"); + header =', {}, { + 'a': (sub) => { sub }, + 'pill': , + }) + } +
+ { dateSep } +; + }); + + return+
+
;
+ }
+}
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index abb4da227c9..a4a4b4ebe8b 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -35,6 +35,7 @@ import MatrixClientPeg from '../../../MatrixClientPeg';
import ContextualMenu from '../../structures/ContextualMenu';
import SettingsStore from "../../../settings/SettingsStore";
import PushProcessor from 'matrix-js-sdk/lib/pushprocessor';
+import ReplyThread from "../elements/ReplyThread";
linkifyMatrix(linkify);
@@ -61,10 +62,6 @@ module.exports = React.createClass({
tileShape: PropTypes.string,
},
- contextTypes: {
- addRichQuote: PropTypes.func,
- },
-
getInitialState: function() {
return {
// the URLs (if any) to be previewed with a LinkPreviewWidget
@@ -186,7 +183,6 @@ module.exports = React.createClass({
// If the link is a (localised) matrix.to link, replace it with a pill
const Pill = sdk.getComponent('elements.Pill');
- const Quote = sdk.getComponent('elements.Quote');
if (Pill.isMessagePillUrl(href)) {
const pillContainer = document.createElement('span');
@@ -205,21 +201,6 @@ module.exports = React.createClass({
// update the current node with one that's now taken its place
node = pillContainer;
- } else if (SettingsStore.isFeatureEnabled("feature_rich_quoting") && Quote.isMessageUrl(href)) {
- if (this.context.addRichQuote) { // We're already a Rich Quote so just append the next one above
- this.context.addRichQuote(href);
- node.remove();
- } else { // We're the first in the chain
- const quoteContainer = document.createElement('span');
-
- const quote =
- { header }
+ { evTiles }
+ ; - - ReactDOM.render(quote, quoteContainer); - node.parentNode.replaceChild(quoteContainer, node); - node = quoteContainer; - } - pillified = true; } } else if (node.nodeType == Node.TEXT_NODE) { const Pill = sdk.getComponent('elements.Pill'); @@ -441,8 +422,12 @@ module.exports = React.createClass({ const mxEvent = this.props.mxEvent; const content = mxEvent.getContent(); + const stripReply = SettingsStore.isFeatureEnabled("feature_rich_quoting") && + ReplyThread.getParentEventId(mxEvent); let body = HtmlUtils.bodyToHtml(content, this.props.highlights, { disableBigEmoji: SettingsStore.getValue('TextualBody.disableBigEmoji'), + // Part of Replies fallback support + stripReplyFallback: stripReply, }); if (this.props.highlightLink) { diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js index 84acfb160e2..c7150da67c4 100644 --- a/src/components/views/rooms/EventTile.js +++ b/src/components/views/rooms/EventTile.js @@ -18,6 +18,8 @@ limitations under the License. 'use strict'; +import ReplyThread from "../elements/ReplyThread"; + const React = require('react'); import PropTypes from 'prop-types'; const classNames = require("classnames"); @@ -153,6 +155,11 @@ module.exports = withMatrixClient(React.createClass({ isTwelveHour: PropTypes.bool, }, + defaultProps: { + // no-op function because onWidgetLoad is optional yet some subcomponents assume its existence + onWidgetLoad: function() {}, + }, + getInitialState: function() { return { // Whether the context menu is being displayed. @@ -301,12 +308,16 @@ module.exports = withMatrixClient(React.createClass({ const x = buttonRect.right + window.pageXOffset; const y = (buttonRect.top + (buttonRect.height / 2) + window.pageYOffset) - 19; const self = this; + + const {tile, replyThread} = this.refs; + ContextualMenu.createMenu(MessageContextMenu, { chevronOffset: 10, mxEvent: this.props.mxEvent, left: x, top: y, - eventTileOps: this.refs.tile && this.refs.tile.getEventTileOps ? this.refs.tile.getEventTileOps() : undefined, + eventTileOps: tile && tile.getEventTileOps ? tile.getEventTileOps() : undefined, + collapseReplyThread: replyThread && replyThread.canCollapse() ? replyThread.collapse : undefined, onFinished: function() { self.setState({menu: false}); }, @@ -543,7 +554,7 @@ module.exports = withMatrixClient(React.createClass({ if (needsSenderProfile) { let text = null; - if (!this.props.tileShape || this.props.tileShape === 'quote') { + if (!this.props.tileShape) { if (msgtype === 'm.image') text = _td('%(senderName)s sent an image'); else if (msgtype === 'm.video') text = _td('%(senderName)s sent a video'); else if (msgtype === 'm.file') text = _td('%(senderName)s uploaded a file'); @@ -647,18 +658,23 @@ module.exports = withMatrixClient(React.createClass({ ); } - case 'quote': { + + case 'reply': + case 'reply_preview': { return (
{ avatar }
{ sender }
-
+
${contentHTML}`; + if (replyingToEv) { + const replyContent = ReplyThread.makeReplyMixIn(replyingToEv); + content = Object.assign(replyContent, content); - // we have finished quoting, clear the quotingEvent + // Part of Replies fallback support - prepend the text we're sending with the text we're replying to + const nestedReply = ReplyThread.getNestedReplyText(replyingToEv); + if (nestedReply) { + if (content.formatted_body) { + content.formatted_body = nestedReply.html + content.formatted_body; + } + content.body = nestedReply.body + content.body; + } + + // Clear reply_to_event as we put the message into the queue + // if the send fails, retry will handle resending. dis.dispatch({ - action: 'quote_event', + action: 'reply_to_event', event: null, }); } - let sendMessagePromise; - if (contentHTML) { - sendMessagePromise = sendHtmlFn.call( - this.client, this.props.room.roomId, contentText, contentHTML, - ); - } else { - sendMessagePromise = sendTextFn.call(this.client, this.props.room.roomId, contentText); - } - sendMessagePromise.done((res) => { + this.client.sendMessage(this.props.room.roomId, content).then((res) => { dis.dispatch({ action: 'message_sent', }); - }, (e) => onSendMessageFailed(e, this.props.room)); + }).catch((e) => { + onSendMessageFailed(e, this.props.room); + }); this.setState({ editorState: this.createEditorState(), @@ -1173,7 +1182,7 @@ export default class MessageComposerInput extends React.Component { return (
{ timestamp }
{ this._renderE2EPadlock() }
+ {
+ this.props.tileShape === 'reply_preview'
+ && ReplyThread.makeThread(this.props.mxEvent, this.props.onWidgetLoad, 'replyThread')
+ }
{ this._renderE2EPadlock() }
+ { ReplyThread.makeThread(this.props.mxEvent, this.props.onWidgetLoad, 'replyThread') }
);
}
+ const isQuoting = Boolean(RoomViewStore.getQuotingEvent());
+ let replyToWarning = null;
+ if (isQuoting) {
+ replyToWarning =
),
onFinished: (shouldUpload) => {
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index c142d97b28a..97e8780f0fd 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -51,9 +51,11 @@ const REGEX_MATRIXTO_MARKDOWN_GLOBAL = new RegExp(MATRIXTO_MD_LINK_PATTERN, 'g')
import {asciiRegexp, shortnameToUnicode, emojioneList, asciiList, mapUnicodeToShort} from 'emojione';
import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
-import {makeEventPermalink, makeUserPermalink} from "../../../matrix-to";
-import QuotePreview from "./QuotePreview";
+import {makeUserPermalink} from "../../../matrix-to";
+import ReplyPreview from "./ReplyPreview";
import RoomViewStore from '../../../stores/RoomViewStore';
+import ReplyThread from "../elements/ReplyThread";
+import {ContentHelpers} from 'matrix-js-sdk';
const EMOJI_SHORTNAMES = Object.keys(emojioneList);
const EMOJI_UNICODE_TO_SHORTNAME = mapUnicodeToShort();
@@ -273,7 +275,7 @@ export default class MessageComposerInput extends React.Component {
let contentState = this.state.editorState.getCurrentContent();
switch (payload.action) {
- case 'quote_event':
+ case 'reply_to_event':
case 'focus_composer':
editor.focus();
break;
@@ -751,16 +753,14 @@ export default class MessageComposerInput extends React.Component {
return true;
}
- const quotingEv = RoomViewStore.getQuotingEvent();
+ const replyingToEv = RoomViewStore.getQuotingEvent();
+ const mustSendHTML = Boolean(replyingToEv);
if (this.state.isRichtextEnabled) {
// We should only send HTML if any block is styled or contains inline style
let shouldSendHTML = false;
- // If we are quoting we need HTML Content
- if (quotingEv) {
- shouldSendHTML = true;
- }
+ if (mustSendHTML) shouldSendHTML = true;
const blocks = contentState.getBlocksAsArray();
if (blocks.some((block) => block.getType() !== 'unstyled')) {
@@ -820,15 +820,15 @@ export default class MessageComposerInput extends React.Component {
const md = new Markdown(pt);
// if contains no HTML and we're not quoting (needing HTML)
- if (md.isPlainText() && !quotingEv) {
+ if (md.isPlainText() && !mustSendHTML) {
contentText = md.toPlaintext();
} else {
contentHTML = md.toHTML();
}
}
- let sendHtmlFn = this.client.sendHtmlMessage;
- let sendTextFn = this.client.sendTextMessage;
+ let sendHtmlFn = ContentHelpers.makeHtmlMessage;
+ let sendTextFn = ContentHelpers.makeTextMessage;
this.historyManager.save(
contentState,
@@ -836,45 +836,54 @@ export default class MessageComposerInput extends React.Component {
);
if (contentText.startsWith('/me')) {
+ if (replyingToEv) {
+ const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+ Modal.createTrackedDialog('Emote Reply Fail', '', ErrorDialog, {
+ title: _t("Unable to reply"),
+ description: _t("At this time it is not possible to reply with an emote."),
+ });
+ return false;
+ }
+
contentText = contentText.substring(4);
// bit of a hack, but the alternative would be quite complicated
if (contentHTML) contentHTML = contentHTML.replace(/\/me ?/, '');
- sendHtmlFn = this.client.sendHtmlEmote;
- sendTextFn = this.client.sendEmoteMessage;
+ sendHtmlFn = ContentHelpers.makeHtmlEmote;
+ sendTextFn = ContentHelpers.makeEmoteMessage;
}
- if (quotingEv) {
- const cli = MatrixClientPeg.get();
- const room = cli.getRoom(quotingEv.getRoomId());
- const sender = room.currentState.getMember(quotingEv.getSender());
- const {body/*, formatted_body*/} = quotingEv.getContent();
+ let content = contentHTML ? sendHtmlFn(contentText, contentHTML) : sendTextFn(contentText);
- const perma = makeEventPermalink(quotingEv.getRoomId(), quotingEv.getId());
- contentText = `${sender.name}:\n> ${body}\n\n${contentText}`;
- contentHTML = `Quote{ + _t('At this time it is not possible to reply with a file so this will be sent without being a reply.') + }
; + } + Modal.createTrackedDialog('Upload Files confirmation', '', QuestionDialog, { title: _t('Upload Files'), description: ( @@ -119,6 +127,7 @@ export default class MessageComposer extends React.Component {-
{ fileList }
${contentHTML}`; + if (replyingToEv) { + const replyContent = ReplyThread.makeReplyMixIn(replyingToEv); + content = Object.assign(replyContent, content); - // we have finished quoting, clear the quotingEvent + // Part of Replies fallback support - prepend the text we're sending with the text we're replying to + const nestedReply = ReplyThread.getNestedReplyText(replyingToEv); + if (nestedReply) { + if (content.formatted_body) { + content.formatted_body = nestedReply.html + content.formatted_body; + } + content.body = nestedReply.body + content.body; + } + + // Clear reply_to_event as we put the message into the queue + // if the send fails, retry will handle resending. dis.dispatch({ - action: 'quote_event', + action: 'reply_to_event', event: null, }); } - let sendMessagePromise; - if (contentHTML) { - sendMessagePromise = sendHtmlFn.call( - this.client, this.props.room.roomId, contentText, contentHTML, - ); - } else { - sendMessagePromise = sendTextFn.call(this.client, this.props.room.roomId, contentText); - } - sendMessagePromise.done((res) => { + this.client.sendMessage(this.props.room.roomId, content).then((res) => { dis.dispatch({ action: 'message_sent', }); - }, (e) => onSendMessageFailed(e, this.props.room)); + }).catch((e) => { + onSendMessageFailed(e, this.props.room); + }); this.setState({ editorState: this.createEditorState(), @@ -1173,7 +1182,7 @@ export default class MessageComposerInput extends React.Component { return (
- { SettingsStore.isFeatureEnabled("feature_rich_quoting") && this.autocomplete = e}
room={this.props.room}
diff --git a/src/components/views/rooms/QuotePreview.js b/src/components/views/rooms/ReplyPreview.js
similarity index 73%
rename from src/components/views/rooms/QuotePreview.js
rename to src/components/views/rooms/ReplyPreview.js
index 614d51dada9..46e28266348 100644
--- a/src/components/views/rooms/QuotePreview.js
+++ b/src/components/views/rooms/ReplyPreview.js
@@ -19,15 +19,16 @@ import dis from '../../../dispatcher';
import sdk from '../../../index';
import { _t } from '../../../languageHandler';
import RoomViewStore from '../../../stores/RoomViewStore';
+import SettingsStore from "../../../settings/SettingsStore";
function cancelQuoting() {
dis.dispatch({
- action: 'quote_event',
+ action: 'reply_to_event',
event: null,
});
}
-export default class QuotePreview extends React.Component {
+export default class ReplyPreview extends React.Component {
constructor(props, context) {
super(props, context);
@@ -61,17 +62,20 @@ export default class QuotePreview extends React.Component {
const EventTile = sdk.getComponent('rooms.EventTile');
const EmojiText = sdk.getComponent('views.elements.EmojiText');
- return
-
-
+ return
+ ": "In reply to ",
"Room directory": "Room directory",
"Start chat": "Start chat",
@@ -862,6 +866,7 @@
"Permalink": "Permalink",
"Quote": "Quote",
"Source URL": "Source URL",
+ "Collapse Reply Thread": "Collapse Reply Thread",
"Failed to set Direct Message status of room": "Failed to set Direct Message status of room",
"All messages (noisy)": "All messages (noisy)",
"All messages": "All messages",
diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index 4c010f4e8e8..1e7e50eae08 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -111,10 +111,11 @@ class RoomViewStore extends Store {
forwardingEvent: payload.event,
});
break;
- case 'quote_event':
+ case 'reply_to_event':
this._setState({
- quotingEvent: payload.event,
+ replyingToEvent: payload.event,
});
+ break;
}
}
@@ -132,8 +133,8 @@ class RoomViewStore extends Store {
shouldPeek: payload.should_peek === undefined ? true : payload.should_peek,
// have we sent a join request for this room and are waiting for a response?
joining: payload.joining || false,
- // Reset quotingEvent because we don't want cross-room because bad UX
- quotingEvent: null,
+ // Reset replyingToEvent because we don't want cross-room because bad UX
+ replyingToEvent: null,
};
if (this._state.forwardingEvent) {
@@ -297,7 +298,7 @@ class RoomViewStore extends Store {
// The mxEvent if one is currently being replied to/quoted
getQuotingEvent() {
- return this._state.quotingEvent;
+ return this._state.replyingToEvent;
}
shouldPeek() {
diff --git a/test/components/views/rooms/MessageComposerInput-test.js b/test/components/views/rooms/MessageComposerInput-test.js
index 1f0ede6ae23..eadd9237266 100644
--- a/test/components/views/rooms/MessageComposerInput-test.js
+++ b/test/components/views/rooms/MessageComposerInput-test.js
@@ -75,39 +75,37 @@ describe('MessageComposerInput', () => {
});
it('should not send messages when composer is empty', () => {
- const textSpy = sinon.spy(client, 'sendTextMessage');
- const htmlSpy = sinon.spy(client, 'sendHtmlMessage');
+ const spy = sinon.spy(client, 'sendMessage');
mci.enableRichtext(true);
mci.handleReturn(sinon.stub());
- expect(textSpy.calledOnce).toEqual(false, 'should not send text message');
- expect(htmlSpy.calledOnce).toEqual(false, 'should not send html message');
+ expect(spy.calledOnce).toEqual(false, 'should not send message');
});
it('should not change content unnecessarily on RTE -> Markdown conversion', () => {
- const spy = sinon.spy(client, 'sendTextMessage');
+ const spy = sinon.spy(client, 'sendMessage');
mci.enableRichtext(true);
addTextToDraft('a');
mci.handleKeyCommand('toggle-mode');
mci.handleReturn(sinon.stub());
expect(spy.calledOnce).toEqual(true);
- expect(spy.args[0][1]).toEqual('a');
+ expect(spy.args[0][1].body).toEqual('a');
});
it('should not change content unnecessarily on Markdown -> RTE conversion', () => {
- const spy = sinon.spy(client, 'sendTextMessage');
+ const spy = sinon.spy(client, 'sendMessage');
mci.enableRichtext(false);
addTextToDraft('a');
mci.handleKeyCommand('toggle-mode');
mci.handleReturn(sinon.stub());
expect(spy.calledOnce).toEqual(true);
- expect(spy.args[0][1]).toEqual('a');
+ expect(spy.args[0][1].body).toEqual('a');
});
it('should send emoji messages when rich text is enabled', () => {
- const spy = sinon.spy(client, 'sendTextMessage');
+ const spy = sinon.spy(client, 'sendMessage');
mci.enableRichtext(true);
addTextToDraft('☹');
mci.handleReturn(sinon.stub());
@@ -116,7 +114,7 @@ describe('MessageComposerInput', () => {
});
it('should send emoji messages when Markdown is enabled', () => {
- const spy = sinon.spy(client, 'sendTextMessage');
+ const spy = sinon.spy(client, 'sendMessage');
mci.enableRichtext(false);
addTextToDraft('☹');
mci.handleReturn(sinon.stub());
@@ -149,98 +147,98 @@ describe('MessageComposerInput', () => {
// });
it('should insert formatting characters in Markdown mode', () => {
- const spy = sinon.spy(client, 'sendTextMessage');
+ const spy = sinon.spy(client, 'sendMessage');
mci.enableRichtext(false);
mci.handleKeyCommand('italic');
mci.handleReturn(sinon.stub());
- expect(['__', '**']).toContain(spy.args[0][1]);
+ expect(['__', '**']).toContain(spy.args[0][1].body);
});
it('should not entity-encode " in Markdown mode', () => {
- const spy = sinon.spy(client, 'sendTextMessage');
+ const spy = sinon.spy(client, 'sendMessage');
mci.enableRichtext(false);
addTextToDraft('"');
mci.handleReturn(sinon.stub());
expect(spy.calledOnce).toEqual(true);
- expect(spy.args[0][1]).toEqual('"');
+ expect(spy.args[0][1].body).toEqual('"');
});
it('should escape characters without other markup in Markdown mode', () => {
- const spy = sinon.spy(client, 'sendTextMessage');
+ const spy = sinon.spy(client, 'sendMessage');
mci.enableRichtext(false);
addTextToDraft('\\*escaped\\*');
mci.handleReturn(sinon.stub());
expect(spy.calledOnce).toEqual(true);
- expect(spy.args[0][1]).toEqual('*escaped*');
+ expect(spy.args[0][1].body).toEqual('*escaped*');
});
it('should escape characters with other markup in Markdown mode', () => {
- const spy = sinon.spy(client, 'sendHtmlMessage');
+ const spy = sinon.spy(client, 'sendMessage');
mci.enableRichtext(false);
addTextToDraft('\\*escaped\\* *italic*');
mci.handleReturn(sinon.stub());
expect(spy.calledOnce).toEqual(true);
- expect(spy.args[0][1]).toEqual('\\*escaped\\* *italic*');
- expect(spy.args[0][2]).toEqual('*escaped* italic');
+ expect(spy.args[0][1].body).toEqual('\\*escaped\\* *italic*');
+ expect(spy.args[0][1].formatted_body).toEqual('*escaped* italic');
});
it('should not convert -_- into a horizontal rule in Markdown mode', () => {
- const spy = sinon.spy(client, 'sendTextMessage');
+ const spy = sinon.spy(client, 'sendMessage');
mci.enableRichtext(false);
addTextToDraft('-_-');
mci.handleReturn(sinon.stub());
expect(spy.calledOnce).toEqual(true);
- expect(spy.args[0][1]).toEqual('-_-');
+ expect(spy.args[0][1].body).toEqual('-_-');
});
it('should not strip tags in Markdown mode', () => {
- const spy = sinon.spy(client, 'sendHtmlMessage');
+ const spy = sinon.spy(client, 'sendMessage');
mci.enableRichtext(false);
addTextToDraft('striked-out');
mci.handleReturn(sinon.stub());
expect(spy.calledOnce).toEqual(true);
- expect(spy.args[0][1]).toEqual('striked-out');
- expect(spy.args[0][2]).toEqual('striked-out');
+ expect(spy.args[0][1].body).toEqual('striked-out');
+ expect(spy.args[0][1].formatted_body).toEqual('striked-out');
});
it('should not strike-through ~~~ in Markdown mode', () => {
- const spy = sinon.spy(client, 'sendTextMessage');
+ const spy = sinon.spy(client, 'sendMessage');
mci.enableRichtext(false);
addTextToDraft('~~~striked-out~~~');
mci.handleReturn(sinon.stub());
expect(spy.calledOnce).toEqual(true);
- expect(spy.args[0][1]).toEqual('~~~striked-out~~~');
+ expect(spy.args[0][1].body).toEqual('~~~striked-out~~~');
});
it('should not mark single unmarkedup paragraphs as HTML in Markdown mode', () => {
- const spy = sinon.spy(client, 'sendTextMessage');
+ const spy = sinon.spy(client, 'sendMessage');
mci.enableRichtext(false);
addTextToDraft('Lorem ipsum dolor sit amet, consectetur adipiscing elit.');
mci.handleReturn(sinon.stub());
expect(spy.calledOnce).toEqual(true);
- expect(spy.args[0][1]).toEqual('Lorem ipsum dolor sit amet, consectetur adipiscing elit.');
+ expect(spy.args[0][1].body).toEqual('Lorem ipsum dolor sit amet, consectetur adipiscing elit.');
});
it('should not mark two unmarkedup paragraphs as HTML in Markdown mode', () => {
- const spy = sinon.spy(client, 'sendTextMessage');
+ const spy = sinon.spy(client, 'sendMessage');
mci.enableRichtext(false);
addTextToDraft('Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n\nFusce congue sapien sed neque molestie volutpat.');
mci.handleReturn(sinon.stub());
expect(spy.calledOnce).toEqual(true);
- expect(spy.args[0][1]).toEqual('Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n\nFusce congue sapien sed neque molestie volutpat.');
+ expect(spy.args[0][1].body).toEqual('Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n\nFusce congue sapien sed neque molestie volutpat.');
});
it('should strip tab-completed mentions so that only the display name is sent in the plain body in Markdown mode', () => {
// Sending a HTML message because we have entities in the composer (because of completions)
- const spy = sinon.spy(client, 'sendHtmlMessage');
+ const spy = sinon.spy(client, 'sendMessage');
mci.enableRichtext(false);
mci.setDisplayedCompletion({
completion: 'Some Member',
@@ -250,11 +248,11 @@ describe('MessageComposerInput', () => {
mci.handleReturn(sinon.stub());
- expect(spy.args[0][1]).toEqual(
+ expect(spy.args[0][1].body).toEqual(
'Some Member',
'the plaintext body should only include the display name',
);
- expect(spy.args[0][2]).toEqual(
+ expect(spy.args[0][1].formatted_body).toEqual(
'Some Member',
'the html body should contain an anchor tag with a matrix.to href and display name text',
);
@@ -262,7 +260,7 @@ describe('MessageComposerInput', () => {
it('should strip tab-completed mentions so that only the display name is sent in the plain body in RTE mode', () => {
// Sending a HTML message because we have entities in the composer (because of completions)
- const spy = sinon.spy(client, 'sendHtmlMessage');
+ const spy = sinon.spy(client, 'sendMessage');
mci.enableRichtext(true);
mci.setDisplayedCompletion({
completion: 'Some Member',
@@ -272,33 +270,33 @@ describe('MessageComposerInput', () => {
mci.handleReturn(sinon.stub());
- expect(spy.args[0][1]).toEqual('Some Member');
- expect(spy.args[0][2]).toEqual('Some Member');
+ expect(spy.args[0][1].body).toEqual('Some Member');
+ expect(spy.args[0][1].formatted_body).toEqual('Some Member');
});
it('should not strip non-tab-completed mentions when manually typing MD', () => {
// Sending a HTML message because we have entities in the composer (because of completions)
- const spy = sinon.spy(client, 'sendHtmlMessage');
+ const spy = sinon.spy(client, 'sendMessage');
// Markdown mode enabled
mci.enableRichtext(false);
addTextToDraft('[My Not-Tab-Completed Mention](https://matrix.to/#/@some_member:domain.bla)');
mci.handleReturn(sinon.stub());
- expect(spy.args[0][1]).toEqual('[My Not-Tab-Completed Mention](https://matrix.to/#/@some_member:domain.bla)');
- expect(spy.args[0][2]).toEqual('My Not-Tab-Completed Mention');
+ expect(spy.args[0][1].body).toEqual('[My Not-Tab-Completed Mention](https://matrix.to/#/@some_member:domain.bla)');
+ expect(spy.args[0][1].formatted_body).toEqual('My Not-Tab-Completed Mention');
});
it('should not strip arbitrary typed (i.e. not tab-completed) MD links', () => {
// Sending a HTML message because we have entities in the composer (because of completions)
- const spy = sinon.spy(client, 'sendHtmlMessage');
+ const spy = sinon.spy(client, 'sendMessage');
// Markdown mode enabled
mci.enableRichtext(false);
addTextToDraft('[Click here](https://some.lovely.url)');
mci.handleReturn(sinon.stub());
- expect(spy.args[0][1]).toEqual('[Click here](https://some.lovely.url)');
- expect(spy.args[0][2]).toEqual('Click here');
+ expect(spy.args[0][1].body).toEqual('[Click here](https://some.lovely.url)');
+ expect(spy.args[0][1].formatted_body).toEqual('Click here');
});
});
diff --git a/test/test-utils.js b/test/test-utils.js
index d2c685b3719..2f482d2d4f8 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -95,8 +95,7 @@ export function createTestClient() {
mxcUrlToHttp: (mxc) => 'http://this.is.a.url/',
setAccountData: sinon.stub(),
sendTyping: sinon.stub().returns(Promise.resolve({})),
- sendTextMessage: () => Promise.resolve({}),
- sendHtmlMessage: () => Promise.resolve({}),
+ sendMessage: () => Promise.resolve({}),
getSyncState: () => "SYNCING",
generateClientSecret: () => "t35tcl1Ent5ECr3T",
isGuest: () => false,
+
{ '💬 ' + _t('Replying') }
-
;
}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5b02fd1866c..4adca0cc72c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -359,6 +359,7 @@
"Filter room members": "Filter room members",
"%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
"Attachment": "Attachment",
+ "At this time it is not possible to reply with a file so this will be sent without being a reply.": "At this time it is not possible to reply with a file so this will be sent without being a reply.",
"Upload Files": "Upload Files",
"Are you sure you want to upload the following files?": "Are you sure you want to upload the following files?",
"Encrypted room": "Encrypted room",
@@ -379,6 +380,8 @@
"Server error": "Server error",
"Server unavailable, overloaded, or something else went wrong.": "Server unavailable, overloaded, or something else went wrong.",
"Command error": "Command error",
+ "Unable to reply": "Unable to reply",
+ "At this time it is not possible to reply with an emote.": "At this time it is not possible to reply with an emote.",
"bold": "bold",
"italic": "italic",
"strike": "strike",
@@ -406,9 +409,9 @@
"Idle": "Idle",
"Offline": "Offline",
"Unknown": "Unknown",
- "Replying": "Replying",
"Seen by %(userName)s at %(dateTime)s": "Seen by %(userName)s at %(dateTime)s",
"Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Seen by %(displayName)s (%(userName)s) at %(dateTime)s",
+ "Replying": "Replying",
"No rooms to show": "No rooms to show",
"Unnamed room": "Unnamed room",
"World readable": "World readable",
@@ -729,6 +732,7 @@
"expand": "expand",
"Custom of %(powerLevel)s": "Custom of %(powerLevel)s",
"Custom level": "Custom level",
+ "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.",
"In reply to
+
-
-