From 572f9f53f5db5c51c5b09eb3973f71db95fd32d2 Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Sat, 6 Aug 2011 21:23:27 +0100
Subject: [PATCH] Abstract out login check

---
 app/reddit/api.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/reddit/api.py b/app/reddit/api.py
index 020d050..e18713e 100644
--- a/app/reddit/api.py
+++ b/app/reddit/api.py
@@ -63,6 +63,12 @@ class RedditAPI:
 
         return False
 
+    @property
+    def loggedin(self):
+        if hasattr(self, 'login_cookie') and not self.login_cookie == '':
+            return True
+        return False
+
     def _request(self, url, data, method='GET'):
         if not hasattr(self, '_opener'):
             self._opener = urllib2.build_opener(urllib2.HTTPCookieProcessor())
@@ -149,7 +155,7 @@ class Inbox(RedditAPI):
     @property
     def _inbox_data(self):
 
-        if not self.login_cookie:
+        if not self.loggedin:
             raise NotLoggedIn
 
         if not hasattr(self, '__inbox_cache') or not len(self.__inbox_cache):
@@ -174,7 +180,7 @@ class Inbox(RedditAPI):
         return self._inbox_data.__iter__()
 
     def send(self, to, subject, text):
-        if not hasattr(self, 'login_cookie') or not self.login_cookie:
+        if not self.loggedin:
             raise NotLoggedIn
 
         data = { 'to': to,
@@ -196,7 +202,7 @@ class Flair(RedditAPI):
 
     def flairlist(self, subreddit, start=None):
 
-        if not self.login_cookie:
+        if not self.loggedin:
             raise NotLoggedIn
 
         data = { 'r': subreddit, 'limit': 1000, 'uh': self.modhash }
@@ -219,6 +225,9 @@ class Flair(RedditAPI):
 
     def set_flair(self, subreddit, user, text, css_class):
 
+        if not self.loggedin:
+            raise NotLoggedIn
+
         data = { 'r': subreddit, 'name': user, 'uh': self.modhash, 'text': text, 'css_class': css_class }
         url = self._url(self.REDDIT_API_FLAIR)
         jsondoc = self._request(url, data, method='POST')