@@ -14,6 +14,24 @@ END

 $$ LANGUAGE plpgsql;

+DROP FUNCTION IF EXISTS subscribe_link(text,int);

+CREATE OR REPLACE FUNCTION subscribe_link(username text, linkid int)

+  RETURNS bool AS $$

+DECLARE

+  uid int;

+  result bool;

+  n_title text;

+  n_url text;

+BEGIN

+  SELECT INTO result NOT exists(SELECT * FROM user_links WHERE user_id=uid AND link_id=linkid);

+  IF result THEN

+    SELECT title,url INTO n_title,n_url FROM links WHERE links.id=linkid;

+    PERFORM put_link(username, n_url, n_title);

+  END IF;

+  RETURN result;

+END

+$$ LANGUAGE plpgsql;

+

 DROP FUNCTION IF EXISTS delete_link(text,int);

 CREATE OR REPLACE FUNCTION delete_link(username text, linkid int)

   RETURNS bool AS $$

@@ -30,10 +48,25 @@ BEGIN

 END

 $$ LANGUAGE plpgsql;

+DROP FUNCTION IF EXIST has_user_shared(text, text);

+CREATE OR REPLACE FUNCTION has_user_shared(username text, linkurl text) RETURNS bool AS $$

+DECLARE

+  result bool;

+BEGIN

+  SELECT INTO result EXISTS(

+    SELECT 1 FROM user_links ul

+    LEFT JOIN users u ON user_id=u.id

+    LEFT JOIN links l ON link_id=l.id

+    WHERE linkurl=l.url AND username=u.name

+  );

+  RETURN result;

+END

+$$ LANGUAGE plpgsql;

+

 DROP FUNCTION IF EXISTS get_bones(text, timestamp, int);

 DROP FUNCTION IF EXISTS get_bones(text, int, timestamp);

 CREATE OR REPLACE FUNCTION get_bones(username text, lim int, before timestamp)

-  RETURNS TABLE(url text, title text, posted timestamp, poster text, total_votes bigint, subscriber_vote int) AS $$

+  RETURNS TABLE(linkid int, url text, title text, posted timestamp, poster text, total_votes bigint, subscriber_vote int, shared bool) AS $$

 DECLARE

   subscriber_id int;

 BEGIN

@@ -43,7 +76,9 @@ BEGIN

     AS

       SELECT

         DISTINCT ON (links.url)

-        links.url,links.title,links.posted,users1.name,total_votes(links.id),user_vote(subscriber_id,links.id)

+        links.id,links.url,links.title,links.posted,users1.name,

+        total_votes(links.id),user_vote(subscriber_id,links.id),

+        has_user_shared(username, links.url)

         FROM user_subscriptions

         RIGHT JOIN user_links ON user_subscriptions.to_id=user_links.user_id

         INNER JOIN links ON link_id=links.id

@@ -58,7 +93,8 @@ $$ LANGUAGE plpgsql;

 DROP FUNCTION IF EXISTS get_bones(text, int);

 CREATE OR REPLACE FUNCTION get_bones(username text, lim int)

-  RETURNS TABLE(url text, title text, posted timestamp, poster text, total_votes bigint, subscriber_vote int) AS $$

+  RETURNS TABLE(linkid int, url text, title text, posted timestamp, poster text, total_votes bigint,

+                subscriber_vote int, shared bool) AS $$

 DECLARE

   subscriber_id int;

 BEGIN

@@ -68,7 +104,9 @@ BEGIN

     AS

       SELECT

         DISTINCT ON (links.url)

-        links.url,links.title,links.posted,users1.name,total_votes(links.id),user_vote(subscriber_id,links.id)

+        links.id,links.url,links.title,links.posted,users1.name,

+        total_votes(links.id),user_vote(subscriber_id,links.id),

