mail qa

1 files changed, 16 insertions, 21 deletions

diff --git a/bucky/app/router.js b/bucky/app/router.js
index 4c94c19..8eb90e0 100644
--- a/bucky/app/router.js
+++ b/bucky/app/router.js
@@ -196,8 +196,7 @@ module.exports = function(app){
     middleware.ensureAuthenticated,
     function(req, res){
       res.render("pages/search", {title: "search" })
-    }
-  )
+    })
   app.get("/api/search",
     middleware.ensureAuthenticated,
     search.search,
@@ -215,8 +214,7 @@ module.exports = function(app){
       res.json({
         keywords: res.keywords,
       })
-    }
-  )
+    })
   app.get("/api/keyword/:keyword",
     middleware.ensureAuthenticated,
     bucky.ensureKeyword,
@@ -229,15 +227,13 @@ module.exports = function(app){
         keyword: res.keyword,
         threads: res.threads,
       })
-    }
-  )
+    })
   
   app.get("/mail/",
     middleware.ensureAuthenticated,
     function(req, res){
       res.render("pages/mailbox", {title: "your inbox" })
-    }
-  )
+    })
   app.get("/mail/compose",
     middleware.ensureAuthenticated,
     function(req, res){
@@ -245,14 +241,12 @@ module.exports = function(app){
         title: "new message",
         subject: fortune("subjects"),
       })
-    }
-  )
+    })
   app.get("/mail/:box",
     middleware.ensureAuthenticated,
     function(req, res){
       res.render("pages/mailbox", { title: "your " + util.sanitize(req.params.box) })
-    }
-  )
+    })
   app.get("/mail/compose/:username",
     middleware.ensureAuthenticated,
     function(req, res){
@@ -260,14 +254,12 @@ module.exports = function(app){
         title: "new message",
         subject: fortune("subjects"),
       })
-    }
-  )
+    })
   app.get("/mail/read/:id",
     middleware.ensureAuthenticated,
     function(req, res){
       res.render("pages/message", { title: "read message" })
-    }
-  )
+    })
   app.get("/api/mailbox/:box",
     middleware.ensureAuthenticated,
     bucky.ensureMailboxes,
@@ -279,20 +271,23 @@ module.exports = function(app){
         messages: res.messages,
         boxes: res.boxes,
       })
-    }
-  )
+    })
   app.get("/api/message/:id",
     middleware.ensureAuthenticated,
     bucky.ensureMessage,
+    bucky.markMessageUnread,
     function(req, res){
       res.json({
         message: res.message,
       })
-  })
-  app.post("/mail/",
+    })
+  app.post("/api/mail/send",
     middleware.ensureAuthenticated,
+    bucky.ensureRecipient,
+    bucky.sendMessage,
+    bucky.deleteDraft,
     function(req, res){
-      // send new mail
+      res.sendStatus(200)
     }
   )