mirror of
https://gitlab.com/MrFry/mrfrys-node-server
synced 2025-04-01 20:24:18 +02:00
Chat devel values fix
This commit is contained in:
parent
df020a9a22
commit
417217bad6
1 changed files with 7 additions and 18 deletions
|
@ -45,28 +45,17 @@ function setup(data: SubmoduleData): void {
|
||||||
io.use(socketAuth({ userDB: userDB }))
|
io.use(socketAuth({ userDB: userDB }))
|
||||||
|
|
||||||
io.on('connection', (socket: ExtendedSocket) => {
|
io.on('connection', (socket: ExtendedSocket) => {
|
||||||
// TODO: UNCOMMENT
|
const userid = socket.user.id
|
||||||
// -----------------------------------------------------------------
|
|
||||||
// const userid = socket.user.id
|
|
||||||
// logger.Log(`Chat connect: ${userid}`, logger.GetColor('green'))
|
|
||||||
// -----------------------------------------------------------------
|
|
||||||
|
|
||||||
socket.on('join', function (data) {
|
|
||||||
// TODO: REMOVE
|
|
||||||
// -----------------------------------------------------------------
|
|
||||||
const userid = parseInt(data.id)
|
|
||||||
logger.Log(`Chat connect: ${userid}`, logger.GetColor('green'))
|
logger.Log(`Chat connect: ${userid}`, logger.GetColor('green'))
|
||||||
// -----------------------------------------------------------------
|
|
||||||
|
|
||||||
|
socket.on('join', function (/*data*/) {
|
||||||
socket.join(userid.toString())
|
socket.join(userid.toString())
|
||||||
let currUser: any = dbtools.Select(msgDB, 'users', {
|
let currUser: any = dbtools.Select(userDB, 'users', {
|
||||||
id: userid,
|
id: userid,
|
||||||
})
|
})
|
||||||
if (!currUser || currUser.length === 0) {
|
if (!currUser || currUser.length === 0) {
|
||||||
currUser = {
|
// TODO: handle somehow?
|
||||||
id: userid,
|
socket.disconnect()
|
||||||
}
|
|
||||||
dbtools.Insert(msgDB, 'users', currUser)
|
|
||||||
} else {
|
} else {
|
||||||
currUser = currUser[0]
|
currUser = currUser[0]
|
||||||
}
|
}
|
||||||
|
@ -134,7 +123,7 @@ function setup(data: SubmoduleData): void {
|
||||||
|
|
||||||
socket.on('chat message', (message) => {
|
socket.on('chat message', (message) => {
|
||||||
const { reciever, msg, type } = message
|
const { reciever, msg, type } = message
|
||||||
const recieverUser = dbtools.Select(msgDB, 'users', {
|
const recieverUser = dbtools.Select(userDB, 'users', {
|
||||||
id: reciever,
|
id: reciever,
|
||||||
})[0]
|
})[0]
|
||||||
if (!recieverUser) {
|
if (!recieverUser) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue