From f8280b8bd7941ea578b997bbe806b725b30d2285 Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Tue, 20 Apr 2010 22:23:17 +0100
Subject: [PATCH] Tightend up the reddit user validation process to avoid
 issues.

---
 reddit/cron.py             | 57 +++++++++++++++++++++-----------------
 templates/sso/profile.html |  5 ++--
 2 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/reddit/cron.py b/reddit/cron.py
index bb191b0..a8c42c2 100644
--- a/reddit/cron.py
+++ b/reddit/cron.py
@@ -7,33 +7,33 @@ from reddit.models import RedditAccount
 from reddit.api import Inbox
 
 class UpdateAPIs():
-        """
-        Updates all Reddit API elements in the database
-        """
-        @property
-        def _logger(self):
-            if not hasattr(self, '__logger'):
-                self.__logger = logging.getLogger(__name__)
-            return self.__logger
+    """
+    Updates all Reddit API elements in the database
+    """
+    @property
+    def _logger(self):
+        if not hasattr(self, '__logger'):
+            self.__logger = logging.getLogger(__name__)
+        return self.__logger
 
-        last_update_delay = 604800
-                
-        def job(self):
-            delta = datetime.timedelta(seconds=self.last_update_delay)
+    last_update_delay = 604800
+            
+    def job(self):
+        delta = datetime.timedelta(seconds=self.last_update_delay)
 
-            print delta
-            self._logger.debug("Updating accounts older than %s" % (datetime.datetime.now() - delta))
+        print delta
+        self._logger.debug("Updating accounts older than %s" % (datetime.datetime.now() - delta))
 
-            for acc in RedditAccount.objects.filter(last_update__lt=(datetime.datetime.now() - delta)):
-                self._logger.info("Updating %s" % acc.username)
+        for acc in RedditAccount.objects.filter(last_update__lt=(datetime.datetime.now() - delta)):
+            self._logger.info("Updating %s" % acc.username)
 
-                try:
-                    acc.api_update()
-                except RedditAccount.DoesNotExist:
-                    acc.delete()
-                else:
-                    acc.save()
-                time.sleep(.5)
+            try:
+                acc.api_update()
+            except RedditAccount.DoesNotExist:
+                acc.delete()
+            else:
+                acc.save()
+            time.sleep(.5)
 
 
 class APIKeyParser:
@@ -58,14 +58,21 @@ class ProcessValidations():
     Grabs all Reddit Mail and processes validations
     """
 
+    @property
+    def _logger(self):
+        if not hasattr(self, '__logger'):
+            self.__logger = logging.getLogger(__name__)
+        return self.__logger
+
     def job(self):
         inbox = Inbox(settings.REDDIT_USER, settings.REDDIT_PASSWD)
 
         for msg in inbox:
-            if not msg.was_comment and msg.new:
+            if not msg.was_comment:
                 try:
                     acc = RedditAccount.objects.get(username__iexact=msg.author)
-                    if not acc.validated and msg.body == acc.user.username:
+                    if not acc.validated and msg.subject == "Validation: %s" % acc.user.username:
+                        self._logger.info("Validated %s" % acc.user.username)
                         acc.validated = True
                         acc.save()
                 except RedditAccount.DoesNotExist:
diff --git a/templates/sso/profile.html b/templates/sso/profile.html
index d812d87..8908a17 100644
--- a/templates/sso/profile.html
+++ b/templates/sso/profile.html
@@ -83,8 +83,7 @@ setup.</p>
 <h2>Reddit Accounts</h2>
 <p>This is a list of all your current linked Reddit accounts</p>
 {% if redditaccounts %}
-<p>To verify your Reddit account, login on Reddit then click 
-<a href="http://www.reddit.com/message/compose/?to=DredditVerification&subject=Verification">this link</a> and put your Auth username in the message.</p>
+<p>To validate your Reddit account, login on Reddit then click the link next to the account, fill in some text in the message and click send.</p>
 <table>
 <thead>
 <tr><th>Username</th><th>Created Date</th><th>Validated</th></tr>
@@ -93,7 +92,7 @@ setup.</p>
 {% for acc in redditaccounts %}
 <tr><td>{{ acc.username }}</td>
     <td>{{ acc.date_created }}</td>
-    <td>{% if acc.validated %}Yes{% else %}No{% endif %}</td>
+    <td>{% if acc.validated %}Yes{% else %}No (<a href="http://www.reddit.com/message/compose/?to=DredditVerification&subject=Validation%3a%20{{user.username}}">Validate</a>){% endif %}</td>
 </tr>
 {% endfor %}
 </tbody>