bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pull streaming URL from /api/v1/instance

Browse source
This commit is contained in:
Alex Gleason 2020-04-05 16:28:08 -05:00
parent da4f5b200c
commit 64cef8a56e
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 28 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
app/gabsocial/containers/gabsocial.js
View file

@ -40,6 +40,9 @@ const mapStateToProps = (state) => {
return {
showIntroduction,
me,
// accessToken: state.getIn(['auth', 'user', 'access_token']),
accessToken: JSON.parse(localStorage.getItem('user')).access_token,
streamingUrl: state.getIn(['instance', 'urls', 'streaming_api']),
}
}
@ -50,9 +53,29 @@ class GabSocialMount extends React.PureComponent {
showIntroduction: PropTypes.bool,
};
componentDidMount() {
this.componentDidUpdate();
}
componentDidUpdate(prevProps) {
const keys = ['accessToken', 'streamingUrl'];
const credsSet = keys.every(p => this.props[p]);
if (!this.disconnect && credsSet) {
this.disconnect = store.dispatch(connectUserStream());
}
}
componentWillUnmount () {
if (this.disconnect) {
this.disconnect();
this.disconnect = null;
}
}
render () {
const { me } = this.props;
if (me == null) return null;
const { me, streamingUrl } = this.props;
if (me == null || !streamingUrl) return null;
// Disabling introduction for launch
// const { showIntroduction } = this.props;
//
@ -77,17 +100,6 @@ export default class GabSocial extends React.PureComponent {
locale: PropTypes.string.isRequired,
};
componentDidMount() {
this.disconnect = store.dispatch(connectUserStream());
}
componentWillUnmount () {
if (this.disconnect) {
this.disconnect();
this.disconnect = null;
}
}
render () {
const { locale } = this.props;

5
app/gabsocial/stream.js
View file

@ -6,8 +6,9 @@ const randomIntUpTo = max => Math.floor(Math.random() * Math.floor(max));
export function connectStream(path, pollingRefresh = null, callbacks = () => ({ onConnect() {}, onDisconnect() {}, onReceive() {} })) {
return (dispatch, getState) => {
const streamingAPIBaseURL = getState().getIn(['meta', 'streaming_api_base_url']);
const accessToken = getState().getIn(['meta', 'access_token']);
const streamingAPIBaseURL = getState().getIn(['instance', 'urls', 'streaming_api']);
// const accessToken: state.getIn(['auth', 'user', 'access_token']);
const accessToken = JSON.parse(localStorage.getItem('user')).access_token;
const { onConnect, onDisconnect, onReceive } = callbacks(dispatch, getState);
let polling = null;