run.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 sqlpage/target/debug/sqlpage -w site -c config/sqlpage.yaml &
 . .venv/bin/activate
+. .env
+export DB WH_HOST WH_PORT
 python3 webhook.py &
 wait

site/conv.sql

@@ -1,4 +1,4 @@
-SET ":me" = COALESCE($me, '5138996314');
+SET ":me" = COALESCE($me, sqlpage.environment_variable('DEFAULT_ME'));
 SET ":peer" = COALESCE(CASE WHEN $peer = '' THEN NULL ELSE $peer END, NULL);
 
 SET ":title" = CASE WHEN :peer IS NULL THEN 'Conversations' ELSE 'Messages ('||COALESCE((SELECT name FROM contacts WHERE number = '+1'||:peer), :peer)||')' END;

sms-sendmail.sh

@@ -1,37 +1,37 @@
 #!/bin/bash
+#
+# Requires: maildrop, postfix, python3
+#
+
+set -euo pipefail
+
 FROM="$1"
 TO="$2"
 MESSAGE="$3"
-CODE="25203"
 
-if [ -z "$TO" ] || [ -z "$FROM" ] || [ -z "$MESSAGE" ]
-then
-	exit 1
-fi
+. .env
 
-sender="wyn3-14@shandan.one"
 recipient="sms@voip.ms"
 subject="$TO.$CODE.$FROM"
 
 printf 'To:\r\nFrom:\r\nContent-Type:\r\n\r\n%s\r\n' "$MESSAGE" \
 	| reformail \
 		-I"To: $recipient" \
-		-I"From: $sender" \
+		-I"From: $SENDER" \
 		-I"Subject: $subject" \
 		-I"Content-Type: text/plain" -d1 \
-	| sendmail -f "$sender" -t
+	| sendmail -f "$SENDER" -t
 
 export MESSAGE FROM TO
 python3 <<'EOF'
 import sqlite3
 from os import environ as env
-params = [ env.get(x) for x in ('FROM', 'TO', 'MESSAGE') ]
-conn = sqlite3.connect('sms.db')
-cursor = conn.cursor()
-cursor.execute("""
+for x in ('FROM', 'TO', 'MESSAGE', 'DB'):
+    globals()[x] = env.get(x)
+with sqlite3.connect(DB) as conn:
+    cursor = conn.cursor()
+    cursor.execute("""
 INSERT INTO outbox (sent, "from", "to", payload)
 VALUES (CURRENT_TIMESTAMP, '+1'||?, '+1'||?, ?)
-""", params)
-conn.commit()
-conn.close()   
+""", [FROM, TO, MESSAGE])
 EOF

webhook.py

@@ -1,12 +1,13 @@
+from datetime import datetime
 from bottle import Bottle, request, response
+from os import environ as env
 import sqlite3
 import json
-from datetime import datetime
 
 app = Bottle()
-DB = "sms.db"
-HOST="192.168.0.20"
-PORT=25203
+
+for x in ('DB', 'WH_HOST', 'WH_PORT'):
+    globals()[x] = env.get(x)
 
 conn = sqlite3.connect(DB)
 cur = conn.cursor()
@@ -31,6 +32,6 @@ VALUES (?, CURRENT_TIMESTAMP, ?, ?)
     return "ok"
 
 try:
-	app.run(host=HOST, port=PORT, debug=True)
+	app.run(host=WH_HOST, port=WH_PORT, debug=True)
 finally:
 	conn.close()