tsr/ircz
1
0
Fork 0
forked from notnull/ircz
Code Releases Activity

addNotification() for nick, join, part and disconnect

Browse Source
This commit is contained in:
data 2019-07-28 08:49:54 +01:00
parent 774fe6e262
commit abcce5c839
1 changed files with 16 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/App.js
View File

@ -58,26 +58,14 @@ class App extends React.Component {
this.state.chats.map(c => { this.state.chats.map(c => {
if (c === socketId) { if (c === socketId) {
const messages = this.state.messages.concat( const messages = this.state.messages.concat(
this.formatMessage( this.addNotification(`${oldNick} disconnected`, c)
`${oldNick} disconnected`,
socketId,
'[server]',
c,
c === this.state.namespace ? true : false
)
) )
this.setState({ messages }) this.setState({ messages })
} }
this.state.allNamespaces.map(n => { this.state.allNamespaces.map(n => {
if (n.namespace === c && n.sockets.find(s => s === socketId)) { if (n.namespace === c && n.sockets.find(s => s === socketId)) {
const messages = this.state.messages.concat( const messages = this.state.messages.concat(
this.formatMessage( this.addNotification(`${oldNick} disconnected`, c)
`${oldNick} disconnected`,
socketId,
'[server]',
c,
c === this.state.namespace ? true : false
)
) )
this.setState({ messages }) this.setState({ messages })
} }
@ -92,13 +80,7 @@ class App extends React.Component {
const user = this.state.allUsers.find(u => u.socketId === socketId) const user = this.state.allUsers.find(u => u.socketId === socketId)
console.log(`${user.nick} joined ${namespace}`) console.log(`${user.nick} joined ${namespace}`)
const messages = this.state.messages.concat( const messages = this.state.messages.concat(
this.formatMessage( this.addNotification(`${user.nick} joined ${namespace}`, namespace)
`${user.nick} joined ${namespace}`,
socketId,
'[server]',
namespace,
namespace === this.state.namespace ? true : false
)
) )
this.setState({ messages }) this.setState({ messages })
}) })
@ -108,13 +90,7 @@ class App extends React.Component {
const user = this.state.allUsers.find(u => u.socketId === socketId) const user = this.state.allUsers.find(u => u.socketId === socketId)
console.log(`${user.nick} left ${namespace}`) console.log(`${user.nick} left ${namespace}`)
const messages = this.state.messages.concat( const messages = this.state.messages.concat(
this.formatMessage( this.addNotification(`${user.nick} left ${namespace}`, namespace)
`${user.nick} left ${namespace}`,
socketId,
'[server]',
namespace,
namespace === this.state.namespace ? true : false
)
) )
this.setState({ messages }) this.setState({ messages })
}) })
@ -128,26 +104,14 @@ class App extends React.Component {
this.state.chats.map(c => { this.state.chats.map(c => {
if (c === user.socketId) { if (c === user.socketId) {
const messages = this.state.messages.concat( const messages = this.state.messages.concat(
this.formatMessage( this.addNotification(`${oldNick} is now known as ${user.nick}`, c)
`${oldNick} is now known as ${user.nick}`,
user.socketId,
'[server]',
c,
c === this.state.namespace ? true : false
)
) )
this.setState({ messages }) this.setState({ messages })
} }
this.state.allNamespaces.map(n => { this.state.allNamespaces.map(n => {
if (n.namespace === c && n.sockets.find(s => s === user.socketId)) { if (n.namespace === c && n.sockets.find(s => s === user.socketId)) {
const messages = this.state.messages.concat( const messages = this.state.messages.concat(
this.formatMessage( this.addNotification(`${oldNick} is now known as ${user.nick}`, c)
`${oldNick} is now known as ${user.nick}`,
user.socketId,
'[server]',
c,
c === this.state.namespace ? true : false
)
) )
this.setState({ messages }) this.setState({ messages })
} }
@ -222,6 +186,16 @@ class App extends React.Component {
} }
this.setState({ message: '' }) this.setState({ message: '' })
} }
addNotification(text, namespace) {
return this.formatMessage(
text,
'server',
'server',
namespace,
namespace === this.state.namespace ? true : false
)
}
formatMessage(text, from, nick, to, read) { formatMessage(text, from, nick, to, read) {
if (!text || !from || !to || !nick) { if (!text || !from || !to || !nick) {
console.log( console.log(