From 34177d6b2db857187cfdbc5149522a7056afd04d Mon Sep 17 00:00:00 2001
From: Matjaz <matjaz85@gmail.com>
Date: Wed, 23 Feb 2022 23:33:17 +0100
Subject: [PATCH] Delo na timeline.

---
 app.js            |  2 +-
 routes/message.js | 26 +++++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index e0b5294..c9876e2 100644
--- a/app.js
+++ b/app.js
@@ -15,7 +15,7 @@ var followRouter = require('./routes/follow');
 var app = express();
 
 const db = require('./models');
-//db.sequelize.sync({ force: true });
+// db.sequelize.sync({ force: true });
 db.sequelize.sync();
 
 // view engine setup
diff --git a/routes/message.js b/routes/message.js
index 428cddf..65f7eb2 100644
--- a/routes/message.js
+++ b/routes/message.js
@@ -28,7 +28,9 @@ router.post('/add', async function(req, res, next) {
   var sessionId = req.cookies.sessionid;
   var user = await lib.getAuthUser(sessionId);
   if(user) {
-    user.createMessage({ body: req.body.body });
+    var message = await user.createMessage({ body: req.body.body });
+    console.log(message);
+    message.setUser(user);
     res.redirect('/');
   } else {
     res.redirect('/login');
@@ -68,4 +70,26 @@ router.get('/timeline2', async function(req, res, next) {
   }
 });
 
+router.get('/timeline3', async function(req, res, next) {
+  var sessionId = req.cookies.sessionid;
+  var user = await lib.getAuthUser(sessionId);
+  if(user) {
+    var follows = await user.getFollow();
+    var userList = [];
+    follows.forEach(element => {
+      userList.push(element.id);
+    });
+    var userMessages = await db.Message.findAll({
+      include: User,
+      where: {
+        '$User.id$': '1',
+      }
+    });
+    //console.log(await userMessages[0].getUsers());
+    res.send(userMessages);
+  } else {
+    res.redirect('/login');
+  }
+});
+
 module.exports = router;