9 Commits

Author SHA1 Message Date
Sharon Kennedy
ac9247fecb 2.1.0 2020-10-15 11:40:38 -04:00
Sharon Kennedy
8439a1d100 export chatbox as react component 2020-10-15 11:40:12 -04:00
Sharon Kennedy
b709245b46 2.0.2 2020-09-11 16:32:33 -04:00
Sharon Kennedy
52e30336ad handle chat offline signal 2020-09-11 16:32:20 -04:00
Sharon Kennedy
bee884c52f 2.0.1 2020-09-08 08:20:29 -04:00
Sharon Kennedy
2ffa63d583 remove loader when chat is closed 2020-09-08 08:20:23 -04:00
Sharon Kennedy
a0d08f8f88 2.0.0 2020-09-06 15:34:45 -04:00
Sharon Kennedy
09cc934fbd latest build 2020-09-06 15:34:31 -04:00
Sharon
5a0ed5d36d Merge pull request #1 from nomadic-labs/bot_signal
Bot signal
2020-09-06 15:25:31 -04:00
9 changed files with 86 additions and 32 deletions

4
dist/bookmarklet.js vendored

File diff suppressed because one or more lines are too long

4
dist/chatbox.js vendored

File diff suppressed because one or more lines are too long

60
dist/component.js vendored Normal file

File diff suppressed because one or more lines are too long

2
dist/index.html vendored
View File

@@ -25,7 +25,7 @@
anonymousDisplayName: 'Anonymous', anonymousDisplayName: 'Anonymous',
position: 'bottom right', position: 'bottom right',
size: 'large', size: 'large',
maxWaitTime: 6000*3, maxWaitTime: 1000*60*3, // 3 minutes
} }
EmbeddableChatbox.mount(config); EmbeddableChatbox.mount(config);

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{ {
"name": "private-safesupport-chatbox", "name": "private-safesupport-chatbox",
"version": "1.2.2", "version": "2.1.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@@ -1,6 +1,6 @@
{ {
"name": "private-safesupport-chatbox", "name": "private-safesupport-chatbox",
"version": "1.2.2", "version": "2.1.0",
"description": "A secure and private embeddable chatbox that connects to Riot", "description": "A secure and private embeddable chatbox that connects to Riot",
"main": "dist/chatbox.js", "main": "dist/chatbox.js",
"scripts": { "scripts": {

View File

@@ -166,7 +166,7 @@ class ChatBox extends React.Component {
await this.state.client.deactivateAccount(auth, true) await this.state.client.deactivateAccount(auth, true)
await this.state.client.stopClient() await this.state.client.stopClient()
await this.state.client.clearStores() await this.state.client.clearStores()
this.setState({ client: null }) this.setState({ client: null, ready: true }) // no more loading animation
window.clearInterval(this.state.waitIntervalId) // no more waiting messages window.clearInterval(this.state.waitIntervalId) // no more waiting messages
} }
@@ -461,38 +461,15 @@ class ChatBox extends React.Component {
const decryptionErrors = {...this.state.decryptionErrors} const decryptionErrors = {...this.state.decryptionErrors}
delete decryptionErrors[message.id] delete decryptionErrors[message.id]
const isOfflineNotice = message.content.msgtype === "m.notice" && message.content.body === CHAT_IS_OFFLINE_NOTICE
let newMessage = message
// when the bot sends a notice that the chat is offline
// replace the message with the client-configured message
// for now we're treating m.notice and m.text messages the same
if (isOfflineNotice) {
newMessage = {
...message,
content: {
...message.content,
body: this.props.chatOfflineMessage
}
}
this.handleChatOffline()
}
this.setState({ this.setState({
messages: { messages: {
...this.state.messages, ...this.state.messages,
[message.id]: newMessage, [message.id]: message,
}, },
decryptionErrors decryptionErrors
}) })
} }
handleChatOffline = () => {
this.exitChat(false) // close the chat connection but keep chatbox state
this.setState({ ready: true }) // no more loading animation
}
handleKeyDown = (e) => { handleKeyDown = (e) => {
switch (e.keyCode) { switch (e.keyCode) {
case 27: case 27:
@@ -584,6 +561,9 @@ class ChatBox extends React.Component {
case 'END_CHAT': case 'END_CHAT':
this.displayBotMessage({ body: this.props.exitMessage }) this.displayBotMessage({ body: this.props.exitMessage })
return this.exitChat(false); // keep chat state return this.exitChat(false); // keep chat state
case 'CHAT_OFFLINE':
this.displayBotMessage({ body: this.props.chatOfflineMessage })
return this.exitChat(false); // keep chat state
} }
} }

3
src/outputs/component.js Normal file
View File

@@ -0,0 +1,3 @@
import Chatbox from '../components/chatbox';
export default Chatbox;

View File

@@ -94,4 +94,15 @@ module.exports = [{
publicPath: '/', publicPath: '/',
filename: 'bookmarklet.js', filename: 'bookmarklet.js',
}, },
}, {
...defaultConfig,
entry: './src/outputs/component.js',
output: {
path: distDir,
publicPath: '/',
filename: 'component.js',
library: 'Chatbox',
libraryExport: 'default',
libraryTarget: 'commonjs2',
},
}]; }];