Merge branch 'master' of github.com:samiuelson/prayerbot

Conflicts:
	web.py

Author: Kamil Gałuszka

facebook/api.py

@@ -1,14 +1,14 @@
 #!/usr/bin/env python
 
-import httplib
 import os
-import requests
 import sys
 
+import requests
+
 GRAPH_API = "https://graph.facebook.com/"
 
 class FacebookApi:
-    def __init__(self, version = "v2.6"):
+    def __init__(self, version = "v2.8"):
         self.access_token = os.environ.get('ACCESS_TOKEN')
         self.version = version
         self.base_url = GRAPH_API + self.version
@@ -35,5 +35,4 @@ def post(self, path, body = None):
         print("* HTTP response: " + str(response.status_code))
         if response.text != '':
             print("  body: " + response.text)
-        return response
-
+        return response

facebook/user_utils.py

@@ -1,7 +1,7 @@
 import os
 import requests
 
-GRAPH_API_URL = '/v2.6/'
+GRAPH_API_URL = '/v2.8/'
 
 def _get_user_data(user_id):
     access_token = os.environ.get('ACCESS_TOKEN')

intent.db

@@ -1,7 +1,6 @@
 #!/usr/bin/env python2
 # -*- coding: UTF-8 -*-
 
-import json
 from dbms.rdb import db
 from dbms.models import Intent
 from events import *
@@ -14,8 +13,9 @@ class PrayerWebhook(object):
     @staticmethod
     def handle_message(sender_id, message):
         response_message = None
-        text = message['text'].encode('utf-8')
-        lower_text = text.lower()
+        text = message['text']
+        lower_text = unicode(text.lower())
+
         initialized_prayers = Intent.query.filter_by(user_id = sender_id, description = '').all()
         if initialized_prayers != []:
             prayer = initialized_prayers[0]
@@ -106,7 +106,7 @@ def handle_user_event(sender_id, event, payload):
                 sender_id : utils.response_text(user_gettext(sender_id, u"What is your prayer request?")),
             }
         elif event == UserEvent.WANT_TO_PRAY:
-            prayers = Intent.query.filter_by(commiter_id = '').limit(displayed_prayers_limit).all()
+            prayers = Intent.query.filter(Intent.commiter_id == '').filter(Intent.user_id != sender_id).limit(displayed_prayers_limit).all()
             #print('Fetched prayers: ' + json.dumps(prayers))
             prayer_elements = map(map_prayer, prayers)
             if prayer_elements == []:

prayer.py

@@ -12,7 +12,7 @@ flask-babel
 # ----------------------
 # requests
 # ----------------------
-requests==2.10.0
+requests==2.11.1
 
 # ----------------------
 # Testing
@@ -36,4 +36,4 @@ ipdb==0.10.1
 # ----------------------
 SQLAlchemy
 Flask-SQLAlchemy
-psycopg2==2.6.1
+psycopg2==2.6.2