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

Refactor MatrixClientPeg #361

Merged
merged 5 commits into from
Jul 25, 2016
Merged

Refactor MatrixClientPeg #361

merged 5 commits into from
Jul 25, 2016

Conversation

dbkr
Copy link
Member

@dbkr dbkr commented Jul 21, 2016

Should be functionally identical

Edit: actually now not quite functionally identical as it used to remember what room it was peeking into and then start the peeking again, but I don't see how this was ever useful for anything.

Should be functionally identical
this.matrixClient.getAccessToken(),
this.guestAccess.isGuest(),
];
}
Copy link
Member Author

Choose a reason for hiding this comment

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

This isn't actually used yet & probably should have been in the next PR really

@richvdh
Copy link
Member

richvdh commented Jul 22, 2016

The guestAccess thing confuses me.

@richvdh richvdh removed their assignment Jul 22, 2016
dbkr added 2 commits July 22, 2016 14:00
Including getting rid of GuestAccess as it was basically doing nothing apart from remembering if we were a guest which may as well be done in the same place we save/restore everything else
@dbkr
Copy link
Member Author

dbkr commented Jul 22, 2016

Okay, I've removed the GuestAccess thing that was confusing @richvdh (and me). ptal.

replaceUsingUrls(hs_url, is_url) {
this.replaceClient(hs_url, is_url);
this.replaceUsingAccessToken(hs_url, is_url);
Copy link
Member

Choose a reason for hiding this comment

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

FWIW, it felt weird to me to have replaceUsingUrls call replaceUsingAccessToken with no access_token, which was why I created replaceClient. But I don't feel strongly.

@richvdh
Copy link
Member

richvdh commented Jul 25, 2016

much better. lgtm modulo minor suggestion

@richvdh richvdh assigned dbkr and unassigned richvdh Jul 25, 2016
dbkr added 2 commits July 25, 2016 16:20
Reintroduce replaceClient so we're not calling replaceUsingAccessToken without access tokens which is a bit silly.
Fix bug from previous commit (pass isGuest through)
@dbkr dbkr merged commit 4b76399 into develop Jul 25, 2016
@richvdh richvdh deleted the dbkr/refactor_matrixclientpeg branch February 15, 2017 13:16
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.

3 participants