Skip to content

Commit

Permalink
Support Inline responses !!!!
Browse files Browse the repository at this point in the history
  • Loading branch information
@FlameFractal
FlameFractal committed Nov 4, 2017
1 parent 0f77683 commit 5065a4b
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 46 deletions.
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ A telegram-bot that sends Mess Menu push-notifications right before meal timings

## Version history

15. support inline mode!
14. reduce LOC by 20%
13. dining hall 2 - extra items picture
12. improved db
Expand Down
120 changes: 74 additions & 46 deletions messmenu.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

botToken = str(os.environ.get('botToken'))
myjsonId = str(os.environ.get('myjsonId'))
dh2ExtrasPhotoId = str(os.environ.get('dh2ExtrasPhotoId'))
botUsername = str(os.environ.get('botUsername'))
appUrl = str(os.environ.get('appUrl'))
debugId = str(os.environ.get('debugId'))
Expand All @@ -19,19 +20,44 @@
messUrl = 'http://messmenu.snu.in/messMenu.php/'
replyMarkup = '{"keyboard":[["/dh1_menu", "/dh2_menu"],["/dh1_notifs", "/dh2_notifs"],["/both_notifs", "/deregister"],["/dh2_extras", "/help"]]}'
users = requests.get(myjsonUrl).json() # { user_id:{mess_choice: (-1:deregister, 0:DH1, 1:DH2), name:, username} }
helpString = """Hi! I'll send you Mess Menu notifications three times a day, right before your meal timings : 7:30AM, 11:30AM, 7:30PM.\n
You can use these commands to interface with me:\n
/dh1\_notifs - Daily notifications for DH1
/dh2\_notifs - Daily notifications for DH2
/both\_notifs - Daily notifications for BOTH
/deregister - NO daily notifications
/dh1\_menu - Get today's DH1 Menu
/dh2\_menu - Get today's DH2 Menu
/dh2\_extras - DH2's Rollu, Evening, Drinks menu.
/help - Display this help menu
Github repo: https://github.com/FlameFractal/SNU-Mess-Menu-Notifs/\n
To report a bug or suggest improvements, please contact @vishaaaal, thank you."""


######################### Some important functions #########################

def debug_print(debug_message):
if debug_print_on==True:
print(debug_message)
print(str(debug_message))

def sendMessage(user_id, msg):
requests.get('https://api.telegram.org/bot'+botToken+'/sendMessage?parse_mode=Markdown&chat_id='+str(user_id)+'&text='+msg+'&reply_markup='+replyMarkup+'&disable_web_page_preview=TRUE')

def sendPhoto(user_id, photo, caption=''):
requests.get('https://api.telegram.org/bot'+botToken+'/sendPhoto?chat_id='+str(user_id)+'&photo='+str(photo)+'&caption='+str(caption)+'&replyMarkup='+replyMarkup)

def answerInlineQuery(query_id, mess):
if mess=='1':
inlineResults = [{"type":"article","id":"0","title":"DH1 - Current time","input_message_content":{"message_text":getBLDString(0,4), "parse_mode": "Markdown"}}, {"type":"article","id":"1","title":"DH1 - Breakfast","input_message_content":{"message_text":getBLDString(0,1), "parse_mode": "Markdown"}},{"type":"article","id":"2","title":"DH1 - Lunch","input_message_content":{"message_text":getBLDString(0,2), "parse_mode": "Markdown"}},{"type":"article","id":"3","title":"DH1 - Dinner","input_message_content":{"message_text":getBLDString(0,3), "parse_mode": "Markdown"}},{"type":"article","id":"4","title":"DH1 - Full day","input_message_content":{"message_text":getBLDString(0,5), "parse_mode": "Markdown"}}]
else:
inlineResults = [{"type":"article","id":"5","title":"DH2 - Current time","input_message_content":{"message_text":getBLDString(1,4), "parse_mode": "Markdown"}}, {"type":"article","id":"6","title":"DH2 - Breakfast","input_message_content":{"message_text":getBLDString(1,1), "parse_mode": "Markdown"}},{"type":"article","id":"7","title":"DH2 - Lunch","input_message_content":{"message_text":getBLDString(1,2), "parse_mode": "Markdown"}},{"type":"article","id":"8","title":"DH2 - Dinner","input_message_content":{"message_text":getBLDString(1,3), "parse_mode": "Markdown"}},{"type":"article","id":"9","title":"DH2 - Full day","input_message_content":{"message_text":getBLDString(1,5), "parse_mode": "Markdown"}},{"type":"photo","id":"10","title":"DH2 - Extras Menu","caption":"DH2 - Extras Menu", "photo_file_id":str(dh2ExtrasPhotoId)}]
debug_print(inlineResults)
debug_print(requests.get('https://api.telegram.org/bot'+botToken+'/answerInlineQuery?inline_query_id='+str(query_id)+'&switch_pm_text=Slow net? Try inside&switch_pm_parameter=help&results='+json.dumps(inlineResults)).text)

