From 5adb245712a1e76f026f4da5409cc58f2a722913 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Tue, 24 Jun 2014 22:52:57 -0700
Subject: [PATCH 1/2] Fixing IFTTT saved story tags.

---
 apps/oauth/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/oauth/views.py b/apps/oauth/views.py
index 16c15158e..1af584ed3 100644
--- a/apps/oauth/views.py
+++ b/apps/oauth/views.py
@@ -334,7 +334,7 @@ def api_saved_tag_list(request):
     tags = []
     
     for tag in starred_counts:
-        if tag['tag'] == "": continue
+        if not tag['tag'] or tag['tag'] == "": continue
         tags.append(dict(label="%s (%s %s)" % (tag['tag'], tag['count'], 
                                                'story' if tag['count'] == 1 else 'stories'),
                          value=tag['tag']))

From 96336b24be4196a35503efc1a21db8067d3f6461 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Wed, 25 Jun 2014 12:50:24 -0700
Subject: [PATCH 2/2] Fixing Subscribe button for tryfeeds.

---
 media/js/newsblur/common/assetmodel.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/media/js/newsblur/common/assetmodel.js b/media/js/newsblur/common/assetmodel.js
index 992adac4e..14f12f91e 100644
--- a/media/js/newsblur/common/assetmodel.js
+++ b/media/js/newsblur/common/assetmodel.js
@@ -514,6 +514,10 @@ NEWSBLUR.AssetModel = Backbone.Router.extend({
         }
         if (feed_id == this.feed_id) {
             if (data.feeds) {
+                var river = _.any(['river:', 'social:'], function(prefix) { 
+                    return _.isString(feed_id) && _.string.startsWith(feed_id, prefix);
+                });
+                if (river) _.each(data.feeds, function(feed) { feed.temp = true; });
                 this.feeds.add(data.feeds);
             }
             if (data.classifiers) {