From fbb950e06433fd3aa4166b398ab3a2940538ebc2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 10 Feb 2018 12:38:25 +0000
Subject: [PATCH] mass s/Quote/Reply

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/elements/{Quote.js => Reply.js}      | 18 +++++++++---------
 src/components/views/messages/TextualBody.js   |  1 -
 src/components/views/rooms/EventTile.js        |  8 ++++----
 .../views/rooms/MessageComposerInput.js        |  8 ++++----
 .../rooms/{QuotePreview.js => ReplyPreview.js} | 14 +++++++-------
 5 files changed, 24 insertions(+), 25 deletions(-)
 rename src/components/views/elements/{Quote.js => Reply.js} (91%)
 rename src/components/views/rooms/{QuotePreview.js => ReplyPreview.js} (83%)

diff --git a/src/components/views/elements/Quote.js b/src/components/views/elements/Reply.js
similarity index 91%
rename from src/components/views/elements/Quote.js
rename to src/components/views/elements/Reply.js
index 33819d522a..6d456cf6b4 100644
--- a/src/components/views/elements/Quote.js
+++ b/src/components/views/elements/Reply.js
@@ -23,7 +23,7 @@ import {MatrixEvent} from 'matrix-js-sdk';
 import {makeUserPermalink} from "../../../matrix-to";
 import SettingsStore from "../../../settings/SettingsStore";
 