def fetchMenuItems(mess_choice):
try:
menuItems = ((bs.BeautifulSoup(requests.get(messUrl, timeout=1).text,'lxml')).find_all(id='dh2MenuItems'))[mess_choice].find_all('td')
Expand Down Expand Up @@ -78,9 +104,6 @@ def getBLDString(mess_choice, bld): #bld can be 1-Breakfast, 2-Lunch, 3-Dinner,

return BLDString

def sendFullMenu(user_id, mess):
sendMessage(user_id, getBLDString(mess, 5))

def sendCurrentMenuAllUsers():
for user_id in users:
if users[user_id]["mess_choice"] >= 0: # send only if want notifications
Expand All @@ -95,76 +118,81 @@ def webhook_handler():
response = request.get_json()
requests.get('https://api.telegram.org/bot'+botToken+'/sendMessage?parse_mode=Markdown&chat_id='+debugId+'&text='+str(response))

if("channel_post" in response):
return ''

field = "message" if ("message" in response) else "edited_message" # check if new message or edited message
user_id = str(response[field]["chat"]["id"]) # get the id
users[user_id]["name"] = response[field]["chat"]["first_name"] # get the first name
if "last_name" in response[field]["chat"]: # get the last name
if("message" in response):
field = "message"
if "text" in response[field]:
user_msg = str(response[field]["text"])
user_id = str(response[field]["from"]["id"]) # get the id
elif("edited_message" in response):
field = "edited_message"
user_msg = str(response[field]["text"])
user_id = str(response[field]["from"]["id"]) # get the id
elif("inline_query" in response):
field = "inline_query"
user_id = str(response[field]["from"]["id"]) # get the id
query_id = str(response[field]["id"]) # get the id
query_msg = str(response[field]["query"]) # get the id
if query_msg.strip()=='': # if user hasnt entered query, show him his mess_choice menu !
query_msg = str((users[user_id]["mess_choice"])+1)
debug_print("default mess for inline is "+query_msg)
debug_print(answerInlineQuery(query_id, query_msg))
return str(response)
else:
return str(response)

# extract user information
if "first_name" in response[field]["from"]: # get the first name
users[user_id]["name"] = response[field]["from"]["first_name"]
if "last_name" in response[field]["from"]: # get the last name
users[user_id]["name"] = users[user_id]["name"] + " " + response[field]["chat"]["last_name"]
if "username" in response[field]["chat"]: # get the username
users[user_id]["username"] = response[field]["chat"]["username"]
if "text" in response[field]:
user_msg = str(response[field]["text"])

