From 95abe1aac26061324481e7208d09d52c80fb65e8 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Mon, 14 Feb 2011 01:15:45 -0500
Subject: [PATCH] Allowing adding a url even if already subscribed. Just checks
 for dupes in the specific folder, but otherwise, dupes are allowed.

---
 apps/reader/models.py   | 6 +-----
 utils/feed_functions.py | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/apps/reader/models.py b/apps/reader/models.py
index 2db4f990a..b0a19bc87 100644
--- a/apps/reader/models.py
+++ b/apps/reader/models.py
@@ -109,10 +109,7 @@ class UserSubscription(models.Model):
             code = 1
             message = ""
     
-        if us and not subscription_created:
-            code = -3
-            message = "You are already subscribed to this site."
-        elif us:
+        if us:
             user_sub_folders_object, created = UserSubscriptionFolders.objects.get_or_create(
                 user=user,
                 defaults={'folders': '[]'}
@@ -130,7 +127,6 @@ class UserSubscription(models.Model):
             if feed.last_update < datetime.datetime.utcnow() - datetime.timedelta(days=1):
                 feed.update()
 
-        print code, message, us
         return code, message, us
 
     def mark_feed_read(self):
diff --git a/utils/feed_functions.py b/utils/feed_functions.py
index d68fbe7f4..97acb039b 100644
--- a/utils/feed_functions.py
+++ b/utils/feed_functions.py
@@ -160,7 +160,7 @@ def add_object_to_folder(obj, folder, folders):
     for k, v in enumerate(folders):
         if isinstance(v, dict):
             for f_k, f_v in v.items():
-                if f_k == folder:
+                if f_k == folder and obj not in f_v:
                     f_v.append(obj)
                 folders[k][f_k] = add_object_to_folder(obj, folder, f_v)
     return folders