Skip to content
Snippets Groups Projects
Commit 94fc5c31 authored by Alexander Tim Hobelsberger's avatar Alexander Tim Hobelsberger
Browse files

Private Message

parent fbb499f8
No related branches found
No related tags found
No related merge requests found
...@@ -13,6 +13,7 @@ const fs = require('fs'); ...@@ -13,6 +13,7 @@ const fs = require('fs');
const activeUsers = new Map(); const activeUsers = new Map();
const authenticationRoute = require('./routes/auth'); const authenticationRoute = require('./routes/auth');
const { response } = require('express'); const { response } = require('express');
const { resolve } = require('path');
//DB Connection //DB Connection
...@@ -61,11 +62,10 @@ io.on('connection', (socket) => { ...@@ -61,11 +62,10 @@ io.on('connection', (socket) => {
async function addUserToActiveUsers(response, socket) { async function addUserToActiveUsers(response, socket) {
return new Promise(resolve => { return new Promise(resolve => {
console.log("Response: " + response);
activeUsers.set(socket.id, response.name); activeUsers.set(socket.id, response.name);
var userArr = Array.from(activeUsers.values()); var userArr = Array.from(activeUsers.values());
console.log("UserArr: " + userArr);
io.emit('updateUserlist', { io.emit('updateUserlist', {
userList : userArr userList : userArr
...@@ -78,7 +78,6 @@ async function deleteUserFromActiveUsers(response, socket) { ...@@ -78,7 +78,6 @@ async function deleteUserFromActiveUsers(response, socket) {
return new Promise(resolve => { return new Promise(resolve => {
activeUsers.delete(socket.id); activeUsers.delete(socket.id);
var userArr = Array.from(activeUsers.values()); var userArr = Array.from(activeUsers.values());
console.log("activeUsers: ", activeUsers);
io.emit('updateUserlist', { io.emit('updateUserlist', {
userList : userArr userList : userArr
...@@ -104,32 +103,55 @@ io.on('connection', (socket) => { ...@@ -104,32 +103,55 @@ io.on('connection', (socket) => {
io.on('connection', (socket) => { io.on('connection', (socket) => {
socket.on('private message', (response) => { socket.on('private message', (response) => {
var private_msg = response.private_msg; var private_msg = response.private_msg;
var receiver = response.receiver; var receiver = response.receiver;
var sender = response.name; var sender = response.name;
activeUsers. recieverSocketID = getKeyFromVal(receiver);
if(recieverSocketID == "false"){
io.to(socket.id).emit('test', {
status : 401
})
}
io.emit(receiver, { io.to(recieverSocketID).emit('test', function(){console.log("emit priv. msg")} /* {
private_msg: private_msg, private_msg: private_msg,
receiver: receiver, receiver: receiver,
sender: sender sender: sender
} */)
}) })
}) })
async function getKeyFromVal(receiver){
return new Promise( () => {
var array = Array.from(activeUsers);
console.log("usersArray: " + array);
var receiverSocketId;
for(var i = 0; i<array.length; i++){
console.log("array[i] ", array[i][0]);
if(array[i][1] == receiver){
receiverSocketId = array[i][0];
console.log("Receiver ID in if: ", receiverSocketId);
resolve(receiverSocketId);
}else{
resolve("false");
}
}
}) })
}
//Logs message from Socket to Console //Logs message from Socket to Console
io.on('connection', (socket) => { io.on('connection', (socket) => {
socket.on('chat message', (response) => { socket.on('chat message', (response) => {
var msg = response.msg; var msg = response.msg;
console.log('message: ' + msg);
}); });
}); });
//Send Image File //Send Image File
io.on("connection", (socket) => { io.on("connection", (socket) => {
socket.on('sendImage', (file, callback) => { socket.on('sendImage', (file, callback) => {
console.log(file);
io.emit('image', file); io.emit('image', file);
}); });
}); });
...@@ -137,7 +159,6 @@ io.on("connection", (socket) => { ...@@ -137,7 +159,6 @@ io.on("connection", (socket) => {
//Send Video File //Send Video File
io.on("connection", (socket) => { io.on("connection", (socket) => {
socket.on('sendVideo', (file, callback) => { socket.on('sendVideo', (file, callback) => {
console.log(file);
io.emit('video', file); io.emit('video', file);
}); });
}); });
...@@ -145,7 +166,6 @@ io.on("connection", (socket) => { ...@@ -145,7 +166,6 @@ io.on("connection", (socket) => {
//Send Audio File //Send Audio File
io.on("connection", (socket) => { io.on("connection", (socket) => {
socket.on('sendAudio', (file, callback) => { socket.on('sendAudio', (file, callback) => {
console.log(file);
io.emit('audio', file); io.emit('audio', file);
}); });
}); });
......
...@@ -14,7 +14,6 @@ router.get('/', async(req, res) => { ...@@ -14,7 +14,6 @@ router.get('/', async(req, res) => {
try{ try{
const verify = jwt.verify(authHeader, process.env.ACCESS_TOKEN_SECRET); const verify = jwt.verify(authHeader, process.env.ACCESS_TOKEN_SECRET);
console.log(verify);
res.sendStatus(200); res.sendStatus(200);
} catch(err){ } catch(err){
console.log(err); console.log(err);
......
...@@ -62,7 +62,6 @@ ...@@ -62,7 +62,6 @@
var username = getCookie("username"); var username = getCookie("username");
socket.emit('userLogin', { socket.emit('userLogin', {
name : username name : username
}); });
...@@ -84,7 +83,8 @@ ...@@ -84,7 +83,8 @@
}) })
//Receive private Messages //Receive private Messages
socket.on(username, function(response){ socket.on('test' ,function(response){
console.log("Received priv. msg.");
var private_msg = response.private_msg; var private_msg = response.private_msg;
var sender = response.sender; var sender = response.sender;
var private_msg = response.private_msg; var private_msg = response.private_msg;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment