From 3aa171fbaf05d0ee5b82673443da51ed43719475 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 25 Sep 2015 17:36:53 -0400
Subject: moving things around

---
 bucky/app/bucky.js | 189 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 189 insertions(+)
 create mode 100644 bucky/app/bucky.js

(limited to 'bucky/app/bucky.js')

diff --git a/bucky/app/bucky.js b/bucky/app/bucky.js
new file mode 100644
index 0000000..43799fe
--- /dev/null
+++ b/bucky/app/bucky.js
@@ -0,0 +1,189 @@
+var db = require('../db')
+var util = require('../lib/util')
+var _ = require('lodash')
+
+var bucky = module.exports = {
+
+  /* INDEX */
+
+  ensureLatestThreads: function (req, res, next){
+    db.getLatestThreads().then(function(threads){
+      res.threads = threads
+      res.threads_ids = res.threads.pluck("id").sort()
+      res.keywords = _.uniq(res.threads.pluck("keyword"))
+      next()
+    })
+  },
+  ensureCommentCountsForThreads: function (req, res, next){
+    db.getCommentCounts(res.threads_ids).then(function(counts){
+      var lookup = {}
+      counts.forEach(function(c){
+        lookup[c.thread] = c
+      })
+      res.threads.forEach(function(thread){
+        thread.set("comment_count", lookup[thread.id].count)
+      })
+      next()
+    })
+  },
+  ensureFileCountsForThreads: function (req, res, next){
+    db.getFileCounts(res.threads_ids).then(function(counts){
+      var lookup = {}
+      counts.forEach(function(c){
+        lookup[c.thread] = c
+      })
+      res.threads.forEach(function(t){
+        var c = lookup[t.id]
+        t.set("file_count", c ? c.count : 0)
+      })
+      next()
+    })
+  },
+  ensureKeywordsForThreads: function (req, res, next){
+    db.getKeywords(res.keywords).then(function(keywords){
+      var lookup = {}
+      keywords.forEach(function(k){
+        lookup[k.get('keyword')] = k
+      })
+      res.threads.forEach(function(t){
+        var kw = t.get('keyword')
+        if (! kw) return
+        var k = lookup[kw]
+        if (! k) return
+        if (! t.get("color")) {
+          t.set("color", k.get("color"))
+        }
+      })
+      next()
+    })
+  },
+  ensureHootbox: function (req, res, next){
+    db.getCommentsForThread(1, 9, 0, "desc").then(function(hootbox){
+      res.hootbox = hootbox
+      next()
+    })
+  },
+  ensureLastlog: function (req, res, next){
+    db.getLastlog(6).then(function(lastlog){
+      res.lastlog = lastlog
+      next()
+    })
+  },
+      
+  /* DETAILS */
+  
+  ensureThread: function (req, res, next){
+    var id = req.params.id.replace(/\D/g, "")
+    if (! id) {
+      return res.sendStatus(404)
+    }
+    db.getThread(id).then(function(thread){
+      if (thread) {
+        res.thread = thread
+        next()
+      }
+      else {
+        res.sendStatus(404)
+      }
+    })
+  },
+  ensureKeywordForThread: function (req, res, next){
+    var keyword = res.thread.get('keyword')
+    if (! keyword) return next()
+    db.getKeyword(keyword).then(function(keyword){
+      res.keyword = keyword
+      next()
+    })
+  },
+  ensureCommentsForThread: function (req, res, next){
+    db.getCommentsForThread(res.thread.get('id')).then(function(comments){
+      res.comments = comments
+      next()
+    })
+  },
+  ensureFilesForThread: function (req, res, next){
+    db.getFilesForThread(res.thread.get('id')).then(function(files){
+      res.files = files
+      next()
+    })
+  },
+  
+  /* KEYWORDS */
+
+  ensureKeyword: function (req, res, next){
+    var keyword = req.params.keyword
+    if (! keyword) {
+      return res.sendStatus(404)
+    }
+    db.getKeyword(keyword).then(function(k){
+      if (! k) {
+        return res.sendStatus(404)
+      }
+      res.keyword = k
+      next()
+    })
+  },
+  ensureThreadsForKeyword: function (req, res, next){
+    var keyword = req.params.keyword
+    if (! keyword) {
+      res.sendStatus(404)
+    }
+    db.getThreadsForKeyword(keyword).then(function(threads){
+      res.threads = threads
+      res.threads_ids = res.threads.pluck("id").sort()
+      res.keywords = _.uniq(res.threads.pluck("keyword"))
+      next()
+    })
+  },
+  
+  /* MAIL */
+
+  ensureMailboxes: function (req, res, next){
+    var username = req.user.get('username')
+    var box = req.params.box
+    var mbox = username + "." + box
+    if (! box) {
+      res.sendStatus(404)
+    }
+    db.getMailboxes(username).then(function(boxes){
+      if (! boxes) {
+        return res.sendStatus(404)
+      }
+      if (! boxes.models.some(function(box){ return box.get('mbox') == mbox })) {
+        return res.sendStatus(404)
+      }
+      res.boxes = boxes
+      next()
+    })
+  },
+  ensureMailboxCounts: function (req, res, next){
+    db.getMailboxCounts(res.boxes.pluck("mbox")).then(function(counts){
+      var lookup = {}
+      counts.forEach(function(c){
+        lookup[c.mbox] = c
+      })
+      res.boxes.forEach(function(box){
+        var count = lookup[box.get('mbox')] ? lookup[box.get('mbox')].count : 0
+        box.set("count", count)
+      })
+      next()
+    })
+  },
+  ensureMessages: function (req, res, next){
+    db.getMessages(req.user.get('username'), req.params.box, 50, 0).then(function(messages){
+      res.messages = messages
+      next()
+    })
+  },
+  ensureMessage: function(req, res, next){
+    db.getMessage(req.params.id).then(function(message){
+      var username = req.user.get('username')
+      if (username !== message.get('recipient') && username !== message.get('sender')) {
+        res.sendStatus(404)
+        return
+      }
+      res.message = message
+      next()
+    })
+  }
+}
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From ed083ad3191a5d7d61abb21fa7dafec5121ecaab Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 25 Sep 2015 18:05:37 -0400
Subject: post comment