botReply = ""
if user_msg == '/start':
sendMessage(user_id, "Hello there! Welcome!")
sendMessage(user_id, "Your request for notifications has been registered.\nDefault Mess DH-2 selected.\nType '/help' to switch mess!")
users[user_id]["mess_choice"] = 1
botReply = "Hello there! Welcome!\nYour request for notifications has been registered.\nDefault Mess DH-2 selected.\nType '/help' to switch mess!"
elif user_msg == '/dh1_notifs':
users[user_id]["mess_choice"] = 0
sendMessage(user_id, "Your request for notifications has been registered.\nMess DH-1 selected.\nThank you!")
botReply = "Your request for notifications has been registered.\nMess DH-1 selected.\nThank you!"
elif user_msg == '/dh2_notifs':
users[user_id]["mess_choice"] = 1
sendMessage(user_id, "Your request for notifications has been registered.\nMess DH-2 selected.\nThank you!")
botReply = "Your request for notifications has been registered.\nMess DH-2 selected.\nThank you!"
elif user_msg == '/both_notifs':
users[user_id]["mess_choice"] = 2
sendMessage(user_id, "Your request for notifications has been registered.\nMess DH-1 and DH-2 selected.\nThank you!")
botReply = "Your request for notifications has been registered.\nMess DH-1 and DH-2 selected.\nThank you!"
elif user_msg == '/deregister':
users[user_id]["mess_choice"] = -1
sendMessage(user_id, "Your request for deregistering for notifications has been noted.\nThank you!")
botReply = "Your request for deregistering for notifications has been noted.\nThank you!"
elif user_msg == '/dh1_menu':
sendFullMenu(user_id, 0)
botReply = getBLDString(0, 5)
elif user_msg == '/dh2_menu':
sendFullMenu(user_id, 1)
botReply = getBLDString(1, 5)
elif user_msg == '/dh2_extras':
sendPhoto(user_id, 'AgADBQAD2qcxG0eK2VfpzkXxLhHWRaQYzDIABHPxFna3WsVEDKgDAAEC', 'DH2 extras menu')
sendPhoto(user_id, dh2ExtrasPhotoId, 'DH2 Extras Menu')
return ''
elif '/adhoc_update'+secretSauce in user_msg: # admin function
new_menu = user_msg.replace('/adhoc_update'+secretSauce,'')
if '/dh1' in new_menu:
new_menu = new_menu.replace('/dh1 ','')
new_menu = "*Menu for DH1*\n\n"+new_menu
for user in users:
if users[user]["mess_choice"] == 0 or users[user]["mess_choice"] == 2:
sendMessage(user, new_menu.strip())
for user_id in users:
if users[user_id]["mess_choice"] == 0 or users[user_id]["mess_choice"] == 2:
sendMessage(user_id, new_menu.strip())
elif '/dh2' in new_menu:
new_menu = new_menu.replace('/dh2 ','')
new_menu = "*Menu for DH2*\n\n"+new_menu
for user in users:
if users[user]["mess_choice"] == 1 or users[user]["mess_choice"] == 2:
sendMessage(user, new_menu.strip())
for user_id in users:
if users[user]["mess_choice"] == 1 or users[user_id]["mess_choice"] == 2:
sendMessage(user_id, new_menu.strip())
else:
sendMessage(user_id, "Oops. Did not understand that.")
sendMessage(user_id,"Oops. Did not understand that.")
return ''
elif user_msg == '/help':
sendMessage(user_id, """Hi! I'll send you Mess Menu notifications three times a day, right before your meal timings : 7:30AM, 11:30AM, 7:30PM.\n
You can use these commands to interface with me:\n
/dh1\_notifs - Daily notifications for DH1
/dh2\_notifs - Daily notifications for DH2
/both\_notifs - Daily notifications for BOTH
/deregister - NO daily notifications
/dh1\_menu - Get today's DH1 Menu
/dh2\_menu - Get today's DH2 Menu
/dh2\_extras - DH2's Rollu, Evening, Drinks menu.
/help - Display this help menu
Github repo: https://github.com/FlameFractal/SNU-Mess-Menu-Notifs/\n
To report a bug or suggest improvements, please contact @vishaaaal, thank you.""")
botReply = helpString
else:
sendMessage(user_id, "Oops! I don't understand that yet!\nType '/help' to see all the commands.")
botReply = "Oops! I don't understand that yet!\nType '/help' to see all the commands."
sendMessage(user_id, botReply)
requests.put(myjsonUrl, headers={'content-type':'application/json', 'data-type':'json'}, data=json.dumps(users)) # update users database
return str(response)

Expand Down

0 comments on commit 5065a4b

Please sign in to comment.