+        has_user_shared(username, links.url)

         FROM user_subscriptions

         RIGHT JOIN user_links ON user_subscriptions.to_id=user_links.user_id

         INNER JOIN links ON link_id=links.id

@@ -81,7 +119,8 @@ $$ LANGUAGE plpgsql;

 DROP FUNCTION IF EXISTS get_bones(text);

 CREATE OR REPLACE FUNCTION get_bones(username text)

-  RETURNS TABLE(url text, title text, posted timestamp, poster text, total_votes bigint, subscriber_vote int) AS $$

+  RETURNS TABLE(linkid int, url text, title text, posted timestamp, poster text, total_votes bigint,

+                subscriber_vote int, shared bool) AS $$

 DECLARE

   subscriber_id int;

 BEGIN

@@ -91,7 +130,9 @@ BEGIN

     AS

       SELECT

         DISTINCT ON (links.url)

-        links.url,links.title,links.posted,users1.name,total_votes(links.id),user_vote(subscriber_id,links.id)

+        links.id,links.url,links.title,links.posted,users1.name,

+        total_votes(links.id),user_vote(subscriber_id,links.id),

+        has_user_shared(username, links.url)

         FROM user_subscriptions

         RIGHT JOIN user_links ON user_subscriptions.to_id=user_links.user_id

         INNER JOIN links ON link_id=links.id

@@ -104,7 +145,7 @@ $$ LANGUAGE plpgsql;

 DROP FUNCTION IF EXISTS get_bone(text);

 CREATE OR REPLACE FUNCTION get_bone(username text)

-  RETURNS TABLE(name text, url text, title text, posted timestamp, linkid int, votes bigint) AS $$

+  RETURNS TABLE(name text, url text, title text, posted timestamp, linkid int, votes bigint, shared bool) AS $$

 BEGIN

   RETURN QUERY SELECT users.name, links.url, links.title, links.posted, links.id, total_votes(links.id)

       FROM users