---
 bucky/app/bucky.js                          | 22 ++++++++++++++-
 bucky/app/index.js                          |  4 +--
 bucky/app/router.js                         |  8 +++++-
 bucky/db/index.js                           |  3 ++
 bucky/util/util.js                          |  2 ++
 public/assets/js/lib/views/index/hootbox.js | 23 +++++++++++++--
 public/assets/js/vendor/view/formview.js    | 44 ++++++++++++++---------------
 views/partials/hootbox.ejs                  |  2 +-
 8 files changed, 78 insertions(+), 30 deletions(-)

(limited to 'bucky/app/bucky.js')

diff --git a/bucky/app/bucky.js b/bucky/app/bucky.js
index 43799fe..008427d 100644
--- a/bucky/app/bucky.js
+++ b/bucky/app/bucky.js
@@ -1,5 +1,5 @@
 var db = require('../db')
-var util = require('../lib/util')
+var util = require('../util/util')
 var _ = require('lodash')
 
 var bucky = module.exports = {
@@ -136,6 +136,26 @@ var bucky = module.exports = {
     })
   },
   
+  /* COMMENTS */
+  
+  createComment: function (req, res, next){
+    if (! req.body.comment || ! req.body.comment.length) {
+      res.json({ error: "no comment" })
+      return
+    }
+    var data = {
+      thread: res.thread.get('id'),
+      parent_id: req.body.parent_id || -1,
+      username: req.user.get('username'),
+      date: util.now(),
+      comment: req.body.comment,
+    }
+    db.createComment(data).then(function(comment){
+      res.comment = comment
+      next()
+    })
+  },
+  
   /* MAIL */
 
   ensureMailboxes: function (req, res, next){
diff --git a/bucky/app/index.js b/bucky/app/index.js
index ad97526..d06b018 100644
--- a/bucky/app/index.js
+++ b/bucky/app/index.js
@@ -23,8 +23,8 @@ site.init = function(){
   app = express()
   app.set('port', 5000)
   app.set('view engine', 'ejs')
-  app.set('views', path.join(__dirname, '../views'))
-  app.use(express.static(path.join(__dirname, '../public')))
+  app.set('views', path.join(__dirname, '../../views'))
+  app.use(express.static(path.join(__dirname, '../../public')))
   app.use(bodyParser.json())
   app.use(bodyParser.urlencoded({ extended: false }))
   app.use( multer({ dest:'./uploads/' }).single("file") )
diff --git a/bucky/app/router.js b/bucky/app/router.js
index 7ac6599..fe7d336 100644
--- a/bucky/app/router.js
+++ b/bucky/app/router.js
@@ -66,8 +66,14 @@ module.exports = function(app){
   })
   app.post("/api/thread/:id/comment",
     middleware.ensureAuthenticated,
+    bucky.ensureThread,
+    // ensure thread privacy
+    bucky.createComment,
+    // add comments and files
     function(req, res){
-      // add comments and files
+      res.json({
+        comment: res.comment
+      })
   })
   app.delete("/api/thread/:id",
     middleware.ensureAuthenticated,
diff --git a/bucky/db/index.js b/bucky/db/index.js
index b6fa235..77e94fa 100644
--- a/bucky/db/index.js
+++ b/bucky/db/index.js
@@ -111,6 +111,9 @@ db.getCommentsForThread = function (id, limit, offset, order){
 db.getCommentCounts = function(ids){
   return knex.column('thread').count('* as count').select().from('comments').where('thread', 'in', ids).groupBy('thread')
 }
+db.createComment = function(comment){
+  return new Comment(comment).save()
+}
 
 
 /* KEYWORDS */
diff --git a/bucky/util/util.js b/bucky/util/util.js
index e67488b..d4b6b8a 100644
--- a/bucky/util/util.js
+++ b/bucky/util/util.js
@@ -2,3 +2,5 @@ var util = module.exports = {}
 
 util.sanitizeName = function (s){ return (s || "").replace(new RegExp("[^-_a-zA-Z0-9]", 'g'), "") }
 util.sanitize = function (s){ return (s || "").replace(/<>&/g, "") }
+
+util.now = function(){ return Math.floor( (+ new Date()) / 1000 ) }
diff --git a/public/assets/js/lib/views/index/hootbox.js b/public/assets/js/lib/views/index/hootbox.js
index 9d1cc3d..4a23d32 100644
--- a/public/assets/js/lib/views/index/hootbox.js
+++ b/public/assets/js/lib/views/index/hootbox.js
@@ -5,10 +5,13 @@ var HootBox = FormView.extend({
   events: {
   },
   
+  action: "/api/thread/1/comment",
+  
   initialize: function(){
     this.__super__.initialize.call(this)
     this.template = this.$(".template").html()
     this.$hoots = this.$("#hoots")
+    this.$comment = this.$("[name=comment]")
   },
   
   load: function(comments){
@@ -31,7 +34,23 @@ var HootBox = FormView.extend({
     this.$hoots.append($el)
   },
   
-  success: function(){
-    this.prependComment(comment)
+  validate: function(){
+    var errors = []
+    if (! this.$comment.val()) {
+      errors.push("no comment")
+      return errors
+    }
+    return null
+  },
+  
+  beforeSend: function(){
+    this.$comment.val("")
+  },
+  
+  showErrors: function(){
+  },
+  
+  success: function(data){
+    this.prependComment(data.comment)
   }
 })
\ No newline at end of file
diff --git a/public/assets/js/vendor/view/formview.js b/public/assets/js/vendor/view/formview.js
index 05b1ecb..7e77500 100644
--- a/public/assets/js/vendor/view/formview.js
+++ b/public/assets/js/vendor/view/formview.js
@@ -80,7 +80,7 @@ var FormView = View.extend({
     
     var action = typeof this.action == "function" ? this.action() : this.action
     if (! action) return
-
+    
     var request = $.ajax({
       url: action,
       type: this.method,
@@ -90,30 +90,27 @@ var FormView = View.extend({
       processData: false,
       contentType: false,
       success: function(response){
-
-          if (response.error) {
-            var errors = []
-            for (var key in response.error.errors) {
-              errors.push(response.error.errors[key].message);
-            }
-            if (errorCallback) {
-              errorCallback(errors)
-            }
-            else {
-              this.showErrors(errors)
-            }
-            return
+        if (response.error) {
+          var errors = []
+          for (var key in response.error.errors) {
+            errors.push(response.error.errors[key].message);
+          }
+          if (errorCallback) {
+            errorCallback(errors)
           }
           else {
-            if (successCallback) {
-              successCallback(response)
-            }
-            if (this.success) {
-              this.success(response)
-            }
+            this.showErrors(errors)
           }
-
-
+          return
+        }
+        else {
+          if (successCallback) {
+            successCallback(response)
+          }
+          if (this.success) {
+            this.success(response)
+          }
+        }
       }.bind(this),
       error: function(response){
       }.bind(this),
@@ -127,7 +124,8 @@ var FormView = View.extend({
     if (this.useMinotaur) {
       Minotaur.show()
     }
-
+    
+    this.beforeSend && this.beforeSend()
   },
 
 })
diff --git a/views/partials/hootbox.ejs b/views/partials/hootbox.ejs
index c65d264..872ca68 100644
--- a/views/partials/hootbox.ejs
+++ b/views/partials/hootbox.ejs
@@ -1,6 +1,6 @@
 <div class="bluebox" id="hootbox">
   <form>
-    <input type="text" name="hoot">
+    <input type="text" name="comment">
     <button><%= hoot_text %></button>
   </form>
   <table id="hoots">
-- 
cgit v1.2.3-70-g09d2