Merge pull request #6 from samiuelson/greeting_txt

Add greetings text

facebook/utils.py

@@ -1,5 +1,8 @@
 import json
 
+from facebook.api import FacebookApi
+
+
 def _update_button_type(buttonJson):
     buttonJson['type'] = "postback"
     return buttonJson
@@ -37,4 +40,14 @@ def response_elements(elements):
                 "elements": postback_elements
             }
         }
-    })
+    })
+
+def send_greeting_text_config():
+    api = FacebookApi()
+    response = json.dumps({
+        "setting_type":"greeting",
+        "greeting": {
+            "text": "Hi {{user_first_name}}. I am a Prayer helper bot."
+        }
+    })
+    api.post("/me/thread_settings", response)

prayer.py

@@ -34,7 +34,7 @@ def handle_message(sender_id, message):
                     },
                 ]
             )
-        elif lower_text in user_gettext(sender_id, 'help') or user_gettext(sender_id, 'pray') in lower_text or lower_text in 'help':
+        elif lower_text in user_gettext(sender_id, 'help') or user_gettext(sender_id, 'prayer') in lower_text or lower_text in 'help':
             commited_prayers = Intent.query.filter_by(commiter_id = sender_id)
             options = [
                 {
@@ -56,13 +56,13 @@ def handle_message(sender_id, message):
                 options
             )
         elif lower_text in user_gettext(sender_id, u"bible"):
-            # bibleVerses = BibleVerse.query.all()
-            # verse = random.choice(bibleVerses)
-            # if (verse == None):
-            verse = BibleVerse(u"Bóg jest światłością, a nie ma w Nim żadnej ciemności.", "1J5b")
+            bibleVerses = BibleVerse.query.all()
+            verse = random.choice(bibleVerses)
+            if (verse == None):
+                verse = BibleVerse(u"Bóg jest światłością, a nie ma w Nim żadnej ciemności.", "1J5b")
             response_message =  utils.response_text("\"" + verse.text + "\" " + verse.address)
         else:
-            response_message = utils.response_text(user_gettext(sender_id, u"Sorry but I don't understand you.\nType 'help' to get additional information."))
+            response_message = utils.response_text(user_utils.user_name(sender_id) + user_gettext(sender_id, u", God bless you!\nType 'prayer' to see prayer options or 'Bible' to get Bible verse for you."))
 
         response = json.dumps({
             'recipient': { 'id' : sender_id },

web.py

@@ -4,6 +4,8 @@
 from flask.views import MethodView
 from flask_admin import Admin
 from flask_babel import Babel
+
+from facebook import utils
 from facebook.api import FacebookApi
 from prayer import PrayerWebhook as webhook
 from dbms.rdb import db, register_admin
@@ -18,6 +20,8 @@ def create_app():
     admin = Admin(app, name='PrayerBot', template_mode='bootstrap3')
     db.init_app(app)
     register_admin(admin, app)
+    utils.send_greeting_text_config()
+
     return app
 
 ###