From 4d93061b1fc0e65eae035839e70cb8cb02ab43df Mon Sep 17 00:00:00 2001
From: Aaron Delaney <aaron.delaney29@mail.dcu.ie>
Date: Mon, 14 Mar 2016 00:26:06 +0000
Subject: [PATCH 01/27] Fix stream links

---
 server/views/partials/footer.ejs  |  2 +-
 server/views/partials/header.ejs  |  2 +-
 server/views/stream_index.ejs     |  3 ++-
 server/views/stream_plaintext.ejs | 20 ++++++++++++++++++++
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 server/views/stream_plaintext.ejs

diff --git a/server/views/partials/footer.ejs b/server/views/partials/footer.ejs
index 2cced08..3a163c4 100644
--- a/server/views/partials/footer.ejs
+++ b/server/views/partials/footer.ejs
@@ -11,7 +11,7 @@
 
     <% if (typeof page_length != "undefined") { %>
     $("#page_length").change(_ => {
-      window.location.href = "/stream/" + $("#page_length").val() + "/<%= page - 1 > 0? page - 1 : 0 %>";
+      window.location.href = "/stream?page_length=" + $("#page_length").val() + "page=<%= page - 1 > 0? page - 1 : 0 %>";
     });
     <% } %>
   });
diff --git a/server/views/partials/header.ejs b/server/views/partials/header.ejs
index 41dc0fb..d4d72b8 100644
--- a/server/views/partials/header.ejs
+++ b/server/views/partials/header.ejs
@@ -36,7 +36,7 @@
 
          <ul id="nav-mobile" class="right hide-on-med-and-down">
           <% if (typeof session != "undefined" && typeof session.username != "undefined") { %>
-          <li><a href="/stream/20/0">Stream</a></li>
+          <li><a href="/stream">Stream</a></li>
           <li>
             <a class="dropdown-button" href="#!" data-activates="dropdown1"><%= session.username %><i class="material-icons right">arrow_drop_down</i></a>
             <ul id="dropdown1" class="dropdown-content">
diff --git a/server/views/stream_index.ejs b/server/views/stream_index.ejs
index 4d65c12..403c126 100644
--- a/server/views/stream_index.ejs
+++ b/server/views/stream_index.ejs
@@ -17,6 +17,7 @@
           </select>
         </div>
       </div>
+
       <ul class="collection">
         <% if (typeof feeds == "undefined" || feeds.length < 1) { %>
         <li class="collection-item">
@@ -52,7 +53,7 @@
       <% if (page != 0) { %>
       <div class="row">
         <div class="col s6 offset-s3 center-align">
-          <a class="btn-large wave-effect waves-light" href="/stream/<%= page_length %>/<%= page %>">Load more</a>
+          <a class="btn-large wave-effect waves-light" href="/stream?page_length=<%= page_length %>&page=<%= page %>">Load more</a>
         </div>
       </div>
       <% } %>
diff --git a/server/views/stream_plaintext.ejs b/server/views/stream_plaintext.ejs
new file mode 100644
index 0000000..c4baef6
--- /dev/null
+++ b/server/views/stream_plaintext.ejs
@@ -0,0 +1,20 @@
+// feedlark plaintext
+
+<% if (typeof feeds == "undefined" || feeds.length < 1) { %>
+// failed to load your feeds. No data was received from the server.
+<%
+} else {
+  for (var i = 0; i < feeds.length; i++) {
+    var date = new Date(feeds[i].pub_date);
+    date = date.toLocaleDateString();
+    var url = feeds[i].feed.match(/https?:\/\/[^\/]+/g)[0];
+    var source_name_re = /https?:\/\/([^\/]+)/g;
+    var source_name = source_name_re.exec(feeds[i].feed)[1];
+%>
+
+title      <%= feeds[i].name %>
+url        <%= feeds[i].link %>
+published  <%= date %>
+from       <%= source_name %>
+
+<% } } %>

From c25cbbbc369f81c226f686e6e33b26cb4baf6879 Mon Sep 17 00:00:00 2001
From: Aaron Delaney <aaron.delaney29@mail.dcu.ie>
Date: Mon, 14 Mar 2016 03:23:52 +0000
Subject: [PATCH 02/27] Add plaintext endpoint

I also fixed pagination in the templates and added a go back button
in the normal stream.
---
 server/controllers/streams.js     | 45 +++++++++++++++++++-----
 server/controllers/users.js       | 57 +++++++++++++++++++++++++++++++
 server/middleware/db.js           |  3 +-
 server/middleware/routes.js       | 13 +++++--
 server/models/user.js             | 44 +++++++++++++++++++++++-
 server/views/partials/footer.ejs  |  2 +-
 server/views/profile.ejs          | 42 +++++++++++++++++++++--
 server/views/stream_index.ejs     | 15 +++++---
 server/views/stream_plaintext.ejs |  4 ---
 9 files changed, 201 insertions(+), 24 deletions(-)

diff --git a/server/controllers/streams.js b/server/controllers/streams.js
index 866b95b..a18d1d1 100755
--- a/server/controllers/streams.js
+++ b/server/controllers/streams.js
@@ -14,22 +14,51 @@ module.exports = {
 
     // Get & verify the page length & number
     // This Lo-Dash function is lovely
-    var page_length = _.toSafeInteger(req.params.page_length);
-    var page = _.toSafeInteger(req.params.page);
+    var page_length = _.toSafeInteger(req.query.page_length);
+    if (page_length <= 0) {
+      page_length = 20; // Default Page Length = 20
+    }
+    var page = _.toSafeInteger(req.query.page); // defaults to 0 if undefined
 
     getFeeds(req.session.username, feeds => {
 
       // Get a page worth of feeds
-      var pageinated_feeds = [];
-      for (var i = page * page_length; i < (page + 1) * page_length && i < feeds.length; i++) {
-        pageinated_feeds.push(feeds[i]);
-      }
+      var pageinated_feeds = _.slice(feeds, page*page_length, (page+1)*page_length);
+      var next_page = page + 1;
+      if ((page + 1) * page_length > feeds.length) next_page = 0;
+
+      res.status(200).render("stream_index", {
+        feeds: pageinated_feeds,
+        page: page,
+        next_page: next_page,
+        page_length: page_length
+      });
+    });
+  },
+
+  plaintext: (req, res) => {
+    var page_length = _.toSafeInteger(req.query.page_length);
+    if (page_length <= 0) {
+      page_length = 20; // Default Page Length = 20
+    }
+    var page = _.toSafeInteger(req.query.page);
+
+
+    var username = req.query.username;
+    res.type('.txt');
+
+    getFeeds(username, feeds => {
 
-      // Work out the next page number now, because Lo-Dash sorted out the param already
+      var pageinated_feeds = _.slice(feeds, page*page_length, (page+1)*page_length);
       var next_page = page + 1;
       if ((page + 1) * page_length > feeds.length) next_page = 0;
 
-      res.status(200).render("stream_index", {feeds: pageinated_feeds, page: next_page, page_length: page_length});
+      res.status(200).render("stream_plaintext", {
+        feeds: pageinated_feeds,
+        page: page,
+        next_page: next_page,
+        page_length: page_length
+      });
     });
   }
 };
diff --git a/server/controllers/users.js b/server/controllers/users.js
index f4a027f..fb1b9f3 100755
--- a/server/controllers/users.js
+++ b/server/controllers/users.js
@@ -7,6 +7,7 @@
 
 const bcrypt = require("bcrypt-nodejs");
 const userModel = require("../models/user");
+const crypto = require("crypto");
 const _ = require("lodash");
 
 module.exports = {
@@ -69,6 +70,62 @@ module.exports = {
         return res.redirect(302, "/user");
       });
     });
+  },
+
+  // Render the user profile
+  profile: (req, res) => {
+    userModel.findByUsername(req.session.username, user => {
+      res.status(200).render("profile", {
+        user: user
+      });
+    });
+  },
+
+  addToken: (req, res) => {
+    const username = req.session.username;
+    // TODO: add per token permissions
+
+    // Get the user's details from the DB
+    crypto.randomBytes(32, (err, buf) => {
+      if (err) return res.status(400).render("/user", {err: "Oops, something broke."});
+      const token = buf.toString('hex');
+      userModel.addToken(username, token, status => {
+
+        if (typeof status == "undefined" || status == "err") {
+          return res.redirect(400 , "/user");
+        }
+        else {
+          return res.redirect(302, "/user");
+        }
+      });
+    });
+  },
 
