Skip to content

Commit

Permalink
Use matrixClient from RoomContext instead of MatrixClientPeg
Browse files Browse the repository at this point in the history 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
  • Loading branch information
@SimonBrandner
SimonBrandner committed Oct 25, 2021
1 parent ffee201 commit 2cefaf3
Showing 1 changed file with 22 additions and 22 deletions.
44 changes: 22 additions & 22 deletions src/components/views/rooms/EventTile.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,12 +396,12 @@ export default class EventTile extends React.Component<IProps, IState> {
if (!this.props.mxEvent) return false;

// Sanity check (should never happen, but we shouldn't explode if it does)
const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
const room = this.context.matrixClient.getRoom(this.props.mxEvent.getRoomId());
if (!room) return false;

// Quickly check to see if the event was sent by us. If it wasn't, it won't qualify for
// special read receipts.
const myUserId = MatrixClientPeg.get().getUserId();
const myUserId = this.context.matrixClient.getUserId();
if (this.props.mxEvent.getSender() !== myUserId) return false;

// Finally, determine if the type is relevant to the user. This notably excludes state
Expand Down Expand Up @@ -432,7 +432,7 @@ export default class EventTile extends React.Component<IProps, IState> {

// If anyone has read the event besides us, we don't want to show a sent receipt.
const receipts = this.props.readReceipts || [];
const myUserId = MatrixClientPeg.get().getUserId();
const myUserId = this.context.matrixClient.getUserId();
if (receipts.some(r => r.userId !== myUserId)) return false;

// Finally, we should show a receipt.
Expand Down Expand Up @@ -460,7 +460,7 @@ export default class EventTile extends React.Component<IProps, IState> {

componentDidMount() {
this.suppressReadReceiptAnimation = false;
const client = MatrixClientPeg.get();
const client = this.context.matrixClient;
if (!this.props.forExport) {
client.on("deviceVerificationChanged", this.onDeviceVerificationChanged);
client.on("userTrustStatusChanged", this.onUserVerificationChanged);
Expand All @@ -480,7 +480,7 @@ export default class EventTile extends React.Component<IProps, IState> {
this.props.mxEvent.on(ThreadEvent.Update, this.updateThread);
}

const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
const room = this.context.matrixClient.getRoom(this.props.mxEvent.getRoomId());
room?.on(ThreadEvent.New, this.onNewThread);
}

Expand Down Expand Up @@ -510,7 +510,7 @@ export default class EventTile extends React.Component<IProps, IState> {
}

componentWillUnmount() {
const client = MatrixClientPeg.get();
const client = this.context.matrixClient;
client.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
client.removeListener("userTrustStatusChanged", this.onUserVerificationChanged);
client.removeListener("Room.receipt", this.onRoomReceipt);
Expand All @@ -524,22 +524,22 @@ export default class EventTile extends React.Component<IProps, IState> {
this.props.mxEvent.off(ThreadEvent.Update, this.updateThread);
}

const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
const room = this.context.matrixClient.getRoom(this.props.mxEvent.getRoomId());
room?.off(ThreadEvent.New, this.onNewThread);
}

componentDidUpdate(prevProps, prevState, snapshot) {
// If we're not listening for receipts and expect to be, register a listener.
if (!this.isListeningForReceipts && (this.shouldShowSentReceipt || this.shouldShowSendingReceipt)) {
MatrixClientPeg.get().on("Room.receipt", this.onRoomReceipt);
this.context.matrixClient.on("Room.receipt", this.onRoomReceipt);
this.isListeningForReceipts = true;
}
}

private onNewThread = (thread: Thread) => {
if (thread.id === this.props.mxEvent.getId()) {
this.updateThread(thread);
const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
const room = this.context.matrixClient.getRoom(this.props.mxEvent.getRoomId());
room.off(ThreadEvent.New, this.onNewThread);
}
};
Expand All @@ -555,7 +555,7 @@ export default class EventTile extends React.Component<IProps, IState> {
* We currently have no reliable way to discover than an event is a thread
* when we are at the sync stage
*/
const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
const room = this.context.matrixClient.getRoom(this.props.mxEvent.getRoomId());
const thread = room?.threads.get(this.props.mxEvent.getId());

if (thread && !thread.ready) {
Expand Down Expand Up @@ -600,7 +600,7 @@ export default class EventTile extends React.Component<IProps, IState> {

private onRoomReceipt = (ev, room) => {
// ignore events for other rooms
const tileRoom = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
const tileRoom = this.context.matrixClient.getRoom(this.props.mxEvent.getRoomId());
if (room !== tileRoom) return;

if (!this.shouldShowSentReceipt && !this.shouldShowSendingReceipt && !this.isListeningForReceipts) {
Expand All @@ -612,7 +612,7 @@ export default class EventTile extends React.Component<IProps, IState> {
this.forceUpdate(() => {
// Per elsewhere in this file, we can remove the listener once we will have no further purpose for it.
if (!this.shouldShowSentReceipt && !this.shouldShowSendingReceipt) {
MatrixClientPeg.get().removeListener("Room.receipt", this.onRoomReceipt);
this.context.matrixClient.removeListener("Room.receipt", this.onRoomReceipt);
this.isListeningForReceipts = false;
}
});
Expand Down Expand Up @@ -645,9 +645,9 @@ export default class EventTile extends React.Component<IProps, IState> {
return;
}

const encryptionInfo = MatrixClientPeg.get().getEventEncryptionInfo(mxEvent);
const encryptionInfo = this.context.matrixClient.getEventEncryptionInfo(mxEvent);
const senderId = mxEvent.getSender();
const userTrust = MatrixClientPeg.get().checkUserTrust(senderId);
const userTrust = this.context.matrixClient.checkUserTrust(senderId);

if (encryptionInfo.mismatchedSender) {
// something definitely wrong is going on here
Expand All @@ -665,7 +665,7 @@ export default class EventTile extends React.Component<IProps, IState> {
return;
}

const eventSenderTrust = encryptionInfo.sender && MatrixClientPeg.get().checkDeviceTrust(
const eventSenderTrust = encryptionInfo.sender && this.context.matrixClient.checkDeviceTrust(
senderId, encryptionInfo.sender.deviceId,
);
if (!eventSenderTrust) {
Expand Down Expand Up @@ -744,13 +744,13 @@ export default class EventTile extends React.Component<IProps, IState> {

shouldHighlight() {
if (this.props.forExport) return false;
const actions = MatrixClientPeg.get().getPushActionsForEvent(
const actions = this.context.matrixClient.getPushActionsForEvent(
this.props.mxEvent.replacingEvent() || this.props.mxEvent,
);
if (!actions || !actions.tweaks) { return false; }

// don't show self-highlights from another of our clients
if (this.props.mxEvent.getSender() === MatrixClientPeg.get().credentials.userId) {
if (this.props.mxEvent.getSender() === this.context.matrixClient.credentials.userId) {
return false;
}

Expand Down Expand Up @@ -876,7 +876,7 @@ export default class EventTile extends React.Component<IProps, IState> {
// Cancel any outgoing key request for this event and resend it. If a response
// is received for the request with the required keys, the event could be
// decrypted successfully.
MatrixClientPeg.get().cancelAndResendEventRoomKeyRequest(this.props.mxEvent);
this.context.matrixClient.cancelAndResendEventRoomKeyRequest(this.props.mxEvent);
};

onPermalinkClicked = e => {
Expand Down Expand Up @@ -914,7 +914,7 @@ export default class EventTile extends React.Component<IProps, IState> {
}
}

if (MatrixClientPeg.get().isRoomEncrypted(ev.getRoomId())) {
if (this.context.matrixClient.isRoomEncrypted(ev.getRoomId())) {
// else if room is encrypted
// and event is being encrypted or is not_sent (Unknown Devices/Network Error)
if (ev.status === EventStatus.ENCRYPTING) {
Expand Down Expand Up @@ -1189,7 +1189,7 @@ export default class EventTile extends React.Component<IProps, IState> {

switch (this.props.tileShape) {
case TileShape.Notif: {
const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
const room = this.context.matrixClient.getRoom(this.props.mxEvent.getRoomId());
return React.createElement(this.props.as || "li", {
"className": classes,
"aria-live": ariaLive,
Expand Down Expand Up @@ -1236,7 +1236,7 @@ export default class EventTile extends React.Component<IProps, IState> {
isQuoteExpanded={isQuoteExpanded}
setQuoteExpanded={this.setQuoteExpanded}
/>) : null;
const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
const room = this.context.matrixClient.getRoom(this.props.mxEvent.getRoomId());
return React.createElement(this.props.as || "li", {
"className": classes,
"aria-live": ariaLive,
Expand Down Expand Up @@ -1320,7 +1320,7 @@ export default class EventTile extends React.Component<IProps, IState> {
isQuoteExpanded={isQuoteExpanded}
setQuoteExpanded={this.setQuoteExpanded}
/>) : null;
const isOwnEvent = this.props.mxEvent?.sender?.userId === MatrixClientPeg.get().getUserId();
const isOwnEvent = this.props.mxEvent?.sender?.userId === this.context.matrixClient.getUserId();

// tab-index=-1 to allow it to be focusable but do not add tab stop for it, primarily for screen readers
return (
Expand Down

0 comments on commit 2cefaf3

Please sign in to comment.