Skip to content
This repository has been archived by the owner on Apr 15, 2021. It is now read-only.

Commit

Permalink
Merge pull request #3 from OreoDivision/kick
Browse files Browse the repository at this point in the history
adds kicking into the chat
  • Loading branch information
YummyOreo authored Mar 29, 2021
2 parents d501ab6 + e6e1132 commit 26f60cd
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 1 deletion.
16 changes: 16 additions & 0 deletions public/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,18 @@ socket.on('room-created', (room, private) => {
roomContaner.append(roomLink)
})

socket.on(`kicked`, () => {
console.log('yay?')
socket.emit('leave')
})

socket.on('kick-success', kickName => {
var d = new Date();
hours = d.getHours();
minutes = d.getMinutes();
appendMessage(`System`, `${kickName} has been kicked!`, "system", hours, minutes);
})

socket.on('userList', data => {
for(id in data) {
console.log(id)
Expand Down Expand Up @@ -108,6 +120,10 @@ function appendMessage(name, message, type, hours, minute) {
const br = document.createElement('br');
messageElement.innerText = message;
messageName.innerText = `${name} | ${hours}:${minute}`;
if (type == 'system'){
messageElement.className = 'deep-purple'
messageName.className = 'deep-purple'
}
messageContaner.append(messageName)
messageContaner.append(messageElement)
messageContaner.append(br)
Expand Down
18 changes: 18 additions & 0 deletions server.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,24 @@ io.on('connection', socket => {
socket.on('send-chat-message', (room, message) => {
name = rooms[room].users[socket.id]
if (name == null) name = 'Guest'
if (message.startsWith('!')){
const [command, ...args] = message
.trim()
.substring('!'.length)
.split(/\s+/);
if (command === "kick"){
let kickName = args.slice(0).join(" ");
console.log(kickName)
for (user in rooms[room].users) {
if (rooms[room].users[user] == kickName) {
socket.to(user).emit('kicked', name)
socket.emit('kick-success', kickName)
return;
}
}
return;
}
}
socket.to(room).broadcast.emit('chat-message', { message: message, name: name });
})
socket.on('disconnect', () => {
Expand Down
3 changes: 2 additions & 1 deletion views/room.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
<p>Start Of Chat</p>
</div>
<form id='send-message-form'>
<input placeholder="Message" type="text" id="message-input" required>

<textarea placeholder="Message" rows="4" cols="50" form="send-message-form" id="message-input" required></textarea>
<button type='submit' id='send-message' class="waves-effect waves-light btn">Send</button>
</form>
</body>
Expand Down

0 comments on commit 26f60cd

Please sign in to comment.