+  removeToken: (req, res) => {
+    const username = req.session.username;
+    const token = req.query.token;
+    // TODO: add per token permissions
+    userModel.removeToken(username, token, (data) => {
+      return res.redirect(302, "/user");
+    });
+  },
+
+  validToken: (req, res, next) => {
+    const username = req.query.username;
+    const token = req.query.token;
+    userModel.findByUsername(username, user => {
+      if ( user ) {
+        if (user.tokens[token]) {
+          next();
+        }
+        else {
+          res.status(403).end();
+        }
+      }
+      else {
+        res.status(403).end();
+      }
+    });
   }
+
 };
diff --git a/server/middleware/db.js b/server/middleware/db.js
index 29dfa65..459b81b 100755
--- a/server/middleware/db.js
+++ b/server/middleware/db.js
@@ -37,10 +37,9 @@ module.exports = {
 
   update: (db, collection, selector, data, cb) => {
     db.collection(collection).updateOne(selector, {$set: data}, (err, data) => {
-
       if (err) throw err;
 
-      return cb();
+      return cb(data);
     });
   },
 
diff --git a/server/middleware/routes.js b/server/middleware/routes.js
index 416fc9a..ba828a1 100755
--- a/server/middleware/routes.js
+++ b/server/middleware/routes.js
@@ -3,10 +3,12 @@
 //  like express and the auth middleware aren't imported N times
 
 const router = require("express").Router();
+
 const userController = require("../controllers/users");
 const feedController = require("../controllers/feeds");
 const streamController = require("../controllers/streams");
 
+
 // Checks if the client is authenticated
 function isAuthed(req, res, next) {
   if (req.session.username) {
@@ -40,7 +42,7 @@ router.get("/user/login", (req, res) => {
 });
 
 // Profile
-router.get("/user", isAuthed, (req, res) => { res.render("profile"); });
+router.get("/user", isAuthed, userController.profile);
 
 // Feeds pages
 
@@ -57,7 +59,14 @@ router.get("/feeds/remove", isAuthed, feedController.remove);
 router.get("/feeds", isAuthed, feedController.index);
 
 // Stream
-router.get("/stream/:page_length/:page", isAuthed, streamController.index);
+router.get("/stream", isAuthed, streamController.index);
+
+// Tokens (for API stuff!)
+router.get("/token/add", isAuthed, userController.addToken);
+router.get("/token/remove", isAuthed, userController.removeToken);
+
+// Plaintext Endpoint
+router.get("/plaintext", userController.validToken, streamController.plaintext);
 
 // Home/Index
 router.get("/", (req, res) => {
diff --git a/server/models/user.js b/server/models/user.js
index acf2eb3..4c2f62b 100755
--- a/server/models/user.js
+++ b/server/models/user.js
@@ -87,5 +87,47 @@ module.exports = {
         cb
       );
     }));
-  }
+  },
+
+  addToken: (username, token, cb) => {
+    if (!token || !username) {
+      return cb()
+    }
+    dbFuncs.transaction(db => dbFuncs.findOne(db, "user", {username: username}, user => {
+
+      // TODO Add and render error message
+
+      if (user.tokens) {
+        user.tokens[token] = true;
+      }
+      else {
+        user.tokens = {token:true};
+      }
+
+      // TODO: check for max tokens
+      dbFuncs.update(
+        db,
+        "user",
+        {username: username},
+        {tokens: user.tokens},
+        cb
+      );
+    }));
+  },
+
+  removeToken: (username, token, cb) => {
+    dbFuncs.transaction(db => dbFuncs.findOne(db, "user", {username: username}, user => {
+      if (typeof user.tokens != "undefined") {
+        delete user.tokens[token];
+      }
+      dbFuncs.update(
+        db,
+        "user",
+        {username: username},
+        {tokens: user.tokens},
+        cb
+      );
+    }));
+  },
+
 };
diff --git a/server/views/partials/footer.ejs b/server/views/partials/footer.ejs
index 3a163c4..ff27d51 100644
--- a/server/views/partials/footer.ejs
+++ b/server/views/partials/footer.ejs
@@ -11,7 +11,7 @@
 
     <% if (typeof page_length != "undefined") { %>
     $("#page_length").change(_ => {
-      window.location.href = "/stream?page_length=" + $("#page_length").val() + "page=<%= page - 1 > 0? page - 1 : 0 %>";
+      window.location.href = "/stream?page_length=" + $("#page_length").val() + "page=<%=page%>";
     });
     <% } %>
   });
diff --git a/server/views/profile.ejs b/server/views/profile.ejs
index f5f441e..18110ff 100644
--- a/server/views/profile.ejs
+++ b/server/views/profile.ejs
@@ -1,9 +1,47 @@
 <% include partials/header.ejs %>
+
 <div class="container">
   <div class="row">
-    <div class="col s6">
-      <h3>Hello, <%= session.username %></h3>
+    <div class="col s12 m12 l4">
+      <h2>Hello, <%= user.username %></h2>
+      <p>Thanks for taking part in the Feedlark alpha</p>
     </div>
+    <div class="col s12 m12 l8">
+      <h2>API Tokens</h2>
+      <ul class="collection">
+        <% if (typeof user.tokens == "undefined" || user.tokens.length < 1) { %>
+          <li class="collection-item">
+            <p class="center-align">No keys yet</p>
+          <li>
+          <%
+        } else {
+          var token_names = Object.keys(user.tokens);
+          for(var i = 0; i < token_names.length; i++) {
+            current_token = token_names[i];%>
+            <li class="collection-item">
+              <%= token_names[i] %>
+              <span class="secondary-content" style="text-align: right;">
+                <a href="/token/remove?token=<%=token_names[i]%>"><i class="material-icons">delete_forever</i></a>
+              </span>
+            </li>
+        <% } } %>
+    </ul>
+
+      <a class="waves-effect waves-light btn" href="/token/add"><i class="material-icons left">cloud</i>Generate new keys</a>
+      <p>Currently API Tokens will only enable plaintext requests.</p>
+
+      <h3>Plaintext Requests</h3>
+      <p>To make a plaintext request, generate a key and request the stream like so:
+        <br>
+        <code>- http://feedlark.com/plaintext?token=EXAMPLE_TOKEN&amp;username=<%= user.username %></code>
+      </p>
+    </div>
+  </div>
+
+
+
+
   </div>
+
 </div>
 <% include partials/footer.ejs %>
diff --git a/server/views/stream_index.ejs b/server/views/stream_index.ejs
index 403c126..ffab475 100644
--- a/server/views/stream_index.ejs
+++ b/server/views/stream_index.ejs
@@ -50,12 +50,19 @@
         <% } } %>
       </ul>
 
-      <% if (page != 0) { %>
       <div class="row">
-        <div class="col s6 offset-s3 center-align">
-          <a class="btn-large wave-effect waves-light" href="/stream?page_length=<%= page_length %>&page=<%= page %>">Load more</a>
+        <div class="col s3 offset-s3 center-align">
+          <% if (page > 0) { %>
+            <a class="btn-large wave-effect waves-light" href="/stream?page_length=<%= page_length %>&page=<%=page-1%>">Prev page</a>
+          <% } %>
         </div>
+        <% if (page > 0) { %>
+          <div class="col s3 center-align">
+        <% } else { %>
+           <div class="col s3 offset-s6 center-align">
+         <% } %>
+            <a class="btn-large wave-effect waves-light" href="/stream?page_length=<%= page_length %>&page=<%=next_page%>">Load more</a>
+          </div>
       </div>
-      <% } %>
     </div>
 <% include partials/footer.ejs %>
diff --git a/server/views/stream_plaintext.ejs b/server/views/stream_plaintext.ejs
index c4baef6..22c0664 100644
--- a/server/views/stream_plaintext.ejs
+++ b/server/views/stream_plaintext.ejs
@@ -1,5 +1,3 @@
-// feedlark plaintext
-
 <% if (typeof feeds == "undefined" || feeds.length < 1) { %>
 // failed to load your feeds. No data was received from the server.
 <%
@@ -11,10 +9,8 @@
     var source_name_re = /https?:\/\/([^\/]+)/g;
     var source_name = source_name_re.exec(feeds[i].feed)[1];
 %>
-
 title      <%= feeds[i].name %>
 url        <%= feeds[i].link %>
 published  <%= date %>
 from       <%= source_name %>
-
 <% } } %>