-export default class Quote extends React.Component {
+export default class Reply extends React.Component {
     static propTypes = {
         // The parent event
         parentEv: PropTypes.instanceOf(MatrixEvent),
@@ -68,7 +68,7 @@ export default class Quote extends React.Component {
 
     async initialize() {
         const {parentEv} = this.props;
-        const inReplyTo = Quote.getInReplyTo(parentEv);
+        const inReplyTo = Reply.getInReplyTo(parentEv);
 
         const ev = await this.getEvent(this.room, inReplyTo['event_id']);
         this.setState({
@@ -79,7 +79,7 @@ export default class Quote extends React.Component {
     async loadNextEvent() {
         this.props.onWidgetLoad();
         const ev = this.state.events[0];
-        const inReplyTo = Quote.getInReplyTo(ev);
+        const inReplyTo = Reply.getInReplyTo(ev);
 
         if (!inReplyTo) {
             this.setState({
@@ -139,8 +139,8 @@ export default class Quote extends React.Component {
     }
 
     static getQuote(parentEv, onWidgetLoad) {
-        if (!SettingsStore.isFeatureEnabled("feature_rich_quoting") || !Quote.getInReplyTo(parentEv)) return null;
-        return <Quote parentEv={parentEv} onWidgetLoad={onWidgetLoad} />;
+        if (!SettingsStore.isFeatureEnabled("feature_rich_quoting") || !Reply.getInReplyTo(parentEv)) return null;
+        return <Reply parentEv={parentEv} onWidgetLoad={onWidgetLoad} />;
     }
 
     render() {
@@ -149,10 +149,10 @@ export default class Quote extends React.Component {
             const ev = this.state.loadedEv;
             const Pill = sdk.getComponent('elements.Pill');
             const room = MatrixClientPeg.get().getRoom(ev.getRoomId());
-            header = <blockquote className="mx_Quote">
+            header = <blockquote className="mx_Reply">
                 {
                     _t('<a>In reply to</a> <pill>', {}, {
-                        'a': (sub) => <a onClick={this.onQuoteClick} className="mx_Quote_show">{ sub }</a>,
+                        'a': (sub) => <a onClick={this.onQuoteClick} className="mx_Reply_show">{ sub }</a>,
                         'pill': <Pill type={Pill.TYPE_USER_MENTION} room={room}
                                       url={makeUserPermalink(ev.getSender())} shouldShowPillAvatar={true} />,
                     })
@@ -171,9 +171,9 @@ export default class Quote extends React.Component {
                 dateSep = <a href={this.props.url}><DateSeparator ts={ev.getTs()} /></a>;
             }
 
-            return <blockquote className="mx_Quote" key={ev.getId()}>
+            return <blockquote className="mx_Reply" key={ev.getId()}>
                 { dateSep }
-                <EventTile mxEvent={ev} tileShape="quote" />
+                <EventTile mxEvent={ev} tileShape="reply" />
             </blockquote>;
         });
 
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 7da4dd8644..c91178d9b5 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -182,7 +182,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');
 
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 7e9a7a75f1..3b72525fbd 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -18,7 +18,7 @@ limitations under the License.
 'use strict';
 
 
-import Quote from "../elements/Quote";
+import Reply from "../elements/Reply";
 
 const React = require('react');
 import PropTypes from 'prop-types';
@@ -589,12 +589,12 @@ module.exports = withMatrixClient(React.createClass({
                     </div>
                 );
             }
-            case 'quote': {
+            case 'reply': {
                 return (
                     <div className={classes}>
                         { avatar }
                         { sender }
-                        <div className="mx_EventTile_line mx_EventTile_quote">
+                        <div className="mx_EventTile_line mx_EventTile_reply">
                             <a href={permalink} onClick={this.onPermalinkClicked}>
                                 { timestamp }
                             </a>
@@ -622,7 +622,7 @@ module.exports = withMatrixClient(React.createClass({
                                 { timestamp }
                             </a>
                             { this._renderE2EPadlock() }
-                            { Quote.getQuote(this.props.mxEvent, this.props.onWidgetLoad) }
+                            { Reply.getQuote(this.props.mxEvent, this.props.onWidgetLoad) }
                             <EventTileType ref="tile"
                                            mxEvent={this.props.mxEvent}
                                            highlights={this.props.highlights}
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index dde2da42d2..c051471ba6 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -52,9 +52,9 @@ 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 {makeUserPermalink} from "../../../matrix-to";
-import QuotePreview from "./QuotePreview";
+import ReplyPreview from "./ReplyPreview";
 import RoomViewStore from '../../../stores/RoomViewStore';
-import Quote from "../elements/Quote";
+import Reply from "../elements/Reply";
 import {ContentHelpers} from 'matrix-js-sdk';
 
 const EMOJI_SHORTNAMES = Object.keys(emojioneList);
@@ -839,7 +839,7 @@ export default class MessageComposerInput extends React.Component {
         }
 
         const quotingEv = RoomViewStore.getQuotingEvent();
-        const content = quotingEv ? Quote.getRelationship(quotingEv) : {};
+        const content = quotingEv ? Reply.getRelationship(quotingEv) : {};
         // we have finished quoting, clear the quotingEvent
         // TODO maybe delay this until the event actually sends?
         dis.dispatch({
@@ -1159,7 +1159,7 @@ export default class MessageComposerInput extends React.Component {
         return (
             <div className="mx_MessageComposer_input_wrapper">
                 <div className="mx_MessageComposer_autocomplete_wrapper">
-                    { SettingsStore.isFeatureEnabled("feature_rich_quoting") && <QuotePreview /> }
+                    { SettingsStore.isFeatureEnabled("feature_rich_quoting") && <ReplyPreview /> }
                     <Autocomplete
                         ref={(e) => 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 83%
rename from src/components/views/rooms/QuotePreview.js
rename to src/components/views/rooms/ReplyPreview.js
index 590ee21b8f..045c3da9b3 100644
--- a/src/components/views/rooms/QuotePreview.js
+++ b/src/components/views/rooms/ReplyPreview.js
@@ -27,7 +27,7 @@ function cancelQuoting() {
     });
 }
 
-export default class QuotePreview extends React.Component {
+export default class ReplyPreview extends React.Component {
     constructor(props, context) {
         super(props, context);
 
@@ -61,17 +61,17 @@ export default class QuotePreview extends React.Component {
         const EventTile = sdk.getComponent('rooms.EventTile');
         const EmojiText = sdk.getComponent('views.elements.EmojiText');
 
-        return <div className="mx_QuotePreview">
-            <div className="mx_QuotePreview_section">
-                <EmojiText element="div" className="mx_QuotePreview_header mx_QuotePreview_title">
+        return <div className="mx_ReplyPreview">
+            <div className="mx_ReplyPreview_section">
+                <EmojiText element="div" className="mx_ReplyPreview_header mx_ReplyPreview_title">
                     { '💬 ' + _t('Replying') }
                 </EmojiText>
-                <div className="mx_QuotePreview_header mx_QuotePreview_cancel">
+                <div className="mx_ReplyPreview_header mx_ReplyPreview_cancel">
                     <img className="mx_filterFlipColor" src="img/cancel.svg" width="18" height="18"
                          onClick={cancelQuoting} />
                 </div>
-                <div className="mx_QuotePreview_clear" />
-                <EventTile mxEvent={this.state.event} last={true} tileShape="quote" onWidgetLoad={dummyOnWidgetLoad} />
+                <div className="mx_ReplyPreview_clear" />
+                <EventTile mxEvent={this.state.event} last={true} tileShape="reply" onWidgetLoad={dummyOnWidgetLoad} />
             </div>
         </div>;
     }