@@ -381,3 +381,4 @@ BEGIN

   RETURN result;

 END

 $$ LANGUAGE plpgsql;

+

@@ -56,3 +56,14 @@ CREATE TABLE user_ak (

   UNIQUE (user_id, ak),

   PRIMARY KEY (id)

 );

+

+DROP VIEW IF EXISTS recently_active_users;

+CREATE VIEW recently_active_users AS

+WITH recent_users AS (

+  SELECT user_id,name,posted

+  FROM user_links

+  LEFT JOIN links ON link_id = links.id

+  RIGHT JOIN users ON user_id=users.id

+  WHERE posted > now() - interval '1 week'

+  ORDER BY posted desc, user_id)

+SELECT DISTINCT ON (name) user_id,name,posted FROM recent_users;

@@ -8,21 +8,21 @@ except ImportError:

         password = "marrowpass"

         host = "pgsqlserver.elangley.org"

-def get_db():

+def get_db(close=True):

     db = getattr(g, '_database', None)

     if db is None:

-        db = g._database = psycopg2.connect(

+        db = g._database = [psycopg2.connect(

           database=config.db,

           user=config.user,

           password=config.password,

           host=config.host

-        );

-    return db

+        ),close];

+    return db[0]

 def close_connection(exception):

     db = getattr(g, '_database', None)

-    if db is not None:

-        db.close()

+    if db is not None and db[1]:

+        db[0].close()

 def check_ak(db, username, ak):

     with db.cursor() as cur:

@@ -2,7 +2,7 @@ from __future__ import division

 import json

 import flask

-from flask import Blueprint, session, redirect, url_for, escape, request, abort, g

+from flask import Blueprint, session, redirect, url_for, escape, request, abort, g, current_app, stream_with_context

 from flask.ext.cors import cross_origin

 from flask.ext.login import LoginManager, UserMixin, login_user, logout_user, login_required, current_user

 import psycopg2

@@ -91,6 +91,26 @@ def follows(to):

 # def list_users():

 #     return json.dumps([_ for _ in users.keys()])

+class ServerSentEvent(object):

+    def __init__(self, id, event, data):

+        self.data = data

+        self.event = event

+        self.id = id

+        self.desc_map = {

+            self.data : "data",

+            self.event : "event",

+            self.id : "id"

+        }

+

+    def encode(self):

+        if not self.data:

+            return ""

+        lines = ["%s: %s" % (v, k) 

+                 for k, v in self.desc_map.iteritems() if k]

+        

+        return "%s\n\n" % "\n".join(lines)

+

+

 @user_blueprint.route('/add', methods=['POST'])

 def adduser():

     db = database.get_db()

@@ -122,6 +142,47 @@ def adduser():

             else: db.commit()

     return json.dumps(result)

+import time

+@user_blueprint.route('/active')

+def active():

+    def get_event():

+        result = dict(status=False, data=[])

+        with database.get_db() as db:

+            with db.cursor() as cur:

+                cur.execute("SELECT * FROM recently_active_users LIMIT 10")

+                result['status'] = True

+                store = result['data']

+                for id,name,last_posted in cur.fetchall():

+                    store.append(

+                        dict(

+                            id=id,

+                            name=name,

+                            last_posted=last_posted.isoformat()

+                        )

+                    )

+        return json.dumps(result)

+    def poll():

+        try:

+            id = 1

+            t0 = time.time()

+            data = get_event()

+            ev = ServerSentEvent(id, "active", data).encode()

+            yield ev

+            while True:

+                t1 = time.time()

+                if t1 - t0 > 5:

+                    id += 1

+                    data = get_event()

+                    ev = ServerSentEvent(id, "active", data).encode()

+                    yield ev

+                    time.sleep(0.1)

+                    t0 = t1

+        except GeneratorExit:

+            print 'GeneratorExit!'

+    response = flask.Response(stream_with_context(poll()), mimetype="text/event-stream")

+    response.headers['X-Accel-Buffering'] = 'no'

+    return response

+

 @user_blueprint.route('/following')

 @login_required

 def following():

