forked from notnull/ircz
Compare commits
No commits in common. "join" and "master" have entirely different histories.
@ -1,44 +1,30 @@
|
||||
const users = {}
|
||||
|
||||
module.exports = io => {
|
||||
io.on('connection', async socket => {
|
||||
console.log(`A socket connection to the server has been made: ${socket.id}`)
|
||||
users[socket.id] = { socketId: socket.id, nick: socket.id }
|
||||
|
||||
// announce to all
|
||||
socket.broadcast.emit('user connected', users[socket.id])
|
||||
// send all users TODO remove
|
||||
socket.emit(
|
||||
'got users',
|
||||
Object.keys(io.sockets.sockets).map(socketId => users[socketId])
|
||||
)
|
||||
socket.join('#projex', () => {
|
||||
sendUsers()
|
||||
sendNamespaces()
|
||||
})
|
||||
|
||||
socket.on('message', message => {
|
||||
console.log('sending message to ', message.to, message)
|
||||
io.to(message.to).emit('message', message)
|
||||
console.log('sending message to namespace', message.namespace, message)
|
||||
io.to(message.namespace).emit('message', message)
|
||||
})
|
||||
|
||||
socket.on('get users', () => {
|
||||
console.log('get users')
|
||||
sendUsers()
|
||||
})
|
||||
|
||||
socket.on('join', namespace => {
|
||||
const socketId = socket.id
|
||||
console.log(`${socketId} joins ${namespace}`)
|
||||
console.log('join:', namespace)
|
||||
socket.join(namespace, () => {
|
||||
io.to(namespace).emit('user joined', { namespace, socketId })
|
||||
sendNamespace(namespace)
|
||||
sendNamespaces()
|
||||
})
|
||||
})
|
||||
|
||||
socket.on('part', namespace => {
|
||||
const socketId = socket.id
|
||||
console.log('part', socketId, namespace)
|
||||
socket.leave(namespace, () => {
|
||||
io.to(namespace).emit('user left', { namespace, socketId })
|
||||
sendNamespace(namespace)
|
||||
})
|
||||
})
|
||||
|
||||
socket.on('change nick', nick => {
|
||||
io.emit('changed nick', { socketId: socket.id, nick: nick })
|
||||
users[socket.id]['nick'] = nick
|
||||
socket.on('part', () => {
|
||||
console.log('part')
|
||||
})
|
||||
|
||||
socket.on('get namespaces', () => sendNamespaces())
|
||||
@ -51,19 +37,14 @@ module.exports = io => {
|
||||
io.emit('got namespaces', namespaces)
|
||||
}
|
||||
|
||||
socket.on('disconnect', async () => {
|
||||
io.emit('user disconnected', socket.id)
|
||||
console.log(`${socket.id} has disconnected.`)
|
||||
//sendNamespaces()
|
||||
})
|
||||
const sendUsers = () =>
|
||||
socket.emit('got users', Object.keys(io.sockets.sockets))
|
||||
|
||||
const sendNamespace = namespace => {
|
||||
if (!io.sockets.adapter.rooms[namespace]) return
|
||||
const newNamespace = {
|
||||
namespace,
|
||||
sockets: Object.keys(io.sockets.adapter.rooms[namespace].sockets),
|
||||
}
|
||||
io.emit('got namespace', newNamespace)
|
||||
}
|
||||
socket.on('disconnect', async () => {
|
||||
io.emit('user disconnected', { socketId: socket.id })
|
||||
console.log(`${socket.id} has disconnected.`)
|
||||
sendNamespaces()
|
||||
sendUsers()
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
379
src/App.js
379
src/App.js
@ -9,8 +9,7 @@ const initialState = {
|
||||
loading: true,
|
||||
messages: [],
|
||||
message: '',
|
||||
allNamespaces: [],
|
||||
chats: [],
|
||||
namespaces: [],
|
||||
namespace: '/',
|
||||
allUsers: [],
|
||||
user: {},
|
||||
@ -22,9 +21,8 @@ class App extends React.Component {
|
||||
this.state = initialState
|
||||
this.socket = socket
|
||||
this.handleChange = this.handleChange.bind(this)
|
||||
this.submitMessage = this.submitMessage.bind(this)
|
||||
this.handleSubmit = this.handleSubmit.bind(this)
|
||||
this.join = this.join.bind(this)
|
||||
this.readMessages = this.readMessages.bind(this)
|
||||
}
|
||||
|
||||
async fetchData() {
|
||||
@ -34,110 +32,22 @@ class App extends React.Component {
|
||||
componentDidMount() {
|
||||
this.fetchData()
|
||||
this.socket.on('connect', () => {
|
||||
console.log(`I am ${socket.id}`)
|
||||
this.join('#projex')
|
||||
const user = { socketId: this.socket.id, nick: this.socket.id }
|
||||
console.log('connected!')
|
||||
const user = { socketId: this.socket.id }
|
||||
this.setState({ user })
|
||||
})
|
||||
|
||||
this.socket.on('user connected', user => {
|
||||
console.log(`${user.nick} connected.`)
|
||||
const allUsers = this.state.allUsers.concat(user)
|
||||
this.setState({ allUsers })
|
||||
this.socket.on('user connected', payload => {
|
||||
console.log('a new user connected!', payload)
|
||||
})
|
||||
|
||||
this.socket.on('user disconnected', socketId => {
|
||||
console.log(`${socketId} disconnected.`)
|
||||
const allUsers = this.state.allUsers.map(u => {
|
||||
if (u.socketId === socketId) u.offline = true
|
||||
return u
|
||||
})
|
||||
const oldNick = allUsers.find(u => u.socketId === socketId).nick
|
||||
this.setState({ allUsers })
|
||||
// inform channels user was part of
|
||||
this.state.chats.map(c => {
|
||||
if (c === socketId) {
|
||||
const messages = this.state.messages.concat(
|
||||
this.addNotification(`${oldNick} disconnected`, c)
|
||||
)
|
||||
this.setState({ messages })
|
||||
}
|
||||
this.state.allNamespaces.map(n => {
|
||||
if (n.namespace === c && n.sockets.find(s => s === socketId)) {
|
||||
const messages = this.state.messages.concat(
|
||||
this.addNotification(`${oldNick} disconnected`, c)
|
||||
)
|
||||
this.setState({ messages })
|
||||
}
|
||||
return n
|
||||
})
|
||||
return c
|
||||
})
|
||||
this.socket.on('user disconnected', payload => {
|
||||
console.log('a user disconnected.', payload)
|
||||
})
|
||||
|
||||
this.socket.on('user joined', data => {
|
||||
const { namespace, socketId } = data
|
||||
const user = this.state.allUsers.find(u => u.socketId === socketId)
|
||||
console.log(`${user.nick} joined ${namespace}`)
|
||||
const messages = this.state.messages.concat(
|
||||
this.addNotification(`${user.nick} joined ${namespace}`, namespace)
|
||||
)
|
||||
this.setState({ messages })
|
||||
})
|
||||
|
||||
this.socket.on('user left', data => {
|
||||
const { namespace, socketId } = data
|
||||
const user = this.state.allUsers.find(u => u.socketId === socketId)
|
||||
console.log(`${user.nick} left ${namespace}`)
|
||||
const messages = this.state.messages.concat(
|
||||
this.addNotification(`${user.nick} left ${namespace}`, namespace)
|
||||
)
|
||||
this.setState({ messages })
|
||||
})
|
||||
|
||||
this.socket.on('changed nick', user => {
|
||||
if (user.socketId === this.state.user.socketId) return
|
||||
console.log(`${user.socketId} is now known as ${user.nick}.`)
|
||||
const allUsers = this.state.allUsers
|
||||
const oldNick = allUsers.find(u => u.socketId === user.socketId).nick
|
||||
// inform channels user is part of
|
||||
this.state.chats.map(c => {
|
||||
if (c === user.socketId) {
|
||||
const messages = this.state.messages.concat(
|
||||
this.addNotification(`${oldNick} is now known as ${user.nick}`, c)
|
||||
)
|
||||
this.setState({ messages })
|
||||
}
|
||||
this.state.allNamespaces.map(n => {
|
||||
if (n.namespace === c && n.sockets.find(s => s === user.socketId)) {
|
||||
const messages = this.state.messages.concat(
|
||||
this.addNotification(`${oldNick} is now known as ${user.nick}`, c)
|
||||
)
|
||||
this.setState({ messages })
|
||||
}
|
||||
return n
|
||||
})
|
||||
return c
|
||||
})
|
||||
// update nick
|
||||
allUsers.map(u => {
|
||||
if (u.socketId === user.socketId) u.nick = user.nick
|
||||
return u
|
||||
})
|
||||
this.setState({ allUsers })
|
||||
})
|
||||
|
||||
this.socket.on('got namespace', namespace => {
|
||||
console.log('got namespace:', namespace)
|
||||
const allNamespaces = this.state.allNamespaces
|
||||
.filter(n => n.namespace !== namespace.namespace)
|
||||
.concat(namespace)
|
||||
this.setState({ allNamespaces })
|
||||
})
|
||||
|
||||
this.socket.on('got namespaces', allNamespaces => {
|
||||
console.log('got namespaces:', allNamespaces)
|
||||
this.setState({ allNamespaces })
|
||||
this.socket.on('got namespaces', namespaces => {
|
||||
console.log('got namespaces:', namespaces)
|
||||
this.setState({ namespaces })
|
||||
})
|
||||
|
||||
this.socket.on('got users', allUsers => {
|
||||
@ -146,21 +56,7 @@ class App extends React.Component {
|
||||
})
|
||||
|
||||
this.socket.on('message', msg => {
|
||||
if (
|
||||
msg.to === this.state.user.socketId &&
|
||||
!this.state.chats.find(c => c === msg.from)
|
||||
) {
|
||||
console.log(`${msg.from} wants to chat with me.`)
|
||||
const chats = this.state.chats.concat(msg.from)
|
||||
this.setState({ chats })
|
||||
}
|
||||
if (
|
||||
(msg.to[0] === '#' && msg.to === this.state.namespace) ||
|
||||
(msg.to[0] !== '#' && msg.from === this.state.namespace)
|
||||
)
|
||||
msg.read = true
|
||||
const messages = this.state.messages.concat(msg)
|
||||
console.log(msg)
|
||||
this.setState({ messages })
|
||||
})
|
||||
}
|
||||
@ -172,61 +68,24 @@ class App extends React.Component {
|
||||
parseCommand() {
|
||||
const args = this.state.message.split(' ')
|
||||
const cmd = args[0].slice(1)
|
||||
if (cmd === 'join') {
|
||||
if (!args[1]) {
|
||||
alert('did you forget a channel to join?')
|
||||
return
|
||||
}
|
||||
this.join(args[1])
|
||||
} else if (cmd === 'part' || cmd === 'leave') {
|
||||
this.part(args[1] ? args[1] : this.state.namespace)
|
||||
} else if (cmd === 'nick') this.nick(args[1])
|
||||
else {
|
||||
alert(`unknown command: ${cmd}`)
|
||||
}
|
||||
console.log('command:', cmd)
|
||||
if (cmd === 'join') this.join(args[1])
|
||||
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) {
|
||||
if (!text || !from || !to || !nick) {
|
||||
console.log(
|
||||
'[formatMessage] Dropping malformed message (requiring text, from, nick and to).'
|
||||
)
|
||||
}
|
||||
const message = {
|
||||
id: uuid(),
|
||||
date: moment().format('MMMM D YYYY, h:mm a'),
|
||||
text: text,
|
||||
from: from,
|
||||
nick: nick,
|
||||
to: to,
|
||||
read: read,
|
||||
}
|
||||
return message
|
||||
}
|
||||
submitMessage(e) {
|
||||
handleSubmit(e) {
|
||||
e.preventDefault()
|
||||
|
||||
if (this.state.message[0] === '/') return this.parseCommand()
|
||||
if (!this.state.message.length > 0) return
|
||||
|
||||
this.sendMessage(
|
||||
this.formatMessage(
|
||||
this.state.message,
|
||||
this.state.user.socketId,
|
||||
this.state.user.nick,
|
||||
this.state.namespace
|
||||
)
|
||||
)
|
||||
const message = {
|
||||
id: uuid(),
|
||||
date: moment().format('MMMM D YYYY, h:mm a'),
|
||||
socketId: this.socket.id,
|
||||
text: this.state.message,
|
||||
namespace: this.state.namespace,
|
||||
}
|
||||
|
||||
this.sendMessage(message)
|
||||
this.setState({ message: '' })
|
||||
}
|
||||
renderLoading() {
|
||||
@ -238,78 +97,20 @@ class App extends React.Component {
|
||||
}
|
||||
join(namespace) {
|
||||
if (namespace.slice(0, 1) !== '#') return alert('Use a leading #, silly!')
|
||||
if (this.state.chats.find(c => c === namespace)) return
|
||||
console.log('joining', namespace)
|
||||
const chats = this.state.chats.concat(namespace)
|
||||
this.socket.emit('join', namespace)
|
||||
this.setState({ namespace, chats })
|
||||
}
|
||||
part(namespace) {
|
||||
console.log(`leaving ${namespace}`)
|
||||
socket.emit('part', namespace)
|
||||
const chats = this.state.chats.filter(c => c !== namespace)
|
||||
this.setState({ chats, namespace: '/' })
|
||||
}
|
||||
nick(nick) {
|
||||
if (nick[0] === '#') {
|
||||
alert('nick cannot start with #, sorry!')
|
||||
return
|
||||
}
|
||||
console.log(`Changing nick to ${nick}`)
|
||||
const user = this.state.user
|
||||
user.nick = nick
|
||||
this.setState({ user })
|
||||
this.socket.emit('change nick', nick)
|
||||
}
|
||||
query(user) {
|
||||
if (this.state.chats.find(c => c === user.socketId)) {
|
||||
this.setState({ namespace: user.socketId })
|
||||
return
|
||||
}
|
||||
console.log(`starting chat with ${user.nick}`)
|
||||
const chats = this.state.chats.concat(user.socketId)
|
||||
this.setState({ namespace: user.socketId, chats })
|
||||
this.setState({ namespace })
|
||||
}
|
||||
sendMessage(msg) {
|
||||
this.socket.emit('message', msg)
|
||||
if (msg.to[0] !== '#') {
|
||||
if (msg.to === this.state.namespace) msg.read = true
|
||||
const messages = this.state.messages.concat(msg)
|
||||
this.setState({ messages })
|
||||
}
|
||||
}
|
||||
|
||||
countUnreadMessages(nsp) {
|
||||
return this.state.messages.filter(
|
||||
m =>
|
||||
!m.read &&
|
||||
(m.to === nsp || (m.to === this.state.user.socketId && m.from === nsp))
|
||||
).length
|
||||
}
|
||||
|
||||
readMessages(nsp) {
|
||||
const messages = this.state.messages
|
||||
messages.map(m => {
|
||||
if (!m.read && (m.to === nsp || m.from === nsp)) {
|
||||
m.read = true
|
||||
}
|
||||
return m
|
||||
})
|
||||
this.setState({ messages })
|
||||
}
|
||||
|
||||
activateChat(namespace) {
|
||||
this.readMessages(namespace)
|
||||
this.setState({ namespace })
|
||||
}
|
||||
renderApp() {
|
||||
const title =
|
||||
this.state.namespace[0] === '#'
|
||||
? 'Channel'
|
||||
: this.state.namespace === this.state.user.socketId
|
||||
? 'Namespace'
|
||||
: 'Chat with'
|
||||
|
||||
: this.state.namespace[0] === '/'
|
||||
? 'server messages'
|
||||
: 'User'
|
||||
return (
|
||||
<main role="main" className="d-flex h-100 flex-column">
|
||||
{/*Navbar*/}
|
||||
@ -323,19 +124,11 @@ class App extends React.Component {
|
||||
</Dropdown.Toggle>
|
||||
|
||||
<Dropdown.Menu className="bg-dark">
|
||||
{this.state.allUsers
|
||||
.filter(
|
||||
u => u.socketId !== this.socket.id && u.offline !== true
|
||||
)
|
||||
.map(u => (
|
||||
<Dropdown.Item
|
||||
key={u.socketId}
|
||||
className="bg-dark text-light"
|
||||
onClick={() => this.query(u)}
|
||||
>
|
||||
{u.nick}
|
||||
</Dropdown.Item>
|
||||
))}
|
||||
{this.state.allUsers.map(u => (
|
||||
<Dropdown.Item key={u} className="bg-dark text-light">
|
||||
{u}
|
||||
</Dropdown.Item>
|
||||
))}
|
||||
</Dropdown.Menu>
|
||||
</Dropdown>
|
||||
<Dropdown>
|
||||
@ -344,17 +137,15 @@ class App extends React.Component {
|
||||
</Dropdown.Toggle>
|
||||
|
||||
<Dropdown.Menu className="bg-dark">
|
||||
{this.state.allNamespaces
|
||||
.filter(n => n.namespace[0] === '#')
|
||||
.map(r => (
|
||||
<Dropdown.Item
|
||||
key={r.namespace}
|
||||
className="bg-dark text-light"
|
||||
onClick={() => this.join(r.namespace)}
|
||||
>
|
||||
{r.namespace}
|
||||
</Dropdown.Item>
|
||||
))}
|
||||
{this.state.namespaces.map(r => (
|
||||
<Dropdown.Item
|
||||
key={r.namespace}
|
||||
className="bg-dark text-light"
|
||||
onClick={() => this.join(r.namespace)}
|
||||
>
|
||||
{r.namespace}
|
||||
</Dropdown.Item>
|
||||
))}
|
||||
</Dropdown.Menu>
|
||||
</Dropdown>
|
||||
</Nav>
|
||||
@ -367,49 +158,32 @@ class App extends React.Component {
|
||||
className="d-flex flex-column col-sm-2 bg-dark text-light p-2"
|
||||
id="sidebar2"
|
||||
>
|
||||
<h5 className=" border-bottom pb-2">Chats</h5>
|
||||
<h5 className=" border-bottom pb-2">User Channels</h5>
|
||||
|
||||
<Button
|
||||
key="/"
|
||||
className="btn btn-dark d-flex"
|
||||
onClick={() => this.activateChat('/')}
|
||||
onClick={() => this.setState({ namespace: '/' })}
|
||||
>
|
||||
<div className="mr-auto">server</div>
|
||||
{/*<div className="ml-auto">{this.state.allUsers.length}</div>*/}
|
||||
</Button>
|
||||
{this.state.chats.map(c => (
|
||||
<Button
|
||||
key={c}
|
||||
className="btn btn-dark d-flex"
|
||||
onClick={() => this.activateChat(c)}
|
||||
>
|
||||
<div
|
||||
className={`mr-auto ${
|
||||
this.countUnreadMessages(c) > 0 ? 'text-danger' : ''
|
||||
}`}
|
||||
{this.state.namespaces
|
||||
.filter(
|
||||
r =>
|
||||
r.namespace[0] === '#' &&
|
||||
r.sockets.includes(this.state.user.socketId)
|
||||
)
|
||||
.map(r => (
|
||||
<Button
|
||||
key={r.namespace}
|
||||
className="btn btn-dark d-flex"
|
||||
onClick={() => this.setState({ namespace: r.namespace })}
|
||||
>
|
||||
{c[0] === '#' ||
|
||||
!this.state.allUsers.find(u => u.socketId === c)
|
||||
? c
|
||||
: this.state.allUsers.find(u => u.socketId === c)['nick']}
|
||||
</div>
|
||||
{this.countUnreadMessages(c) > 0 ? (
|
||||
<div className="mr-auto badge bg-danger">
|
||||
{this.countUnreadMessages(c)}
|
||||
</div>
|
||||
) : null}
|
||||
{/* user count for channels */}
|
||||
{c[0] === '#' &&
|
||||
this.state.allNamespaces &&
|
||||
this.state.allNamespaces.find(n => n.namespace === c) ? (
|
||||
<div className="ml-auto">
|
||||
{
|
||||
this.state.allNamespaces.find(n => n.namespace === c)
|
||||
.sockets.length
|
||||
}
|
||||
</div>
|
||||
) : null}
|
||||
</Button>
|
||||
))}
|
||||
<div className="mr-auto">{r.namespace}</div>
|
||||
<div className="ml-auto">{r.sockets.length}</div>
|
||||
</Button>
|
||||
))}
|
||||
</div>
|
||||
|
||||
{/*Main Section*/}
|
||||
@ -417,34 +191,23 @@ class App extends React.Component {
|
||||
{/*Main Section Header*/}
|
||||
<div className="d-flex justify-content-between flex-wrap flex-md-nowrap pt-3 pb-2 mb-3 border-bottom">
|
||||
<h4 className="mr-auto ml-3">
|
||||
{title} {this.state.namespace}
|
||||
{title}: {this.state.namespace}
|
||||
</h4>
|
||||
</div>
|
||||
{/*Main Section Content*/}
|
||||
<div className="d-flex flex-column border border-secondary flex-grow-1">
|
||||
<div className="bg-dark flex-grow-1 p-2 text-light">
|
||||
{this.state.messages
|
||||
.filter(
|
||||
m =>
|
||||
(m.to[0] === '#' && m.to === this.state.namespace) ||
|
||||
(m.to[0] !== '#' && m.from === this.state.namespace) ||
|
||||
(m.from === this.state.user.socketId &&
|
||||
m.to === this.state.namespace)
|
||||
)
|
||||
.map(m => {
|
||||
const rowColor = m.from === 'server' ? 'text-secondary' : ''
|
||||
return (
|
||||
<div className={`d-flex ${rowColor}`} key={m.id}>
|
||||
<div className="pr-3 text-nowrap">{m.date}</div>
|
||||
{m.from === 'server' ? null : (
|
||||
<div className="pr-3 text-nowrap">{m.nick}:</div>
|
||||
)}
|
||||
<div className="pr-3 flex-grow-1">{m.text}</div>
|
||||
</div>
|
||||
)
|
||||
})}
|
||||
.filter(m => m.namespace === this.state.namespace)
|
||||
.map(m => (
|
||||
<div className="d-flex justify-content-between" key={m.id}>
|
||||
<div>{m.date}</div>
|
||||
<div>{m.socketId}</div>
|
||||
<div>{m.text}</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
<form onSubmit={this.submitMessage}>
|
||||
<form onSubmit={this.handleSubmit}>
|
||||
<input
|
||||
className="bg-light p-2 w-100"
|
||||
name="message"
|
||||
@ -455,9 +218,9 @@ class App extends React.Component {
|
||||
<Button
|
||||
className="btn btn-dark"
|
||||
type="submit"
|
||||
onSubmit={this.submitMessage}
|
||||
onSubmit={this.handleSubmit}
|
||||
>
|
||||
submit as {this.state.user.nick}
|
||||
submit
|
||||
</Button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user