From 37db6ccdef61261ecbc162d7e4bae62793515ebd Mon Sep 17 00:00:00 2001
From: jayachandpotluri <jayachand.potluri@mutualmobile.com>
Date: Fri, 31 May 2013 19:27:55 +0530
Subject: [PATCH] Twit class added

---
 block_list/Twit.py             | 30 +++++++++++++++++++++---------
 block_list/admin.py            |  5 ++---
 block_list/models.py           |  2 --
 block_twitter_test/settings.py | 20 +++++++++++---------
 4 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/block_list/Twit.py b/block_list/Twit.py
index fa104c5..9f6dfa7 100644
--- a/block_list/Twit.py
+++ b/block_list/Twit.py
@@ -19,25 +19,37 @@
 CONNECTION = httplib.HTTPSConnection(SERVER)
 
 class Twit:
-    def __init__(self, access_token, login_user):
-        self.twit = Twitter(auth=OAuth(access_token.key, access_token.secret,
+    def __init__(self, access_token, login_id, login_name, login_screen_name):
+        token = oauth.OAuthToken.from_string(access_token)
+        self.twit = Twitter(auth=OAuth(token.key, token.secret,
                                        CONSUMER_KEY, CONSUMER_SECRET))
-        self.login_user = login_user
+        self.login_id = login_id
+        self.login_name = login_name
+        self.login_screen_name = login_screen_name
     
-    def get_user(self):
-        return self.login_user
+    def get_details(self):
+        return (self.login_id, self.login_name, self.login_screen_name)
     
     def block_user(self, user_id):
-        pass
+        response = self.twit.blocks.create(user_id=user_id)
+    
+    def get_blocked_ids(self):
+        response = self.twit.blocks.ids()
+        return response.get('ids')
     
     def get_blocked_users(self):
-        pass
+        response = self.twit.blocks.list()
+        return response.get('users')
     
     def unblock_user(self, user_id):
-        pass
+        response = self.twit.blocks.destroy(user_id=user_id)
     
     def get_friends_ids(self):
         pass
     
-    def get_friend(self, user_id):
+    def get_followers(self):
+        response = self.twit.followers.list()
+        return response.get('users')
+    
+    def show_user(self, user_id):
         pass
\ No newline at end of file
diff --git a/block_list/admin.py b/block_list/admin.py
index 0270e76..49aa113 100644
--- a/block_list/admin.py
+++ b/block_list/admin.py
@@ -1,5 +1,4 @@
 from django.contrib import admin
-from models import Blocked_List, Subscribed_List
+from models import Blocked_List
 
-admin.site.register(Blocked_List)
-admin.site.register(Subscribed_List)
\ No newline at end of file
+admin.site.register(Blocked_List)
\ No newline at end of file
diff --git a/block_list/models.py b/block_list/models.py
index 19f9019..135b459 100644
--- a/block_list/models.py
+++ b/block_list/models.py
@@ -7,8 +7,6 @@ class Blocked_List(models.Model):
     share = models.CharField(max_length=10)
     blocked_users = models.TextField()
     subscribed_users = models.TextField()
-    #def save(self, *args, **kwargs):
-    #    pass
     
     def __unicode__(self):
         return "User Id: %s, Shared: %s" %(self.user_id, self.share)
\ No newline at end of file
diff --git a/block_twitter_test/settings.py b/block_twitter_test/settings.py
index 0975676..38a4823 100644
--- a/block_twitter_test/settings.py
+++ b/block_twitter_test/settings.py
@@ -133,15 +133,17 @@
     # 'django.contrib.admindocs',
 )
 
-CONSUMER_KEY = 'D6YrV57bNlgpcviNW3sOpg'
-CONSUMER_SECRET = 'T4YlIE2vgI2sIOjziJp57j97CDx8y05DBzUgcr8YmA'
-ACCESS_TOKEN = '136843335-fKGQEKi8W6R8XOYvxKoxk3nV9V4J09NuN6kZwVpU'
+#Heroku
+#CONSUMER_KEY = 'D6YrV57bNlgpcviNW3sOpg'
+#CONSUMER_SECRET = 'T4YlIE2vgI2sIOjziJp57j97CDx8y05DBzUgcr8YmA'
+#ACCESS_TOKEN = '136843335-fKGQEKi8W6R8XOYvxKoxk3nV9V4J09NuN6kZwVpU'
 ACCESS_TOKEN_SECRET = 'ekL7TYmjF9KPrhXfS04tHTjk2u7NFmxcmUj0Q64'
 
-# CONSUMER_KEY = 'GznGRZ6dl6jAuVckmx6mBQ'
-# CONSUMER_SECRET = 'esrtz7KzaaBefUYwcXP19fQh0CelLaz46SFlfNGeq4'
-# ACCESS_TOKEN = '136843335-THhkenU7PAdvCehHQxSSYNetQvMw2Wh34Ed20p54'
-# ACCESS_TOKEN_SECRET = 'pgtFUrETM5bcL5oBGk38GB0EjHOq5Nlj0FP2UuxITk'
+#Local
+CONSUMER_KEY = 'GznGRZ6dl6jAuVckmx6mBQ'
+CONSUMER_SECRET = 'esrtz7KzaaBefUYwcXP19fQh0CelLaz46SFlfNGeq4'
+ACCESS_TOKEN = '136843335-THhkenU7PAdvCehHQxSSYNetQvMw2Wh34Ed20p54'
+ACCESS_TOKEN_SECRET = 'pgtFUrETM5bcL5oBGk38GB0EjHOq5Nlj0FP2UuxITk'
 
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to
@@ -174,5 +176,5 @@
 
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 
-import dj_database_url
-DATABASES['default'] =  dj_database_url.config()
+#import dj_database_url
+#DATABASES['default'] =  dj_database_url.config()