From 0bb31cdbf6e21fe353e0afbf3e99b1588e8dc47d Mon Sep 17 00:00:00 2001
From: Aaron Delaney <aaron.delaney29@mail.dcu.ie>
Date: Mon, 14 Mar 2016 03:28:19 +0000
Subject: [PATCH 03/27] Add linter that conforms to specs

---
 server/.jshintrc | 61 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)

diff --git a/server/.jshintrc b/server/.jshintrc
index 2b6f469..4d3468c 100644
--- a/server/.jshintrc
+++ b/server/.jshintrc
@@ -1,3 +1,62 @@
 {
-  "esversion": 6
+  /*
+   * ENVIRONMENTS
+   * =================
+   */
+
+  // Define globals exposed by modern browsers.
+  "browser": true,
+
+  // Define globals exposed by jQuery.
+  "jquery": true,
+
+  // Define globals exposed by Node.js.
+  "node": true,
+
+  // Allow ES6.
+  "esnext": true,
+
+  /*
+   * ENFORCING OPTIONS
+   * =================
+   */
+
+  // Force all variable names to use either camelCase style or UPPER_CASE
+  // with underscores.
+  "camelcase": true,
+
+  // Prohibit use of == and != in favor of === and !==.
+  "eqeqeq": true,
+
+  // Enforce tab width of 2 spaces.
+  "indent": 2,
+
+  // Prohibit use of a variable before it is defined.
+  "latedef": true,
+
+  // Enforce line length to 100 characters
+  "maxlen": 100,
+
+  // Require capitalized names for constructor functions.
+  "newcap": true,
+
+  // Enforce use of single quotation marks for strings.
+  "quotmark": "single",
+
+  // Enforce placing 'use strict' at the top function scope
+  "strict": true,
+
+  // Prohibit use of explicitly undeclared variables.
+  "undef": true,
+
+  // Warn when variables are defined but never used.
+  "unused": true,
+
+  /*
+   * RELAXING OPTIONS
+   * =================
+   */
+
+  // Suppress warnings about == null comparisons.
+  "eqnull": true
 }

From d62d85d8100dc4705376263e4a785479ea514fa6 Mon Sep 17 00:00:00 2001
From: Aaron Delaney <aaron.delaney29@mail.dcu.ie>
Date: Mon, 14 Mar 2016 03:31:58 +0000
Subject: [PATCH 04/27] Add token spec

---
 doc/db/user.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/db/user.md b/doc/db/user.md
index adbde4c..0422d75 100644
--- a/doc/db/user.md
+++ b/doc/db/user.md
@@ -10,6 +10,10 @@ Database to create entries in the finished G2G database.
 The user password will not be stored, instead, a salt and the hashed password
 and salt will be stored. These are stored in the same string in bcrypt.
 
+Tokens represents the randomly generated API tokens. Currently they point to a
+true value but this could be modified such that each token had validation date
+and permissions.
+
 Example Document
 ----------------
 		password = "ilovegnuhurd", 8 rounds
@@ -22,5 +26,6 @@ Example Document
 	"password": "$2a$08$ThzPc3zm84JPb6LmvcfCkuXkwyh8H.Mn1VC4EKu9guksI9lbdb7Fa",
 	"subscribed_feeds": ["news.ycombinator.com/rss", "pssd.computing.dcu.ie/rss.xml"],
 	"words": {"butter":2, "milk":13, "antidisestablishmentarianism":-33},
