Merge pull request #59 from Reckless-Satoshi/chatbox-fixes

Chatbox fixes. Well tested in robodevs.onion and in robotest.onion platforms. 
Already up in mainnet.
This commit is contained in:
Reckless_Satoshi 2022-03-02 19:53:06 +00:00 committed by GitHub
commit 89502500c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 29 deletions

View File

@ -49,16 +49,8 @@ class ChatRoomConsumer(AsyncWebsocketConsumer):
message = event["message"] message = event["message"]
nick = event["nick"] nick = event["nick"]
# Insert a white space in words longer than 22 characters.
# Helps when messages overflow in a single line.
words = message.split(" ")
fix_message = ""
for word in words:
word = " ".join(word[i:i + 22] for i in range(0, len(word), 22))
fix_message = fix_message + " " + word
await self.send(text_data=json.dumps({ await self.send(text_data=json.dumps({
"message": fix_message, "message": message,
"user_nick": nick, "user_nick": nick,
})) }))

View File

@ -37,6 +37,7 @@ services:
command: python3 manage.py clean_orders command: python3 manage.py clean_orders
volumes: volumes:
- .:/usr/src/robosats - .:/usr/src/robosats
- /mnt/development/lnd:/lnd
network_mode: service:tor network_mode: service:tor
follow-invoices: follow-invoices:
@ -71,7 +72,6 @@ services:
REDIS_URL: redis://localhost:6379 REDIS_URL: redis://localhost:6379
volumes: volumes:
- .:/usr/src/robosats - .:/usr/src/robosats
- /mnt/development/database:/usr/src/database
network_mode: service:tor network_mode: service:tor
tor: tor:

View File

@ -48,12 +48,14 @@ export default class Chat extends Component {
} }
onButtonClicked = (e) => { onButtonClicked = (e) => {
if(this.state.value!=''){
this.client.send(JSON.stringify({ this.client.send(JSON.stringify({
type: "message", type: "message",
message: this.state.value, message: this.state.value,
nick: this.props.ur_nick, nick: this.props.ur_nick,
})); }));
this.state.value = '' this.state.value = ''
}
e.preventDefault(); e.preventDefault();
} }
@ -75,6 +77,7 @@ export default class Chat extends Component {
style={{backgroundColor: '#e8ffe6'}} style={{backgroundColor: '#e8ffe6'}}
title={message.userNick} title={message.userNick}
subheader={message.msg} subheader={message.msg}
subheaderTypographyProps={{sx: {wordWrap: "break-word", width: 200}}}
/> />
: :
<CardHeader <CardHeader
@ -87,6 +90,7 @@ export default class Chat extends Component {
style={{backgroundColor: '#fcfcfc'}} style={{backgroundColor: '#fcfcfc'}}
title={message.userNick} title={message.userNick}
subheader={message.msg} subheader={message.msg}
subheaderTypographyProps={{sx: {wordWrap: "break-word", width: 200}}}
/>} />}
</Card> </Card>
</>)} </>)}
@ -111,7 +115,9 @@ export default class Chat extends Component {
</Grid> </Grid>
</Grid> </Grid>
</form> </form>
<FormHelperText>This chat has no memory. If you leave and come back the messages are lost.</FormHelperText> <FormHelperText>
The chat has no memory: if you leave, messages are lost. <a target="_blank" href="https://diverter.hostyourown.tools/as-easy-as-pgp/"> Learn easy PGP encryption.</a>
</FormHelperText>
</Container> </Container>
) )
} }

File diff suppressed because one or more lines are too long