From 63d82b4422fd2f8f441dc41b79e9d932b545bb4b Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 25 Oct 2018 02:50:17 -0700 Subject: [PATCH] Databases! Added a sqlitedb. A better DB is gonna be needed once I figure out data models. --- .gitignore | 2 ++ populate-sms-db.py | 15 +++++++++++++++ smslisten.py | 25 +++++++++++++++++++------ 3 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 populate-sms-db.py diff --git a/.gitignore b/.gitignore index f28fd17..e59a7f2 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ creds\.sh *.komodoproject desktop\.ini + +sms\.db diff --git a/populate-sms-db.py b/populate-sms-db.py new file mode 100644 index 0000000..2c48984 --- /dev/null +++ b/populate-sms-db.py @@ -0,0 +1,15 @@ +#make sms db. +import sqlite3 + +smsdb = sqlite3.connect('sms.db') +smscursor = smsdb.cursor() + +smscursor.execute('''CREATE TABLE sms + (id text, date text, to_did text, from_did text, message text)''') + +smscursor.execute("INSERT INTO sms VALUES ('0','2006-01-05 01:49:10','9515551212','4245556053','booooooooooooooo')") +smscursor.execute("INSERT INTO sms VALUES ('1','2006-01-05 01:49:14','9515551212','4245556053','hihi hows you?')") + + +# Save (commit) the changes +smsdb.commit() \ No newline at end of file diff --git a/smslisten.py b/smslisten.py index ed07331..7666c71 100644 --- a/smslisten.py +++ b/smslisten.py @@ -4,16 +4,21 @@ import requests import json import pprint import time +import sqlite3 +import datetime from flask import Flask, request from flowroutenumbersandmessaging.flowroutenumbersandmessaging_client import FlowroutenumbersandmessagingClient import sys reload(sys) sys.setdefaultencoding('utf-8') + counter = 1 + basic_auth_user_name = os.environ.get('FR_ACCESS_KEY') basic_auth_password = os.environ.get('FR_SECRET_KEY') from_number = os.environ.get('FROM_NUMBER') + client = FlowroutenumbersandmessagingClient(basic_auth_user_name, basic_auth_password) messages_controller = client.messages @@ -30,19 +35,19 @@ def inboundsms(): json_content = request.json reply_to = json_content['data']['attributes']['from'] reply_from = json_content['data']['attributes']['to'] + msg_id = json_content['data']['id'] body = json_content['data']['attributes']['body'].decode('utf-8') pprint.pprint(body) if body.lower() == u'count'.lower(): - sendreply(reply_to, from_number, "There have been " + str(counter) + " messages sent to this system.") + sendreply(reply_to, reply_from, "There have been " + str(counter) + " messages sent to this system.") elif body.lower() == u'help'.lower(): - sendreply(reply_to, from_number, "Right now only the command 'count' works.") + sendreply(reply_to, reply_from, "Right now only the command 'count' works.") else: #Echo a reply - sendreply(reply_to, from_number, "What? You should type 'help' for a list of valid commands") + sendreply(reply_to, reply_from, "What? You should type 'help' for a list of valid commands") - file = open("sms-logs.txt","a") - file.write(reply_to +': ' + body + "\n") - file.close() + logsqlite(msg_id, reply_from, reply_to, body) # Lets log to our silly db. + counter += 1 return '0' @@ -51,6 +56,14 @@ def smscount(): print("Returning the count of " + str(counter) + ".") return str(counter) +def logsqlite(msg_id, to_did, from_did, msg): + smsdb = sqlite3.connect('sms.db') + smscursor = smsdb.cursor() + smscursor.execute("INSERT INTO sms VALUES (?,?,?,?,?)", (msg_id,datetime.datetime.now(),to_did, from_did, msg)) + smsdb.commit() + smsdb.close() + return '0' + def sendreply(reply_to, reply_from, msg): request_body = '{ \ "data": { \