+	"tokens": {"add15f620657bb3fd8ce7fa9611f1aaba8717559295706a6d80f9e8cf58e81d7":true}
 }
 ```

From 54806e2f5cb0aaa8c638bd78d390be3f8b015e4c Mon Sep 17 00:00:00 2001
From: Aaron Delaney <aaron.delaney29@mail.dcu.ie>
Date: Mon, 14 Mar 2016 03:54:30 +0000
Subject: [PATCH 05/27] Fix old/not in use styleguide references

---
 doc/style.md          | 25 ++++++------------
 server/.jshintrc      | 60 +------------------------------------------
 server/models/user.js |  2 +-
 3 files changed, 10 insertions(+), 77 deletions(-)

diff --git a/doc/style.md b/doc/style.md
index 0b094bc..f0907ed 100644
--- a/doc/style.md
+++ b/doc/style.md
@@ -1,26 +1,17 @@
 # Style guide.
-This page will hold links to the style guides that the feedlark team will aim to uphold for this project. This is done to improve readability and functionality in our code.
-
-### Markdown
-The following is a link to the Google markdown style guide which we will use for all markdown code in our project.
-https://github.com/google/styleguide/blob/gh-pages/docguide/style.md
+This page will hold links to the style guides that the feedlark team will aim to
+uphold for this project. This is done to improve readability and functionality
+in our code.
 
 ### Python Style guide
-The following is a link to the Pocoo style guide which we will use for all Python code in our project.
+The following is a link to the Pocoo style guide which we will use for all
+Python code in our project.
 http://www.pocoo.org/internal/styleguide/
 
 ### Go Style guide
-The following is a link to the golang style guide which we will use for all Go code in our project.
+The following is a link to the `golang` style guide which we will use for all
+Go code in our project.
 https://github.com/golang/go/wiki/CodeReviewComments
 
 ### JavaScript Style guide
-The following is a link to the airbnb JavaScript style guide which we will use for all JavaScript code in our project
-https://github.com/airbnb/javascript/blob/master/README.md
-
-### Shell Script Style guide
-The following is a link to the Google Bash style guide which we will use for all Bash Script code in our project
-https://google.github.io/styleguide/shell.xml
-
-### HTML/CSS Style guide
-The following is a link to the Google HTML/CSS style guide which we will use for all HTML/CSS code in our project
-https://google.github.io/styleguide/htmlcssguide.xml
+All our javascript is run against [jshint](http://jshint.com/).
diff --git a/server/.jshintrc b/server/.jshintrc
index 4d3468c..59f01b9 100644
--- a/server/.jshintrc
+++ b/server/.jshintrc
@@ -1,62 +1,4 @@
 {
-  /*
-   * ENVIRONMENTS
-   * =================
-   */
-
-  // Define globals exposed by modern browsers.
-  "browser": true,
-
-  // Define globals exposed by jQuery.
-  "jquery": true,
-
-  // Define globals exposed by Node.js.
   "node": true,
-
-  // Allow ES6.
-  "esnext": true,
-
-  /*
-   * ENFORCING OPTIONS
-   * =================
-   */
-
-  // Force all variable names to use either camelCase style or UPPER_CASE
-  // with underscores.
-  "camelcase": true,
-
-  // Prohibit use of == and != in favor of === and !==.
-  "eqeqeq": true,
-
-  // Enforce tab width of 2 spaces.
-  "indent": 2,
-
-  // Prohibit use of a variable before it is defined.
-  "latedef": true,
-
-  // Enforce line length to 100 characters
-  "maxlen": 100,
-
-  // Require capitalized names for constructor functions.
-  "newcap": true,
-
-  // Enforce use of single quotation marks for strings.
-  "quotmark": "single",
-
-  // Enforce placing 'use strict' at the top function scope
-  "strict": true,
-
-  // Prohibit use of explicitly undeclared variables.
-  "undef": true,
-
-  // Warn when variables are defined but never used.
-  "unused": true,
-
-  /*
-   * RELAXING OPTIONS
-   * =================
-   */
-
-  // Suppress warnings about == null comparisons.
-  "eqnull": true
+  "esnext": true
 }
diff --git a/server/models/user.js b/server/models/user.js
index 4c2f62b..867d5a4 100755
--- a/server/models/user.js
+++ b/server/models/user.js
@@ -91,7 +91,7 @@ module.exports = {
 
   addToken: (username, token, cb) => {
     if (!token || !username) {
-      return cb()
+      return cb();
     }
     dbFuncs.transaction(db => dbFuncs.findOne(db, "user", {username: username}, user => {
 

From b1e83f42e624fa45838b64e3464ebab65e18c620 Mon Sep 17 00:00:00 2001
From: m1cr0man <lucas@vccomputers.ie>
Date: Mon, 14 Mar 2016 06:38:22 +0000
Subject: [PATCH 06/27] Tidy stream previous/next buttons

---
 server/views/stream_index.ejs | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/server/views/stream_index.ejs b/server/views/stream_index.ejs
index ffab475..7c5a5f1 100644
--- a/server/views/stream_index.ejs
+++ b/server/views/stream_index.ejs
@@ -40,8 +40,8 @@
             From: <%= source_name %>
           </p>
           <span class="secondary-content" style="text-align: right;">
-          <a href="/feeds/dislike?url=<%= feeds[i].link %>"><i class="material-icons">thumb_down</i></a>
-          <a href="/feeds/like?url=<%= feeds[i].link %>"><i class="material-icons">thumb_up</i></a>
+          <a href="/streams/dislike?url=<%= feeds[i].link %>&source=<%= feeds[i].feed %>"><i class="material-icons">thumb_down</i></a>
+          <a href="/streams/like?url=<%= feeds[i].link %>&source=<%= feeds[i].feed %>"><i class="material-icons">thumb_up</i></a>
           <br />
           <a href="<%= feeds[i].link %>"><i class="material-icons">send</i></a>
           </span>
@@ -51,18 +51,13 @@
       </ul>
 
       <div class="row">
-        <div class="col s3 offset-s3 center-align">
+        <div class="col s12 center-align">
           <% if (page > 0) { %>
             <a class="btn-large wave-effect waves-light" href="/stream?page_length=<%= page_length %>&page=<%=page-1%>">Prev page</a>
           <% } %>
+          <% if (next_page != "0") { %>
+            <a class="btn-large wave-effect waves-light" href="/stream?page_length=<%= page_length %>&page=<%=next_page%>">Next page</a>
+          <% } %>
         </div>
-        <% if (page > 0) { %>
-          <div class="col s3 center-align">
-        <% } else { %>
-           <div class="col s3 offset-s6 center-align">
-         <% } %>
-            <a class="btn-large wave-effect waves-light" href="/stream?page_length=<%= page_length %>&page=<%=next_page%>">Load more</a>
-          </div>
-      </div>
     </div>
 <% include partials/footer.ejs %>

From 51f04bafcbe14846e504859eeabe7843f64dd0fc Mon Sep 17 00:00:00 2001
From: m1cr0man <lucas@vccomputers.ie>
Date: Mon, 14 Mar 2016 08:08:22 +0000
Subject: [PATCH 07/27] Add filtering by key words and source

---
 server/controllers/feeds.js   |  6 ++++--
 server/controllers/streams.js | 28 +++++++++++++++++++++++---
 server/controllers/users.js   |  1 +
 server/models/user.js         |  4 ++--
 server/views/stream_index.ejs | 37 ++++++++++++++++++++++++++++++-----
 5 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/server/controllers/feeds.js b/server/controllers/feeds.js
index 987b962..ca14b89 100755
--- a/server/controllers/feeds.js
+++ b/server/controllers/feeds.js
@@ -33,12 +33,13 @@ module.exports = {
     feedModel.create(url, db => {
 
       // Add to current user
-      userModel.addFeed(db, req.session.username, url, _ => {
+      userModel.addFeed(db, req.session.username, url, subscribed_feeds => {
         // Call gearman
         gearman.startJob('update-single-feed', url, undefined, () => {});
 
         // Return to feed manager page
         req.session.msg = "Successfully added feed!";
+        req.session.subscribed_feeds = subscribed_feeds;
         return res.redirect(302, "/feeds");
       });
     });
@@ -55,10 +56,11 @@ module.exports = {
     }
     var url = req.query.url.toLowerCase();
 
-    userModel.removeFeed(req.session.username, url, _ => {
+    userModel.removeFeed(req.session.username, url, subscribed_feeds => {
 
       // Return to feed manager page
       req.session.msg = "Successfully removed feed!";
+      req.session.subscribed_feeds = subscribed_feeds;
       return res.redirect(302, "/feeds");
     });
   }
diff --git a/server/controllers/streams.js b/server/controllers/streams.js
index a18d1d1..fc8b6d4 100755
--- a/server/controllers/streams.js
+++ b/server/controllers/streams.js
@@ -20,10 +20,29 @@ module.exports = {
     }
     var page = _.toSafeInteger(req.query.page); // defaults to 0 if undefined
 
+    // Sort out the filters
+    var keywords = [];
+    if (typeof req.query.keywords != "undefined" && req.query.keywords.length > 1) {
+      keywords = req.query.keywords.split(" ").map(val => val.toLowerCase());
+    }
+    console.log(keywords);
+
     getFeeds(req.session.username, feeds => {
 
-      // Get a page worth of feeds
-      var pageinated_feeds = _.slice(feeds, page*page_length, (page+1)*page_length);
+      // Filter the feeds
+      var filtered_feeds = feeds.filter((feed, index, src) => {
+
+        // Match with the filters
+        return (typeof req.query.source == "undefined" || req.query.source.length < 1 || feed.feed == req.query.source) &&
+               (keywords.length < 1 || keywords.every(val => feed.name.toLowerCase().includes(val)));
+      });
+
+      // Make sure the page number is less than the max available feeds
+      while (page > filtered_feeds / page_length) page -= 1;
+
+      // Take a page worth of feeds
+      var pageinated_feeds = _.slice(filtered_feeds, page*page_length, (page+1)*page_length);
+
       var next_page = page + 1;
       if ((page + 1) * page_length > feeds.length) next_page = 0;
 
@@ -31,7 +50,10 @@ module.exports = {
         feeds: pageinated_feeds,
         page: page,
         next_page: next_page,
-        page_length: page_length
+        page_length: page_length,
+        subscribed_feeds: req.session.subscribed_feeds,
+        keywords: req.query.keywords,
+        source: req.query.source
       });
     });
   },
diff --git a/server/controllers/users.js b/server/controllers/users.js
index fb1b9f3..d3ef7d9 100755
--- a/server/controllers/users.js
+++ b/server/controllers/users.js
@@ -31,6 +31,7 @@ module.exports = {
 
           // Set session vars and redirect
           req.session.username = user.username;
+          req.session.subscribed_feeds = user.subscribed_feeds;
           req.session.msg = "Successfully logged in.";
           return res.redirect(302, "/user");
         });
diff --git a/server/models/user.js b/server/models/user.js
index 867d5a4..b0270ea 100755
--- a/server/models/user.js
+++ b/server/models/user.js
@@ -64,7 +64,7 @@ module.exports = {
         "user",
         {username: username},
         {subscribed_feeds: user.subscribed_feeds},
-        cb
+        _ => cb(user.subscribed_feeds)
       );
     });
   },
@@ -84,7 +84,7 @@ module.exports = {
         "user",
         {username: username},
         {subscribed_feeds: user.subscribed_feeds},
-        cb
+        _ => cb(user.subscribed_feeds)
       );
     }));
   },
diff --git a/server/views/stream_index.ejs b/server/views/stream_index.ejs
index 7c5a5f1..5cf9706 100644
--- a/server/views/stream_index.ejs
+++ b/server/views/stream_index.ejs
@@ -6,22 +6,49 @@
         </div>
       </div>
 
-      <div class="row">
-        <div class="col s2">
-          <label>Items per page</label>
-          <select id="page_length" class="browser-default">
+      <form class="row" method="GET" action="/stream">
+        <input type="hidden" name="page" value="<%= page %>">
+        <div class="input-field col s3">
+          <select name="page_length">
             <option<%= page_length == 5 ? ' selected' : '' %>>5</option>
             <option<%= page_length == 10? ' selected' : '' %>>10</option>
             <option<%= page_length == 20? ' selected' : '' %>>20</option>
             <option<%= page_length == 50? ' selected' : '' %>>50</option>
           </select>
+          <label for="page_length">Items per page</label>
         </div>
-      </div>
+        <div class="input-field col s3">
+          <input name="keywords" placeholder="Enter Key Words" type="text" class="validate" value="<%= keywords %>">
+          <label for="keywords">Key Words</label>
+        </div>
+        <div class="input-field col s3">
+          <select name="source">
+            <option value=""<%= source.length < 1? ' selected' : '' %>>Any</option>
+            <%
+              for (var i = 0; i < subscribed_feeds.length; i++) {
+                var source_name_re = /https?:\/\/([^\/]+)/g;
+                var source_name = source_name_re.exec(subscribed_feeds[i])[1];
+            %>
+            <option value="<%= subscribed_feeds[i] %>"<%= source == subscribed_feeds[i]? ' selected' : '' %>><%= source_name %></option>
+            <% } %>
+          </select>
+          <label for="source">Source</label>
+        </div>
+        <div class="input-field col s3">
+          <button class="btn waves-effect waves-light" type="submit">
+            Filter <i class="material-icons right">send</i>
+          </button>
+        </div>
+      </form>
 
       <ul class="collection">
         <% if (typeof feeds == "undefined" || feeds.length < 1) { %>
         <li class="collection-item">
+          <% if (keywords.length < 1 && source.length < 1) { %>
           <p class="center-align">Failed to load your feeds. No data was received from the server</p>
+          <% } else { %>
+          <p class="center-align">No matches</p>
+          <% } %>
         </div>
         <%
         } else {

From c11e4e7b6f3f0e68fcb4196debe4bccac48f5464 Mon Sep 17 00:00:00 2001
From: m1cr0man <lucas@vccomputers.ie>
Date: Mon, 14 Mar 2016 08:22:49 +0000
Subject: [PATCH 08/27] Fix page changing

---
 server/controllers/streams.js    |  2 +-
 server/views/partials/footer.ejs | 18 +++++++-----------
 server/views/stream_index.ejs    |  8 ++++----
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/server/controllers/streams.js b/server/controllers/streams.js
index fc8b6d4..bd8a4a3 100755
--- a/server/controllers/streams.js
+++ b/server/controllers/streams.js
@@ -44,7 +44,7 @@ module.exports = {
       var pageinated_feeds = _.slice(filtered_feeds, page*page_length, (page+1)*page_length);
 
       var next_page = page + 1;
-      if ((page + 1) * page_length > feeds.length) next_page = 0;
+      if ((page + 1) * page_length > pageinated_feeds.length) next_page = 0;
 
       res.status(200).render("stream_index", {
         feeds: pageinated_feeds,
diff --git a/server/views/partials/footer.ejs b/server/views/partials/footer.ejs
index ff27d51..33c104a 100644
--- a/server/views/partials/footer.ejs
+++ b/server/views/partials/footer.ejs
@@ -4,23 +4,19 @@
   <!-- Materialize JS -->
   <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.5/js/materialize.js"></script>
 
-  <!-- Selections -->
+  <!-- Stream page previous/next buttons -->
   <script type="text/javascript">
-  $(document).ready(_ => {
-    $("select").material_select();
-
-    <% if (typeof page_length != "undefined") { %>
-    $("#page_length").change(_ => {
-      window.location.href = "/stream?page_length=" + $("#page_length").val() + "page=<%=page%>";
-    });
-    <% } %>
-  });
+    function change_page(page) {
+      $("[name='page']").val(page);
+      $("form").submit();
+    }
   </script>
 
-  <!-- Materialize Parallax -->
+  <!-- Materialize Stuff -->
   <script type="text/javascript">
     $(document).ready(_ => {
       $('.parallax').parallax();
+      $("select").material_select();
     });
   </script>
   <% if (typeof session != "undefined" && typeof session.msg != "undefined") { %>
diff --git a/server/views/stream_index.ejs b/server/views/stream_index.ejs
index 5cf9706..f810fbb 100644
--- a/server/views/stream_index.ejs
+++ b/server/views/stream_index.ejs
@@ -7,7 +7,7 @@
       </div>
 
       <form class="row" method="GET" action="/stream">
-        <input type="hidden" name="page" value="<%= page %>">
+        <input type="hidden" name="page" value="0">
         <div class="input-field col s3">
           <select name="page_length">
             <option<%= page_length == 5 ? ' selected' : '' %>>5</option>
@@ -80,10 +80,10 @@
       <div class="row">
         <div class="col s12 center-align">
           <% if (page > 0) { %>
-            <a class="btn-large wave-effect waves-light" href="/stream?page_length=<%= page_length %>&page=<%=page-1%>">Prev page</a>
+            <a class="btn-large wave-effect waves-light" onclick="change_page(<%= page-1 %>);">Prev page</a>
           <% } %>
-          <% if (next_page != "0") { %>
-            <a class="btn-large wave-effect waves-light" href="/stream?page_length=<%= page_length %>&page=<%=next_page%>">Next page</a>
+          <% if (next_page > 0) { %>
+            <a class="btn-large wave-effect waves-light" onclick="change_page(<%= next_page%>);">Next page</a>
           <% } %>
         </div>
     </div>

From 1c62435aa37c50905fba6298b6988509fbb3847e Mon Sep 17 00:00:00 2001
From: Cian Ruane <cian.ruane1@gmail.com>
Date: Mon, 14 Mar 2016 13:37:06 +0000
Subject: [PATCH 09/27] Add inital gearman code

---
 aggregator/kw_score.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/aggregator/kw_score.py b/aggregator/kw_score.py
index 2afc215..b0c26ad 100644
--- a/aggregator/kw_score.py
+++ b/aggregator/kw_score.py
@@ -1,5 +1,7 @@
 from datetime import datetime
 from spacy.en import English
+from bson import BSON
+import gearman
 
 #This is outside a function so it runs only once, on import.
 nlp = English()
@@ -93,3 +95,11 @@ def fast_score(article_words, user_words):
         return total/float(total_count)
     else:
         return 0
+
+def fast_score_gm(worker, job):
+
+
+if __name__ == '__main__':
+	log("Starting Gearman worker")
+	gm_worker = gearman.GearmanWorker(['localhost:4730'])
+

From f2dec84720aa43cfc79bed4b816f6c16751629fc Mon Sep 17 00:00:00 2001
From: Aaron Delaney <aaron.delaney29@mail.dcu.ie>
Date: Mon, 14 Mar 2016 13:57:30 +0000
Subject: [PATCH 10/27] Update documentation

---
 server/README.md | 39 ++++++++++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/server/README.md b/server/README.md
index 1b038a0..a62921d 100644
--- a/server/README.md
+++ b/server/README.md
@@ -19,34 +19,55 @@ Feedlark Web Server
 Requirements & Setup
 --------------------
 
-The Feedlark Vagrant box will provide you with all the tools needed to run the web server. If you have not set it up already, see the instructions in the main README.md located in the root of the repository.
+The Feedlark Vagrant box will provide you with all the tools needed to run the
+web server. If you have not set it up already, see the instructions in the main
+ README.md located in the root of the repository.
 
 Attention Windows Vagrant Users
 -------------------------------
 
+Make sure you start your Command Prompt as Admin.
+
 Run `vagrant up` as admin. Not doing that causes problems when `npm install`
 trys to make symlinks in the directory. Admin is required so vagrant can
 force VirtualBox to allow symlinks.
 
-Anyway, to do that, make sure you start your Command Prompt as Admin.
-
 Usage
 -----
 
-First, make sure you are in the server folder inside the Vagrant box with the commands `vagrant ssh` and `cd /vagrant/server`
+First, make sure you are in the server folder inside the Vagrant box with the
+commands `vagrant ssh` and `cd /vagrant/server`
 
 
 Here's a list of what you can do:
 
 | command         | description                                               |
 | -------         | -----------                                               |
-| `npm run start` | starts the server, using `npm bin/www`                    |
+| `npm run start` | starts the server, using `node bin/www`                   |
 | `npm run test`  | starts the mocha.js tests located in `tests/`             |
+| `npm run hint`  | lint everything                                           |
 
 Once started, the server will be available on http://192.168.2.2:3000
 
-Here's a list of what we _maybe should_ be able to do:
+Pagination
+----------
 
-| command         | description                                               |
-| -------         | -----------                                               |
-| `npm run lint`  | lint everything                                           |
+Query strings control how much data is loaded per page.
+
+| query string   | arguments | description                |
+| ------------   | --------- | --------------------       |
+|  `page`        | int       | Current page to view       |
+|  `page_length` | int       | Amount of links per page   |
+
+
+Plaintext
+----------
+
+To access the plaintext endpoint, first generate an API token in your profile
+page.
+
+To make a plaintext request, generate a key and request the stream like so:
+
+    http://feedlark.com/plaintext?token=$token&username=$username
+
+    where $token is your token and $username is your username

From 616e2c04002fdb406d28ce9f438048eb49625c37 Mon Sep 17 00:00:00 2001
From: Cian Ruane <cian.ruane1@gmail.com>
Date: Mon, 14 Mar 2016 14:00:00 +0000
Subject: [PATCH 11/27] Add score gm worker

---
 aggregator/kw_score.py | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/aggregator/kw_score.py b/aggregator/kw_score.py
index b0c26ad..dd91e70 100644
--- a/aggregator/kw_score.py
+++ b/aggregator/kw_score.py
@@ -96,10 +96,36 @@ def fast_score(article_words, user_words):
     else:
         return 0
 
-def fast_score_gm(worker, job):
+def score_gm(worker, job):
+	word_data = BSON(job.data).decode()
+	try:
+		a_words = word_data['article_words']
+		u_words = word_data['user_words']
+	except:
+		log("Problem with data provided",level=2)
+		return str(BSON.encode({"status":"error","description":"Problem with data provided"}))
+
+	try:
+		a_score = score(a_words,u_words)
+	except:
+		log("Problem when scoring, is the data in the right format?")
+		return str(BSON.encode({"status":"error","description":"Problem when scoring, is the data in the right format?"}))
+
+	return str(BSON.encode({"status":"ok","score":a_score}))
+
 
 
+def fast_score_gm(worker, job):
+	return
+
 if __name__ == '__main__':
 	log("Starting Gearman worker")
 	gm_worker = gearman.GearmanWorker(['localhost:4730'])
+	gm_worker.set_client_id('kw-scoring')
+	
+	log("Registering tasks")
+	gm_worker.register_task('fast_score', fast_score_gm)
+	gm_worker.register_task('score', score_gm)
+
+	gm_worker.work()
 

From 7e97ad6f0c002d0621dffd7f29d296a2845dd180 Mon Sep 17 00:00:00 2001
From: iandioch <iandioch11@gmail.com>
Date: Mon, 14 Mar 2016 14:16:51 +0000
Subject: [PATCH 12/27] Update pickled model in db

---
 update_opinion/updater.py | 40 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/update_opinion/updater.py b/update_opinion/updater.py
index 1f58f77..7817523 100644
--- a/update_opinion/updater.py
+++ b/update_opinion/updater.py
@@ -1,7 +1,10 @@
 import gearman
 import bson
+import pickle
 from datetime import datetime
 
+from sklearn import linear_model
+
 gearman_client = None
 
 def log(level, message):
@@ -19,6 +22,42 @@ def update_topic_counts(old_topics, changes, is_positive):
             old_topics[change] = diff
     return old_topics
 
+def update_model(user_data, article_data, is_positive):
+    """update the actual model in the user db with the new data"""
+    model = None
+    log(0, "Getting pickled model")
+    if "model" not in user_data:
+        log(1, "No model included in user data, creating new one.")
+        model = linear_model.SGDClassifier(loss='log')
+    else:
+        try:
+            pickled_model = user_data["model"]
+            model = pickle.loads(pickled_model)
+        except Exception as e:
+            log(2, "Error depickling model: " + str(e))
+            model = linear_model.SGDClassifier(loss='log')
+
+    log(0, "Training model with new data")
+    topic_crossover = 0 # a comparison of how close the articles are in terms of topic, taken from the worker in /aggregator
+    age = (datetime.now() - article_data['pub_date']).total_seconds()*1000 # get the number of millis in difference
+
+    inputs = [topic_crossover, age]
+    output = 0 if is_positive else 1
+    log(0, str(inputs) + " " + str(output))
+    try:
+        model.partial_fit([inputs], [output], classes=[0, 1])
+    except Exception as e:
+        log(2, "Could not train model: " + str(e))
+    
+    log(0, "Repickling model")
+    try:
+        user_data['model'] = pickle.dumps(model)
+    except Exception as e:
+        log(2, "Error pickling model: " + str(e))
+    return user_data
+    
+        
+
 def add_update_to_db(data):
     """log the given user opinion to the vote db collection"""
     req_data = {"database":"feedlark", "collection":"vote", "data":data}
@@ -96,6 +135,7 @@ def update_user_model(worker, job):
         if item['link'] == job_input['article_url']:
             topics = item['topics']
             user_words = update_topic_counts(user_words, topics, job_input['positive_opinion'])
+            user_data = update_model(user_data, item, job_input["positive_opinion"]) # update the pickled user model
     
     log(0, "Updating user db with new topic weights")
     user_data['words'] = user_words

From 918d9bbf989ff87ca46617f02ab43fc2be491f87 Mon Sep 17 00:00:00 2001
From: iandioch <iandioch11@gmail.com>
Date: Mon, 14 Mar 2016 14:54:31 +0000
Subject: [PATCH 13/27] Fix crash when article has no topics

---
 update_opinion/updater.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/update_opinion/updater.py b/update_opinion/updater.py
index 7817523..99244e8 100644
--- a/update_opinion/updater.py
+++ b/update_opinion/updater.py
@@ -133,9 +133,13 @@ def update_user_model(worker, job):
     user_words = user_data['words']
     for item in feed_data['items']:
         if item['link'] == job_input['article_url']:
+            if not 'topics' in item:
+                log(1, "No topics associated with given article.")
+                break
             topics = item['topics']
             user_words = update_topic_counts(user_words, topics, job_input['positive_opinion'])
             user_data = update_model(user_data, item, job_input["positive_opinion"]) # update the pickled user model
+            break
     
     log(0, "Updating user db with new topic weights")
     user_data['words'] = user_words

From fdf8bca5b10f29d7e8242ce9a145160e9f3fef8c Mon Sep 17 00:00:00 2001
From: iandioch <iandioch11@gmail.com>
Date: Mon, 14 Mar 2016 14:55:31 +0000
Subject: [PATCH 14/27] Add scikit-learn download to Vagrantfile

---
 Vagrantfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Vagrantfile b/Vagrantfile
index fc42d84..e81def2 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -89,6 +89,7 @@ Vagrant.configure(2) do |config|
     sudo apt-get install build-essential python-dev
     sudo pip install spacy
     sudo python -m spacy.en.download
+    sudo apt-get install -y python-sklearn
     sudo su -c "gem install sass"
     cd /vagrant/server
     npm install -y

From 8b18a51d4f81c6423f183b46d7a35a6af9318183 Mon Sep 17 00:00:00 2001
From: Cian Ruane <cian.ruane1@gmail.com>
Date: Mon, 14 Mar 2016 14:02:03 +0000
Subject: [PATCH 15/27] Add fast_score gm worker

---
 aggregator/kw_score.py | 18 ++++++++++++++++--
 script/aggregator      |  1 -
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/aggregator/kw_score.py b/aggregator/kw_score.py
index dd91e70..31c1d9d 100644
--- a/aggregator/kw_score.py
+++ b/aggregator/kw_score.py
@@ -114,9 +114,23 @@ def score_gm(worker, job):
 	return str(BSON.encode({"status":"ok","score":a_score}))
 
 
-
 def fast_score_gm(worker, job):
-	return
+	word_data = BSON(job.data).decode()
+	try:
+		a_words = word_data['article_words']
+		u_words = word_data['user_words']
+	except:
+		log("Problem with data provided",level=2)
+		return str(BSON.encode({"status":"error","description":"Problem with data provided"}))
+
+	try:
+		a_score = fast_score(a_words,u_words)
+	except:
+		log("Problem when scoring, is the data in the right format?")
+		return str(BSON.encode({"status":"error","description":"Problem when scoring, is the data in the right format?"}))
+
+	return str(BSON.encode({"status":"ok","score":a_score}))
+
 
 if __name__ == '__main__':
 	log("Starting Gearman worker")
diff --git a/script/aggregator b/script/aggregator
index 19025c9..988944a 100755
--- a/script/aggregator
+++ b/script/aggregator
@@ -3,7 +3,6 @@ set -xe
 
 #Dependencies
 mongo localhost:27017/feedlark script/vagrant/create_feed_user_db.js
-python dbtools/getter/getter.py &
 go run dbtools/start_workers.go &
 
 #Unit tests

From fc254e9cfd58118e18585112a55ead468f47d11b Mon Sep 17 00:00:00 2001
From: Cian Ruane <cian.ruane1@gmail.com>
Date: Mon, 14 Mar 2016 15:39:59 +0000
Subject: [PATCH 16/27] Add API to README

---
 aggregator/README.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/aggregator/README.md b/aggregator/README.md
index 48f214f..3263de1 100644
--- a/aggregator/README.md
+++ b/aggregator/README.md
@@ -17,12 +17,41 @@ What is this?
 This is the code that ties the three Feedlark databases together, it coalesces `feed` and `user` and places the data in `g2g`.
 The machine learning components will be put here eventually to decide the order of the items but for now they are sorted chronologically.
 
+kw_score.py
+-----------
+
 This directory also includes `kw_score.py` which provides two functions, `score` and `fast_score` to measure the crossover between the keywords of an article and a user's interests.
 The functions assign the articles a score between -1 and 1 which can be used to help judge what articles a user may prefer. Higher is better.
 
 The `score` function uses word vectors to find which words in the users list match up best with the keywords in the article and generates a score based on those.
 The `fast_score` function checks for any words common to both the users words and the article's keywords, this is faster but less general.
 
+The `score` and `fast_score` Gearman workers take BSON encoded data in the form:
+
+```js
+{
+	'article_words': {'word1':0.3, 'word2':0.1, 'wordn':0.4},
+	'user_words': {'space':44, 'truckin':12, 'gardening':-10},
+}
+```
+
+And return
+
+```js
+{
+	"status":"ok",
+	"score":0.7821,
+}
+```
+or
+```js
+{
+	"status":"error",
+	"description":"Somethin' bad happened bro, here's where I tell you about it"
+}
+```
+
+
 How to do tests
 ---------------
 

From c9c5a4334f3e66dbc9988cd399d8497341bb7cca Mon Sep 17 00:00:00 2001
From: iandioch <iandioch11@gmail.com>
Date: Mon, 14 Mar 2016 15:46:52 +0000
Subject: [PATCH 17/27] Call score worker

---
 update_opinion/updater.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/update_opinion/updater.py b/update_opinion/updater.py
index 99244e8..def223e 100644
--- a/update_opinion/updater.py
+++ b/update_opinion/updater.py
@@ -39,6 +39,11 @@ def update_model(user_data, article_data, is_positive):
 
     log(0, "Training model with new data")
     topic_crossover = 0 # a comparison of how close the articles are in terms of topic, taken from the worker in /aggregator
+    score_data = bson.BSON.decode(bson.BSON(gearman_client.submit_job('score', str(bson.BSON.encode({'article_words':user_data['words'], 'user_words':article_data['topics']}))).result))
+    if score_data['status'] == 'ok':
+        topic_crossover = score_data['score']
+    else:
+        log(2, "Error getting crossover score: " + str(score_data['description']))
     age = (datetime.now() - article_data['pub_date']).total_seconds()*1000 # get the number of millis in difference
 
     inputs = [topic_crossover, age]

From c52443ff5a3a8fa15e981334dc315f3837c5149d Mon Sep 17 00:00:00 2001
From: Aaron Delaney <aaron.delaney29@mail.dcu.ie>
Date: Mon, 14 Mar 2016 16:02:13 +0000
Subject: [PATCH 18/27] Add /token/list, add tests and fix bugs

---
 server/controllers/users.js            | 17 +++++++
 server/middleware/routes.js            |  1 +
 server/models/user.js                  | 10 ++--
 server/package.json                    |  2 +-
 server/test/integration/Stream.test.js | 65 ++++++++++++++++++++++++++
 5 files changed, 88 insertions(+), 7 deletions(-)
 create mode 100644 server/test/integration/Stream.test.js

diff --git a/server/controllers/users.js b/server/controllers/users.js
index fb1b9f3..4b95cf2 100755
--- a/server/controllers/users.js
+++ b/server/controllers/users.js
@@ -110,6 +110,23 @@ module.exports = {
     });
   },
 
+  listTokens: (req, res) => {
+    const username = req.session.username;
+    userModel.findByUsername(username, user => {
+      if ( user ) {
+        if (user.tokens) {
+          return res.status(200).send(user.tokens);
+        }
+        else {
+          res.status(403).end();
+        }
+      }
+      else {
+        res.status(403).end();
+      }
+    });
+  },
+
   validToken: (req, res, next) => {
     const username = req.query.username;
     const token = req.query.token;
diff --git a/server/middleware/routes.js b/server/middleware/routes.js
index ba828a1..ec77f09 100755
--- a/server/middleware/routes.js
+++ b/server/middleware/routes.js
@@ -64,6 +64,7 @@ router.get("/stream", isAuthed, streamController.index);
 // Tokens (for API stuff!)
 router.get("/token/add", isAuthed, userController.addToken);
 router.get("/token/remove", isAuthed, userController.removeToken);
+router.get("/token/list", isAuthed, userController.listTokens);
 
 // Plaintext Endpoint
 router.get("/plaintext", userController.validToken, streamController.plaintext);
diff --git a/server/models/user.js b/server/models/user.js
index 867d5a4..66e0022 100755
--- a/server/models/user.js
+++ b/server/models/user.js
@@ -96,13 +96,11 @@ module.exports = {
     dbFuncs.transaction(db => dbFuncs.findOne(db, "user", {username: username}, user => {
 
       // TODO Add and render error message
-
-      if (user.tokens) {
-        user.tokens[token] = true;
-      }
-      else {
-        user.tokens = {token:true};
+      if (!user.tokens) {
+        user.tokens = {};
       }
+      user.tokens[token] = true;
+
 
       // TODO: check for max tokens
       dbFuncs.update(
diff --git a/server/package.json b/server/package.json
index 53558fc..e2a84ef 100644
--- a/server/package.json
+++ b/server/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "start": "node ./bin/www",
-    "test": "NODE_ENV=test node ./node_modules/mocha/bin/mocha test/bootstrap.test.js test/integration/**/User.test.js test/integration/**/Feed.test.js",
+    "test": "NODE_ENV=test node ./node_modules/mocha/bin/mocha test/bootstrap.test.js test/integration/**/User.test.js test/integration/**/Feed.test.js test/integration/**/Stream.test.js",
     "hint": "jshint controllers/*.js middleware/*.js models/*.js  test/*.js || true "
   },
   "dependencies": {
diff --git a/server/test/integration/Stream.test.js b/server/test/integration/Stream.test.js
new file mode 100644
index 0000000..e21975e
--- /dev/null
+++ b/server/test/integration/Stream.test.js
@@ -0,0 +1,65 @@
+const app = require("../../app");
+const assert = require('assert');
+const request = require('supertest');
+const lodash = require('lodash');
+
+describe('StreamController', _ => {
+  var agent = request.agent(app);
+
+  var user_details_base = {
+    username: "rmss",
+    email: "rms@gnu.org",
+    password: "gnuisnotlinux"
+  }
+
+  describe('#index()', _ => {
+    it("Stream is unavailable to users logged out", done => {
+      agent
+        .get('/stream')
+        .expect(403, done);
+    });
+    it('User can login', done => {
+      agent
+        .post('/user/login')
+        .type('form')
+        .send(user_details_base)
+        .expect(302, done);
+    });
+    it("Stream is available to users", done => {
+      agent
+        .get('/stream')
+        .expect(200, done);
+    });
+  });
+
+  describe('#plaintext()', _ => {
+    var api_key = null;
+    it("Able to generate api token", done => {
+      agent
+        .get('/token/add')
+        .expect(302, done);
+    });
+
+    it("Able to fetch api token", done => {
+      agent
+        .get('/token/list')
+        .expect(200)
+        .end( (err, res) => {
+          if (err) throw err;
+          api_key = Object.keys(res.body)[0];
+          if ( lodash.isString(api_key) ) {
+            done();
+          }
+          else {
+            done("Key doesn't exist");
+          }
+        });
+    });
+
+    it("Able to get plaintext", done => {
+      agent
+        .get('/plaintext?username=' + user_details_base.username + "&token=" + api_key)
+        .expect(200, done);
+    });
+  });
+});

From 404900627883b5e30563fb7f7c712fba3aae5eff Mon Sep 17 00:00:00 2001
From: iandioch <iandioch11@gmail.com>
Date: Mon, 14 Mar 2016 16:09:00 +0000
Subject: [PATCH 19/27] Change updater to use fast_score

---
 update_opinion/updater.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/update_opinion/updater.py b/update_opinion/updater.py
index def223e..674344b 100644
--- a/update_opinion/updater.py
+++ b/update_opinion/updater.py
@@ -39,7 +39,9 @@ def update_model(user_data, article_data, is_positive):
 
     log(0, "Training model with new data")
     topic_crossover = 0 # a comparison of how close the articles are in terms of topic, taken from the worker in /aggregator
-    score_data = bson.BSON.decode(bson.BSON(gearman_client.submit_job('score', str(bson.BSON.encode({'article_words':user_data['words'], 'user_words':article_data['topics']}))).result))
+    log(0, str(user_data['words']))
+    log(0, str(article_data['topics']))
+    score_data = bson.BSON.decode(bson.BSON(gearman_client.submit_job('fast_score', str(bson.BSON.encode({'article_words':user_data['words'], 'user_words':article_data['topics']}))).result))
     if score_data['status'] == 'ok':
         topic_crossover = score_data['score']
     else:

From ed6a43571fccd85b0f5118bac8068fdb19371b7c Mon Sep 17 00:00:00 2001
From: Cian Ruane <cian.ruane1@gmail.com>
Date: Mon, 14 Mar 2016 16:13:48 +0000
Subject: [PATCH 20/27] Fix blank words throwing bug

---
 aggregator/kw_score.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/aggregator/kw_score.py b/aggregator/kw_score.py
index 31c1d9d..02eb3b4 100644
--- a/aggregator/kw_score.py
+++ b/aggregator/kw_score.py
@@ -55,8 +55,9 @@ def score(article_words, user_words):
 				best_word = str(u).strip()
 
 		article_word = str(a).strip()
-		log("Best match for '",article_word,"' is '",best_word,"', similarity: ",best_sim)
-		total += a_words_norm[article_word] * u_words_norm[best_word] * best_sim
+		if a != '':
+			log("Best match for '",article_word,"' is '",best_word,"', similarity: ",best_sim)
+			total += a_words_norm[article_word] * u_words_norm[best_word] * best_sim
 
 	log("Total: ",total,", total count: ",len(article_words))
 	return total/len(article_words)

From 79f3f94acb4f7915196ec9660c914f53491f5c42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noah=20=C3=93=20Donnaile?=
 <iandioch@users.noreply.github.com>
Date: Mon, 14 Mar 2016 16:25:56 +0000
Subject: [PATCH 21/27] Update /README.md to include estimation of boot time

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e1099e1..93966cd 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,8 @@ Feedlark is using [MongoDB](http://mongodb.org) for its data storage. There are
 
 The front end uses [express.js](http://expressjs.com/), an MVC framework in Node.js.
 
+Setting up the Vagrant VM for the first time is very very slow (potentially upwards of 30 minutes), as there are a lot of dependencies. In particular, `spacy`, the tool we are using for Python natural language processing, requires a 500mb download of its English NLP model. However, once this initial setup has been completed, the VM can be booted in less than a minute.
+
 
 Dependencies
 ------------
@@ -75,7 +77,7 @@ Project Directory Overview
 
 #### `./aggregator`
 
-This is the code that coalesces the database collections `feed` and `user`, and places the data in `g2g`. That is, it takes the feed data, and the user data, and creates the feeds tailored to each individual user.
+This is the code that coalesces the database collections `feed` and `user`, and places the data in `g2g`. That is, it takes the feed data, and the user data, and creates the feeds tailored to each individual user. It also includes the tool to compute the similarity of a user's interests and an article's topics.
 
 #### `./dbtools`
 

From cca1afcbbfe8db61114031df6ee6f04356f45603 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noah=20=C3=93=20Donnaile?=
 <iandioch@users.noreply.github.com>
Date: Mon, 14 Mar 2016 16:51:06 +0000
Subject: [PATCH 22/27] Add upper limit of VM size to README

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 93966cd..33715a3 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,8 @@ The front end uses [express.js](http://expressjs.com/), an MVC framework in Node
 
 Setting up the Vagrant VM for the first time is very very slow (potentially upwards of 30 minutes), as there are a lot of dependencies. In particular, `spacy`, the tool we are using for Python natural language processing, requires a 500mb download of its English NLP model. However, once this initial setup has been completed, the VM can be booted in less than a minute.
 
+The whole virtual machine will currently be no larger than 6Gb on disc.
+
 
 Dependencies
 ------------

From 0a9fe24120cf1cbb97ca8bc9343efa57ee56eb51 Mon Sep 17 00:00:00 2001
From: m1cr0man <lucas@vccomputers.ie>
Date: Mon, 14 Mar 2016 17:10:00 +0000
Subject: [PATCH 23/27] Fix error when no data exists

---
 server/controllers/streams.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/controllers/streams.js b/server/controllers/streams.js
index bd8a4a3..8f20165 100755
--- a/server/controllers/streams.js
+++ b/server/controllers/streams.js
@@ -52,8 +52,8 @@ module.exports = {
         next_page: next_page,
         page_length: page_length,
         subscribed_feeds: req.session.subscribed_feeds,
-        keywords: req.query.keywords,
-        source: req.query.source
+        keywords: req.query.keywords || "",
+        source: req.query.source || ""
       });
     });
   },

From 87c0c576f2229bd2b82fdbe8aa4e9172edd2bab7 Mon Sep 17 00:00:00 2001
From: m1cr0man <lucas@vccomputers.ie>
Date: Mon, 14 Mar 2016 17:17:04 +0000
Subject: [PATCH 24/27] Fix images

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
index ec8c572..8d74334 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,4 @@
 * text eol=lf
+*.png -crlf
 /server/assets/** binary
 

From f524229a44cb1525c8315cdf33afa7281c761cf8 Mon Sep 17 00:00:00 2001
From: m1cr0man <lucas@vccomputers.ie>
Date: Mon, 14 Mar 2016 17:27:51 +0000
Subject: [PATCH 25/27] Fix stream pages > 2

---
 server/controllers/streams.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/server/controllers/streams.js b/server/controllers/streams.js
index 8f20165..b9a4f07 100755
--- a/server/controllers/streams.js
+++ b/server/controllers/streams.js
@@ -25,7 +25,6 @@ module.exports = {
     if (typeof req.query.keywords != "undefined" && req.query.keywords.length > 1) {
       keywords = req.query.keywords.split(" ").map(val => val.toLowerCase());
     }
-    console.log(keywords);
 
     getFeeds(req.session.username, feeds => {
 
@@ -44,7 +43,7 @@ module.exports = {
       var pageinated_feeds = _.slice(filtered_feeds, page*page_length, (page+1)*page_length);
 
       var next_page = page + 1;
-      if ((page + 1) * page_length > pageinated_feeds.length) next_page = 0;
+      if (next_page * page_length > filtered_feeds.length) next_page = 0;
 
       res.status(200).render("stream_index", {
         feeds: pageinated_feeds,

From b1ae970508f8a8fabfd2284e9f705b0b2ee69c31 Mon Sep 17 00:00:00 2001
From: iandioch <iandioch11@gmail.com>
Date: Mon, 14 Mar 2016 17:51:44 +0000
Subject: [PATCH 26/27] Add description of ./update_opinion to /README.md

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index e1099e1..0a0f948 100644
--- a/README.md
+++ b/README.md
@@ -104,3 +104,8 @@ This is where we keep the server, which routes HTTP and renders responses.
 #### `./topics`
 
 This contains the tool to parse an article and pick out the topics it relates to.
+
+#### `./update_opinion`
+
+This contains the tool that is called whenever a user votes on an article. It updates the list of topics they have opinions on in the database, and updates that user's machine learning model with the new data.
+

From e6d19a9754b6fe757a9934e14ee3c0a526758329 Mon Sep 17 00:00:00 2001
From: iandioch <iandioch11@gmail.com>
Date: Mon, 14 Mar 2016 17:54:45 +0000
Subject: [PATCH 27/27] Update doc/README to have description of vote.md file

---
 doc/README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/README.md b/doc/README.md
index 24e682c..1a15a3b 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -22,6 +22,12 @@ File Summaries
       </td>
       <td>This file describes the database that holds the data on each user, eg. auth data.</td>
     </tr>
+    <tr>
+      <td>
+        <code>db/vote.md</code>
+      </td>
+      <td>This file describes the database collection that holds logs of each time a user voted on an article.</td>
+    </tr>
     <tr>
       <td>
         <code>db/feed.md</code>
@@ -33,6 +39,6 @@ File Summaries
         <code>server/logging-spec.md</code>
       </td>
       <td>This file describes the format that all program console outputs should adhere to.</td>
-    <tr>
+    </tr>
   </tbody>
 </table>