Fix time display, fix file attachments not working properly after sending without refresh

backend/src/controllers/file-controller.ts

@@ -18,7 +18,16 @@ export const uploadFile = async (req: Request, res: Response) => {
 
     const result = await FileService.uploadFile(channelId, messageId, filePath, fileType!, fileSize!, originalName!);
     logger.info(`File ${originalName} uploaded to message ${messageId} as ${filePath}`);
-    res.json({ id: result.lastInsertRowid, channelId, messageId, filePath, fileType });
+    res.json({ 
+        id: result.lastInsertRowid,
+        channel_id: parseInt(channelId),
+        message_id: parseInt(messageId),
+        file_path: filePath,
+        file_type: fileType,
+        file_size: fileSize,
+        original_name: originalName,
+        created_at: new Date().toISOString()
+    });
 }
 
 

backend/src/services/file-service.ts

@@ -11,11 +11,16 @@ export const uploadFile = async (channelId: string, messageId: string, filePath:
     const result2 = updateQuery.run({ fileId: fileId, messageId: messageId });
 
     events.emit('file-uploaded', result.lastInsertRowid, channelId, messageId, filePath, fileType, fileSize, originalName);
-    return result2; ''
+    return result;
 }
 
 export const getFiles = async (messageId: string) => {
-    const query = db.prepare(`SELECT * FROM files WHERE messageId = $messageId`);
+    // Get the file linked to this message via the fileId in the messages table
+    const query = db.prepare(`
+        SELECT files.* FROM files 
+        JOIN messages ON messages.fileId = files.id 
+        WHERE messages.id = $messageId
+    `);
     const rows = query.all({ messageId: messageId });
     return rows;
 }