sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Use MatrixClientPeg::safeGet in src/{stores,hooks,components/structures}/* (#10988)

Browse Source
This commit is contained in:
Michael Telatynski
2023-06-15 15:11:49 +01:00
committed by GitHub
parent 707fd9ccf0
commit dd46db4817
34 changed files with 139 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/structures/FilePanel.tsx
+10 -10
View File
@@ -74,7 +74,7 @@ class FilePanel extends React.Component<IProps, IState> {
if (room?.roomId !== this.props.roomId) return;
if (toStartOfTimeline || !data || !data.liveEvent || ev.isRedacted()) return;
const client = MatrixClientPeg.get();
const client = MatrixClientPeg.safeGet();
client.decryptEventIfNeeded(ev);
if (ev.isBeingDecrypted()) {
@@ -109,11 +109,11 @@ class FilePanel extends React.Component<IProps, IState> {
}
public async componentDidMount(): Promise<void> {
const client = MatrixClientPeg.get();
const client = MatrixClientPeg.safeGet();
await this.updateTimelineSet(this.props.roomId);
if (!MatrixClientPeg.get().isRoomEncrypted(this.props.roomId)) return;
if (!client.isRoomEncrypted(this.props.roomId)) return;
// The timelineSets filter makes sure that encrypted events that contain
// URLs never get added to the timeline, even if they are live events.
@@ -133,7 +133,7 @@ class FilePanel extends React.Component<IProps, IState> {
const client = MatrixClientPeg.get();
if (client === null) return;
if (!MatrixClientPeg.get().isRoomEncrypted(this.props.roomId)) return;
if (!client.isRoomEncrypted(this.props.roomId)) return;
if (EventIndexPeg.get() !== null) {
client.removeListener(RoomEvent.Timeline, this.onRoomTimeline);
@@ -142,9 +142,9 @@ class FilePanel extends React.Component<IProps, IState> {
}
public async fetchFileEventsServer(room: Room): Promise<EventTimelineSet> {
const client = MatrixClientPeg.get();
const client = MatrixClientPeg.safeGet();
const filter = new Filter(client.credentials.userId);
const filter = new Filter(client.getSafeUserId());
filter.setDefinition({
room: {
timeline: {
@@ -163,7 +163,7 @@ class FilePanel extends React.Component<IProps, IState> {
direction: Direction,
limit: number,
): Promise<boolean> => {
const client = MatrixClientPeg.get();
const client = MatrixClientPeg.safeGet();
const eventIndex = EventIndexPeg.get();
const roomId = this.props.roomId;
@@ -185,7 +185,7 @@ class FilePanel extends React.Component<IProps, IState> {
};
public async updateTimelineSet(roomId: string): Promise<void> {
const client = MatrixClientPeg.get();
const client = MatrixClientPeg.safeGet();
const room = client.getRoom(roomId);
const eventIndex = EventIndexPeg.get();
@@ -221,7 +221,7 @@ class FilePanel extends React.Component<IProps, IState> {
}
public render(): React.ReactNode {
if (MatrixClientPeg.get().isGuest()) {
if (MatrixClientPeg.safeGet().isGuest()) {
return (
<BaseCard className="mx_FilePanel mx_RoomView_messageListWrapper" onClose={this.props.onClose}>
<div className="mx_RoomView_empty">
@@ -256,7 +256,7 @@ class FilePanel extends React.Component<IProps, IState> {
</div>
);
const isRoomEncrypted = this.noRoom ? false : MatrixClientPeg.get().isRoomEncrypted(this.props.roomId);
const isRoomEncrypted = this.noRoom ? false : MatrixClientPeg.safeGet().isRoomEncrypted(this.props.roomId);
if (this.state.timelineSet) {
return (