fix message order, account editing and deletion

Author: chassinat0r

controller/auth.js

@@ -140,9 +140,7 @@ const editAccount = async (req, res) => {
 
     const session = req.cookies.session // Get session from browser cookies
 
-    const id = await getIdFromSession(session) // Get user ID from session
-
-    const { username: oldUsername, password: oldHash } = await getUserDetails(id) // Get current details about user from database
+    const { id, username: oldUsername, password: oldHash } = await getUserDetails(session) // Get current details about user from database
 
     // Check if password given as verification is correct
     const verifyPasswordCorrect = await bcrypt.compare(verifyPassword, oldHash)
@@ -157,7 +155,7 @@ const editAccount = async (req, res) => {
     const password = req.body.password /// Get plaintext password
 
     // Check if new username is not already taken by another account
-    const usernameTaken = await accDb.get("SELECT * FROM users WHERE username = ?", username)
+    const usernameTaken = await db.get("SELECT * FROM users WHERE username = ?", username)
 
     if (usernameTaken && oldUsername !== username) { // Username is already in use and it's not the user's current username
         res.status(409).end("Username already in use.")
@@ -189,9 +187,7 @@ const deleteAccount = async (req, res) => {
 
     const session = req.cookies.session // Get session from cookie
 
-    const id = await getIdFromSession(session) // Get ID from session
-
-    const { password: hash } = await getUserDetails(id) // Get account password as bcrypt hash
+    const { id, password: hash } = await getUserDetails(session) // Get account password as bcrypt hash
 
     // Check that password for verification is correct
     const verifyPasswordCorrect = await bcrypt.compare(verifyPassword, hash)

handler/chat.js

@@ -24,7 +24,7 @@ const getChatLog = async (socket) => {
         driver: Database
     })
 
-    const messages = await db.all("SELECT * FROM chatlog ORDER BY id ASC LIMIT 300") // Obtain all information about the latest 300 messages
+    const messages = await db.all("SELECT * FROM chatlog ORDER BY id DESC LIMIT 300") // Obtain all information about the latest 300 messages
     await db.close()
 
     socket.emit('receive chatlog', messages) // Send the messages to the new client

public/scripts/home.js

@@ -44,18 +44,18 @@ socket.on('receive message', message => {
 
 // Handling the receiving of chatlog for new connections
 socket.on('receive chatlog', messages => {
-    messages.forEach(message => { // Go through each message of chatlog
-        const { username, content } = message
+    for (let i = messages.length-1; i > 0; i--) { // Go through each message of chatlog from last (oldest) to first (newest)
+        const { id, username, content } = messages[i]
 
         // Add message to chatlog
         let html = $('.home__container__chat-view__chatlog').html()
         html += `
             <div class="home__container__chat-view__chatlog__message">
-                <strong>${username}:</strong> ${content}
+                <strong>${id}. ${username}:</strong> ${content}
             </div>
         `
         $('.home__container__chat-view__chatlog').html(html)
-    })
+    }
 })
 
 // Handling the receiving of users list for new connections