@@ -66,4 +66,4 @@ WITH recent_users AS (

   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;

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

@@ -1,5 +1,6 @@

 import flask

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

+import flask_login;

 from flask.ext.cors import cross_origin

 from flask.ext.login import login_required, current_user

 import urllib2

@@ -31,7 +32,7 @@ def as_json(f):

         return res

     return _inner

-@bone_blueprint.route('/link/<linkid>', methods=['GET','DELETE'])

+@bone_blueprint.route('/link/<linkid>', methods=['GET','POST','DELETE'])

 @login_required

 def delete_link(linkid):

     db = database.get_db()

@@ -42,6 +43,11 @@ def delete_link(linkid):

             cur.execute('SELECT id,url,title,posted FROM links WHERE id=%s', (linkid,))

             nid,url,title,posted = cur.fetchone()

             result = dict(id=nid,url=url,title=title,posted=posted.isoformat())

+        elif request.method == 'POST':

+            result = False

+            if 'username' in session:

+                cur.execute('SELECT subscribe_link(%s,%s)', (current_user.id,linkid))

+                result = cur.fetchone()[0]

         elif request.method == 'DELETE':

             result = False

             if 'username' in session:

@@ -163,10 +169,14 @@ def data(username):

     result = {'marrow':[], 'sectionTitle': sectionTitle}

     with database.get_db().cursor() as cur:

-        cur.execute("SELECT url, title, posted, linkid, votes from get_bone(%s);", (username,))

+        cur_username = 'anonymous'

+        if current_user.is_authenticated:

+            cur_username = current_user.id

+        cur.execute("SELECT url, title, posted, linkid, votes, has_user_shared(%s, url) from get_bone(%s);",

+                    (cur_username, username,))

         result['marrow'] = [

-                dict(id=linkid, url=url,title=title,posted=posted.isoformat(),votes=votes)

-                     for url,title,posted,linkid,votes

+                dict(id=linkid, url=url,title=title,posted=posted.isoformat(),votes=votes,shared=shared)

+                     for url,title,posted,linkid,votes,shared

                      in cur.fetchall()

         ]

     return json.dumps(result)

@@ -230,8 +240,9 @@ def subscriptions(before, count):

                 args = args + (before,)

             cur.callproc("get_bones", args)

             result['marrow'] = [

-                dict(poster=poster, url=url,title=title,posted=posted.isoformat(), votes=votes, myVote=myvote)

-                    for url,title,posted,poster,votes,myvote

+                dict(id=id,poster=poster, url=url,title=title,posted=posted.isoformat(), votes=votes,

+                     myVote=myvote, shared=shared)

+                    for id,url,title,posted,poster,votes,myvote,shared

                     in cur.fetchall()

             ]

     return (json.dumps(result), 200, {'Content-Type': 'application/json'})

@@ -7,6 +7,9 @@

       data-title="{{marrow.title}}"

       data-poster="{{marrow.poster}}"

       data-votes="{{marrow.votes}}">

+    <a href class="add-link" ng-click="reshare({item:marrow})" title="Reshare Link"

+      analytics-on="click" analytics-category="link" analytics-label="reshare"

+      analytics-event="{{marrow.url}}">{{!marrow.shared? '(+)': '&check;'}}</a>

     <span class="vote-disp">{{marrow.votes}}</span>

     <span ng-if="marrow.title">

       <a href="{{marrow.url}}" class="list-item" >{{marrow.title}}</a>

@@ -2,7 +2,7 @@ boneMod = angular.module('marrowApp.directives.boneList', []);

 boneMod.directive('boneList', function () {

   return {

-    scope: { bone: '=' },

+    scope: { bone: '=', reshare: '&' },

     templateUrl: 'js/directives/bone-list/bone-list.html'

   };

 });

@@ -84,6 +84,15 @@ marrowApp.controller('RootCtrl', function ($scope,$http,$location,$route, Subscr

   $scope.url = "";

   $scope.title = "";

+  $scope.reshare = function (marrow) {

+    if (!marrow.shared ) {

+      $http.post('/api/bones/link/'+marrow.id).success(function(shared) {

+        marrow.shared = true;

+        if (shared === true) { $scope.update(); }

+      });

+    };

+  };

+

   $scope.toggleSubscribe = function (txt) {

     var postObj = {"from":$scope.bone.sectionTitle, "to":$scope.bone.sectionTitle};

     var promise = null;

@@ -13,7 +13,7 @@

       <gravatar-image class="my-image" user-name="{{bone.sectionTitle}}"></gravatar-image>

     </a>

   </h2>

-  <bone-list bone="bone.marrow" />

+  <bone-list bone="bone.marrow" reshare="reshare(item)" />

 </section>

@@ -30,12 +30,17 @@

         <span class="voting">

           <span class="score">{{marrow.votes}}</span>

           <button class="upVote vote-button fa fa-plus" ng-class="{selected: marrow.myVote===1}" ng-click="upVote(marrow)"

-                  analytics-on="click" analytics-event="vote" analytics-category="{{marrow.myVote===0? 'up' : 'zero'}}"></button>

+                  analytics-on="click" analytics-event="vote" analytics-category="{{marrow.myVote===0? 'up' : 'zero'}}">

+          </button>

         </span>

         <span ng-if="marrow.title">

           <a href="{{marrow.url}}" class="list-item">{{marrow.title}}</a>

           <br />

         </span>

+        <a class="add-link" ng-click="reshare(marrow)" title="Reshare Link"

+           analytics-on="click" analytics-category="link" analytics-label="reshare"

+           analytics-event="{{marrow.url}}">{{!marrow.shared? 'Reshare': '&check;'}}</a>

+        —

         <a href="{{marrow.url}}" ng-class="{'de-emphasize':marrow.title}" >{{marrow.url}}</a>

       </div>

       <user-badge poster="{{marrow.poster}}"></user-badge>