@@ -143,7 +204,7 @@ import os, base64

 def gen_ak(db):

     return ak

-@user_blueprint.route('/<user>/env', methods=['POST'])

+@user_blueprint.route('/env/<user>', methods=['POST'])

 def getenv(user): pass

 @user_blueprint.route('/change-password', methods=['POST'])

@@ -260,6 +260,11 @@ footer a.facebook-link:hover {

   margin-top: 10px;

 }

+#nav-main h3 {

+  text-align: right;

+  margin-top: 20px;

+}

+

 /* @end */

 /* @group List Module */

@@ -46,64 +46,70 @@

 </head>

 <body>

-<!--

-   -  <script>

-   -    window.fbAsyncInit = function() {FB.init({

-   -        appId      : '1420153671647757',

-   -        xfbml      : true,

-   -        version    : 'v2.3'

-   -      });

-   -    };

-   -

-   -    (function(d, s, id){

-   -      var js, fjs = d.getElementsByTagName(s)[0];

-   -      if (d.getElementById(id)) {return;}

-   -      js = d.createElement(s); js.id = id;

-   -      js.src = "//connect.facebook.net/en_US/sdk.js";

-   -      fjs.parentNode.insertBefore(js, fjs);

-   -    }(document, 'script', 'facebook-jssdk'));

-   -  </script>

-   -

-   -->

-  <div id="page-container">

-    <main ng-view></main>

-    <header>

-      <h1 class="site-logo">Marrow</h1>

-    </header>

-    <nav id="nav-main" ng-controller="SidebarCtrl">

-      <ul>

-        <li><a href="/">Home</a></li>

-        <li><a href ng-click="subscriptions()">My Lists</a></li>

-        <li><a href ng-click="random()">Random</a></li>

-        <li class="logout-link"><a href ng-click="logout()">Log Out</a></li>

-      </ul>

-      <!--

-         -<div class="appstore-links">

-         -  <a href="https://play.google.com/store/apps/details?id=com.joinmarrow.marrow">

-         -    <img alt="Android app on Google Play" src="https://developer.android.com/images/brand/en_app_rgb_wo_45.png" />

-         -  </a>

-         -</div>

-         -->

-    </nav>

-    <footer>

-      <span class="beta-message">

-        This service is currently in beta. Like us on

-        <a class="facebook-link" href="https://www.facebook.com/join.marrow">Facebook.</a>

-        Try the

-        <a style="color: blue"

-           href="https://chrome.google.com/webstore/detail/add-to-marrow/pcgflajngpeopkemlijnnggfchoglpad">

-          Chrome Extension

-        </a>

-        to get the newest links delivered straight to your browser.

-        <!--or report problems on <a class="facebook-link" href="https://bugs.joinmarrow.com">bugs.joinmarrow.com</a>.-->

-      </span>

-    </footer>

-  </div>

-  <script>

-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

-        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),

-        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)

-            })(window,document,'script','//www.google-analytics.com/analytics.js','ga');

+  <!--

+    -  <script>

+-    window.fbAsyncInit = function() {FB.init({

+  -        appId      : '1420153671647757',

+  -        xfbml      : true,

+  -        version    : 'v2.3'

+    -      });

+-    };

+-

+-    (function(d, s, id){

+  -      var js, fjs = d.getElementsByTagName(s)[0];

+  -      if (d.getElementById(id)) {return;}

+  -      js = d.createElement(s); js.id = id;

+  -      js.src = "//connect.facebook.net/en_US/sdk.js";

+  -      fjs.parentNode.insertBefore(js, fjs);

+  -    }(document, 'script', 'facebook-jssdk'));

+-  </script>

+    -

+    -->

+    <div id="page-container">

+      <main ng-view></main>

+      <header>

+        <h1 class="site-logo">Marrow</h1>

+      </header>

+      <nav id="nav-main" ng-controller="SidebarCtrl">

+        <ul>

+          <li><a href="/">Home</a></li>

+          <li><a href ng-click="subscriptions()">My Lists</a></li>

+          <li><a href ng-click="random()">Random</a></li>

