added / fixed some types

This commit is contained in:
mrfry 2022-03-14 19:35:42 +01:00
parent 5f12284bb8
commit bc5c293539
41 changed files with 4378 additions and 8304 deletions

View file

@ -13,6 +13,16 @@ interface ExtendedSocket extends Socket {
user: User
}
interface Message {
id: number
sender: number
reciever: number
msg: string
type: string
date: number
unread: number
}
function setup(data: SubmoduleData): void {
const { app, httpServer, httpsServer, userDB, publicdirs } = data
const msgDB = dbtools.GetDB(msgDbPath)
@ -28,8 +38,13 @@ function setup(data: SubmoduleData): void {
},
})
function chatMessageRead(data) {
const { sender, reciever } = data
function chatMessageRead({
sender,
reciever,
}: {
sender: number
reciever: number
}) {
dbtools.runStatement(
msgDB,
`update msgs
@ -50,7 +65,7 @@ function setup(data: SubmoduleData): void {
socket.on('join', function (/*data*/) {
socket.join(userid.toString())
const groups = dbtools
const groups: number[] = dbtools
.runStatement(
msgDB,
`select * from
@ -65,14 +80,14 @@ function setup(data: SubmoduleData): void {
)t
order by t.a asc`
)
.reduce((acc, x) => {
.reduce((acc: number[], x: { a: number }) => {
if (x.a !== userid) acc.push(x.a)
return acc
}, [])
socket.emit('prev messages', {
prevMsgs: groups.map((to) => {
const first = dbtools.runStatement(
const first: Message = dbtools.runStatement(
msgDB,
`select * from msgs
where sender = ${userid} and reciever = ${to} or
@ -147,7 +162,7 @@ function setup(data: SubmoduleData): void {
// socket.on('close', () => {})
})
app.post('/postchatfile', function (req: Request, res: any) {
app.post('/postchatfile', function (req: Request, res) {
logger.LogReq(req)
utils
.uploadFile(req, uloadFiles)
@ -189,12 +204,12 @@ function setup(data: SubmoduleData): void {
)t
order by t.a asc`
)
.reduce((acc, x) => {
.reduce((acc: number[], x: { a: number }) => {
if (x.a !== userid) acc.push(x.a)
return acc
}, [])
const prevMsgs = groups.map((to) => {
const prevMsgs = groups.map((to: number) => {
const first = dbtools.runStatement(
msgDB,
`select * from msgs
@ -207,7 +222,7 @@ function setup(data: SubmoduleData): void {
})
res.json({
unreads: prevMsgs.reduce((acc, msg) => {
unreads: prevMsgs.reduce((acc: number[], msg: Message) => {
if (msg && msg.unread === 1 && msg.sender !== userid) {
acc.push(msg.sender)
}