diff --git a/block_list/views.py b/block_list/views.py index 18a7f3c..d3e50aa 100644 --- a/block_list/views.py +++ b/block_list/views.py @@ -58,20 +58,12 @@ def home(request): if not access_token: return HttpResponse("You need an access token!") token = oauth.OAuthToken.from_string(access_token) -<<<<<<< HEAD twit = Twitter(auth=OAuth(token.key, token.secret, CONSUMER_KEY, CONSUMER_SECRET)) login_id = request.session.get('login_id') login_name = request.session.get('login_name') login_screen_name = request.session.get('login_screen_name') #login_user = twit.users.show(screen_name=twit.account.settings().get('screen_name')) -======= - twit = Twitter(auth=OAuth(token.key, - token.secret, - CONSUMER_KEY, - CONSUMER_SECRET)) - login_user = twit.users.show(screen_name=twit.account.settings().get('screen_name')) ->>>>>>> Changed DB and included blocked list #POST method lets you block the selected users if request.method == "POST": getids = request.POST.getlist('followers') @@ -84,13 +76,9 @@ def home(request): user_obj = Blocked_List.objects.get(user_id=login_id) temp_list = eval(user_obj.blocked_users) except: -<<<<<<< HEAD user_obj = Blocked_List(user_id=login_id, share='no') -======= - user_obj = Blocked_List(user_id=login_user.get('id'), - share='no') ->>>>>>> Changed DB and included blocked list + #Changed DB and included blocked list temp_list = list() for id_ in getids: if id_ not in temp_list: @@ -102,13 +90,8 @@ def home(request): response = twit.blocks.ids() getids = response.get('ids') try: -<<<<<<< HEAD - user_obj = Blocked_List.objects.get(user_id=login_id) - temp_list = eval(user_obj.blocked_users) -======= - blockedListObj = Blocked_List.objects.get(user_id=login_user.get('id')) + blockedListObj = Blocked_List.objects.get(user_id=login_id) temp_list = eval(blockedListObj.blocked_users) ->>>>>>> Changed DB and included blocked list for id_ in getids: if id_ not in temp_list: temp_list.append(id_) @@ -116,11 +99,7 @@ def home(request): except: for id_ in getids: blocked_ids.append(id_) -<<<<<<< HEAD - blocked_list = Blocked_List(user_id=login_id, -======= - blockedListObj = Blocked_List(user_id=login_user.get('id'), ->>>>>>> Changed DB and included blocked list + blockedListObj = Blocked_List(user_id=login_id, share='no', blocked_users=blocked_ids) blockedListObj.save() @@ -174,54 +153,15 @@ def blocked_lists(request): token = oauth.OAuthToken.from_string(access_token) twit = Twitter(auth=OAuth(token.key, token.secret, CONSUMER_KEY, CONSUMER_SECRET)) -<<<<<<< HEAD - data = dict() - blocked_data = dict() login_id = request.session.get('login_id') login_name = request.session.get('login_name') login_screen_name = request.session.get('login_screen_name') - login_user = twit.users.show(screen_name=twit.account.settings().get('screen_name')) - if request.method == "POST": - getids = request.POST.getlist('blocked_users') - try: - user_obj = Blocked_List.objects.get(user_id=login_id) - block_list = eval(user_obj.blocked_users) - for id_ in getids: - response = twit.blocks.destroy(user_id=id_) - if id_ in block_list: - block_list.remove(id_) - if len(block_list) == 0: - user_obj.delete() - else: - user_obj.blocked_users = block_list - user_obj.save() - subcribedListObj = Subscribed_List.objects.get(user_id=login_id) - subcribedListObj.delete() - except: - temp_list = list() - user_list = request.POST.getlist('user_list') - for id_ in getids: - response = twit.blocks.create(user_id=id_) - temp_list.append(id_) - user_obj = Blocked_List(user_id=login_id, share='no') - user_obj.blocked_users = json.dumps(temp_list) - user_obj.save() - import pdb - pdb.set_trace() - subcribedListObj = Subscribed_List(user_id=login_id, - subscribed_users=json.dumps(user_list)) - subcribedListObj.save() - getids = twit.friends.ids(user_id=login_id).get('ids') -======= login_user = twit.users.show(screen_name=twit.account.settings().get('screen_name')) if request.method == "POST": getids = request.POST.getlist('blocked_users') user_id = int(request.POST.getlist('user_list')[0]) - temp_list = list() try: - import pdb - pdb.set_trace() - user_obj = Blocked_List.objects.get(user_id=login_user.get('id')) + user_obj = Blocked_List.objects.get(user_id=login_id) if not user_obj.subscribed_users == '': subscribed_users = eval(user_obj.subscribed_users) else: @@ -248,15 +188,14 @@ def blocked_lists(request): for id_ in getids: response = twit.blocks.create(user_id=id_) temp_list.append(int(id_)) - user_obj = Blocked_List(user_id=login_user.get('id'), + user_obj = Blocked_List(user_id=login_id, share='no', blocked_users=temp_list, subscribed_users=[user_id]) user_obj.save() data = dict() blocked_data = dict() - getids = twit.friends.ids(user_id=login_user.get('id')).get('ids') ->>>>>>> Changed DB and included blocked list + getids = twit.friends.ids(user_id=login_id).get('ids') #check the ids in db for loop for id_ in getids: try: @@ -266,15 +205,9 @@ def blocked_lists(request): #append to data friend_blocks = list() try: -<<<<<<< HEAD - subcribedListObj = Subscribed_List.objects.get(user_id=login_id) - if user_obj.user_id in eval(subcribedListObj.subscribed_users): - alredy_subscribed = False -======= - loggedUserBlockObj = Blocked_List.objects.get(user_id=int(login_user.get('id'))) + loggedUserBlockObj = Blocked_List.objects.get(user_id=int(login_id)) if int(user_obj.user_id) in eval(loggedUserBlockObj.subscribed_users): alredy_subscribed = True ->>>>>>> Changed DB and included blocked list else: alredy_subscribed = False except: @@ -283,8 +216,7 @@ def blocked_lists(request): blocked_user = twit.users.show(user_id=blocked_id) friend_blocks.append((blocked_id, blocked_user.get('name'), - blocked_user.get('screen_name'), - )) + blocked_user.get('screen_name'))) blocked_data[(friend.get('id'),friend.get('name'), friend.get('screen_name'),str(alredy_subscribed))] = friend_blocks except: diff --git a/twitter_app/views.py b/twitter_app/views.py index 44f84c4..14a8e8f 100644 --- a/twitter_app/views.py +++ b/twitter_app/views.py @@ -65,8 +65,6 @@ def return_(request): CONSUMER_KEY, CONSUMER_SECRET) ) login_user = twit.users.show(screen_name=twit.account.settings().get('screen_name')) - import pdb - pdb.set_trace() request.session['login_id'] = login_user.get('id') request.session['login_name'] = login_user.get('name') request.session['login_screen_name'] = login_user.get('screen_name')