+          <li class="logout-link"><a href ng-click="logout()">Log Out</a></li>

+        </ul>

+        <h3>Active Users</h3>

+        <ul>

+          <li ng-repeat="user in activeUsers.users">

+            <user-badge poster="{{user.name}}" no-image></user-badge>

+          </li>

+        </ul>

+        <!--

+          -<div class="appstore-links">

+          -  <a href="https://play.google.com/store/apps/details?id=com.joinmarrow.marrow">

+          -    <img alt="Android app on Google Play" src="https://developer.android.com/images/brand/en_app_rgb_wo_45.png" />

+          -  </a>

+          -</div>

+        -->

+      </nav>

+      <footer>

+        <span class="beta-message">

+          This service is currently in beta. Like us on

+          <a class="facebook-link" href="https://www.facebook.com/join.marrow">Facebook.</a>

+          Try the

+          <a style="color: blue"

+             href="https://chrome.google.com/webstore/detail/add-to-marrow/pcgflajngpeopkemlijnnggfchoglpad">

+            Chrome Extension

+          </a>

+          to get the newest links delivered straight to your browser.

+          <!--or report problems on <a class="facebook-link" href="https://bugs.joinmarrow.com">bugs.joinmarrow.com</a>.-->

+        </span>

+      </footer>

+    </div>

+    <script>

+(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),

+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)

+})(window,document,'script','//www.google-analytics.com/analytics.js','ga');

     ga('create', 'UA-61547817-1', 'auto');

       //ga('send', 'pageview');

@@ -1,4 +1,5 @@

-<a class="avatar-image" ng-href="/user/{{ poster }}" title="{{poster}}">

+<a ng-if="!withoutImage" class="avatar-image" ng-href="/user/{{ poster }}" title="{{poster}}">

   <gravatar-image class="poster-avatar" user-name="{{poster}}"></gravatar-image>

   <span class="poster-handle de-emphasize">{{poster}}</span>

 </a>

+<a ng-if="withoutImage" ng-href="/user/{{poster}}" title="{{poster}}">{{poster}}</a>

@@ -16,10 +16,12 @@ angular.module('marrowApp.directives.userBadge', ['marrowApp.utils'])

 .directive('userBadge', function() {

   return {

     scope: {

-      poster: '@'

+      poster: '@',

+      noImage: '@'

     },

     templateUrl: '/js/directives/user-badge/user-badge.html',

-    controller: function($scope) {

+    controller: function($scope,$attrs) {

+      $scope.withoutImage = $attrs.hasOwnProperty('noImage');

       $scope.gravURL = function(uid) {

         var hash = CryptoJS.MD5(uid);

         return '//gravatar.com/avatar/'+hash+'?d=identicon&s=24';

@@ -264,7 +264,14 @@ marrowApp.controller('UserSettingCtrl', function ($scope,$http,$location) {

   };

 });

-marrowApp.controller('SidebarCtrl', function ($scope,$http,$location,$route, $window) {

+marrowApp.controller('SidebarCtrl', function ($scope,$http,$location,$route, $window, UserService) {

+  eventSource = new EventSource("/api/user/active");

+  $scope.activeUsers = Object.create(null);

+  eventSource.addEventListener("active", function(event) {

+    console.log(event);

+    $scope.activeUsers.users = JSON.parse(event.data).data;

+  });

+

   $scope.subscriptions = function() {

     if ($location.url() !== '/subscriptions') { $location.url('/subscriptions'); }

     else { $route.reload(); }

@@ -38,7 +38,8 @@ serviceModule.factory('UserService', ['$resource',

       environment: {'method': 'POST', 'url': '/api/user/environment'},

       reputation: {'method': 'POST', 'url': '/api/user/reputation/:user', params: {user: '@user'}},

       reputations: {'method': 'POST', 'url': '/api/user/reputation'},

-      changePassword: {'method': 'POST', 'url': '/api/user/change-password'}

+      changePassword: {'method': 'POST', 'url': '/api/user/change-password'},

+      active: {'method': 'GET', 'url': '/api/user/active'}

     });

   }]

 );