urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-01 06:35:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

chat-js: fix auto-join and a chatSynced error

Browse Source
This commit is contained in:
Logan Allen 2020-04-15 15:58:03 -04:00
parent f035070387
commit c497d5a6a6
2 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/interface/chat/src/js/components/chat.js
View File

@ -71,7 +71,7 @@ export class ChatScreen extends Component {
);
} else if (props.chatInitialized &&
!(props.station in props.inbox) &&
!(props.station in props.chatSynced) ) {
(!!props.chatSynced && !(props.station in props.chatSynced))) {
props.history.push("/~chat");
} else if (

37
pkg/interface/chat/src/js/components/join.js
View File

@ -22,12 +22,11 @@ export class JoinScreen extends Component {
componentDidMount() {
const { props } = this;
if (props.autoJoin !== "/undefined/undefined" &&
props.autoJoin !== "/~/undefined/undefined") {
props.autoJoin !== "/~/undefined/undefined") {
let station = props.autoJoin.split('/');
let sig = props.autoJoin.includes("/~/");
let ship = !!sig ? station[2] : station[1];
station = props.autoJoin;
if (
station.length < 2 ||
(!!sig && station.length < 3) ||
@ -38,7 +37,7 @@ export class JoinScreen extends Component {
});
return;
}
station = props.autoJoin;
this.setState({
station,
@ -50,7 +49,7 @@ export class JoinScreen extends Component {
componentDidUpdate(prevProps, prevState) {
const { props, state } = this;
if (state.station in props.inbox ||
props.chatSynced !== prevProps.chatSynced) {
(props.chatSynced !== prevProps.chatSynced && state.station !== '/')) {
this.setState({ awaiting: false });
props.history.push(`/~chat/room${state.station}`);
}
@ -59,24 +58,13 @@ export class JoinScreen extends Component {
onClickJoin() {
const { props, state } = this;
let text = state.station;
if (text in props.inbox ||
text.length === 0) {
this.setState({
error: true,
});
return;
}
let station = text.split('/');
let sig = state.station.includes("~/");
let ship = !!sig ? station[1] : station[0];
station = station.join('/');
let station = state.station.split('/');
let sig = state.station.includes("/~/");
let ship = !!sig ? station[2] : station[1];
if (
(!sig && station.split('/').length < 2) ||
(!!sig && station.split('/').length < 3) ||
station.length < 2 ||
(!!sig && station.length < 3) ||
!urbitOb.isValidPatp(ship)
) {
this.setState({
@ -84,16 +72,19 @@ export class JoinScreen extends Component {
});
return;
}
station = state.station.trim();
this.setState({
station,
awaiting: true,
station: `/${station}`
}, () => props.api.chatView.join(ship, `/${station}`, true))
}, () => {
props.api.chatView.join(ship, station, true)
});
}
stationChange(event) {
this.setState({
station: event.target.value
station: `/${event.target.value}`
});
}