Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Support m.room.tombstone events #2124

Merged
merged 3 commits into from
Aug 29, 2018
Merged

Support m.room.tombstone events #2124

merged 3 commits into from
Aug 29, 2018

Conversation

dbkr
Copy link
Member

@dbkr dbkr commented Aug 21, 2018

@dbkr
Copy link
Member Author

dbkr commented Aug 21, 2018

Don't merge just yet - may have replacement strings

@dbkr dbkr requested a review from a team August 21, 2018 14:58
@@ -61,6 +64,7 @@ export default class MessageComposer extends React.Component {
},
showFormatting: SettingsStore.getValue('MessageComposer.showFormatting'),
isQuoting: Boolean(RoomViewStore.getQuotingEvent()),
tombstone: this._getRoomTombstone(),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we put this in the parent of the composer (RoomView or a new in-between component)? Apart from where it appears on the screen, it's not really related to composing messages.

Copy link
Contributor

@bwindels bwindels Aug 21, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With "this", I mean the whole tombstone code and show-a-message-instead-of-composer logic, not just this particular method.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, although actually MessageComposer is kind of already a (probably badly named) wrapper around MessageComposerInput which is the actual text field. We'd also have to split out the avatar & room encryption icon as we still want these displayed.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, ok, that does sound painful. Better leave it as it is then.

@dbkr dbkr merged commit 2c1ba6f into develop Aug 29, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants