ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-15 01:52:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

chat: restore join functionality

Browse Source 
Fixes #3371.
This commit is contained in:
Matilde Park 2020-08-24 23:10:56 -04:00
parent f9f6eb5d1a
commit c5b71e55c1
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/interface/src/views/apps/chat/app.tsx
View File

@ -207,7 +207,7 @@ export default class ChatApp extends React.Component<ChatAppProps, {}> {
<JoinScreen
api={api}
inbox={inbox}
autoJoin={station}
station={station}
chatSynced={chatSynced || {}}
{...props}
/>

15
pkg/interface/src/views/apps/chat/components/join.js
View File

@ -25,7 +25,6 @@ const schema = Yup.object().shape({
export class JoinScreen extends Component {
constructor(props) {
super(props);
this.state = {
awaiting: false
};
@ -38,17 +37,17 @@ export class JoinScreen extends Component {
}
onSubmit(values) {
console.log(values);
const { props } = this;
this.setState({ awaiting: true }, () => {
console.log(values);
const station = values.station.trim();
if (`/${station}` in this.props.chatSynced) {
this.props.history.push(`/~chat/room/${station}`);
if (`/${station}` in props.chatSynced) {
props.history.push(`/~chat/room${station}`);
return;
}
const ship = station.substr(1).slice(0,station.substr(1).indexOf('/'));
props.api.chat.join(ship, station, true)
this.props.history.push(`/~chat/room/${station}`);
props.api.chat.join(ship, station, true);
props.history.push(`/~chat/room${station}`);
});
}
@ -84,7 +83,7 @@ export class JoinScreen extends Component {
mt={4}
id="station"
placeholder="~zod/chatroom"
fontFamily="mono"
fontFamily="mono"
caption="Chat names use lowercase, hyphens, and slashes." />
<Button>Join Chat</Button>
<Spinner