From e032dcf06cdaa7e62e016696fddaa863ecce6cca Mon Sep 17 00:00:00 2001
From: root <root@vern.cc>
Date: Tue, 13 Dec 2022 05:43:33 +0000
Subject: [PATCH] make the post scripts have desc support

---
 tilserv/announce/mkfpost |  9 ++++++---
 tilserv/announce/mkipost | 17 -----------------
 tilserv/announce/mkmpost | 23 ++++++++++++++++-------
 tilserv/announce/mkxpost |  8 ++++++--
 4 files changed, 28 insertions(+), 29 deletions(-)
 delete mode 100755 tilserv/announce/mkipost

diff --git a/tilserv/announce/mkfpost b/tilserv/announce/mkfpost
index 7474c9f..038a732 100755
--- a/tilserv/announce/mkfpost
+++ b/tilserv/announce/mkfpost
@@ -1,8 +1,11 @@
 #!/usr/bin/env -S bash -e
 [[ -z "$1" ]] && {
-	printf "Usage: %s message\n" "$0"
+	printf "Usage: %s message [description]\n" "$0"
 	exit 1
 }
 instance="https://fedi.vern.cc"
-curl "${instance}"/api/v1/statuses -H 'Authorization: Bearer '"$(</root/priv/vernannouncetoken)" -F 'status='"${1}"
-
+if [[ -z ${2} ]]; then
+	curl "${instance}"/api/v1/statuses -H 'Authorization: Bearer '"$(</root/priv/vernannouncetoken)" -F "status=${1}"
+else
+	curl "${instance}"/api/v1/statuses -H 'Authorization: Bearer '"$(</root/priv/vernannouncetoken)" -F "status=${2}" -F "spoiler_text=${1}"
+fi
diff --git a/tilserv/announce/mkipost b/tilserv/announce/mkipost
deleted file mode 100755
index 7d961ed..0000000
--- a/tilserv/announce/mkipost
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env -S bash -e
-
-[[ -z "$1" ]] && {
-	printf "Usage: %s message\n" "$0"
-	exit 1
-}
-
-{
-cat << EOF
-NICK vern
-PASS $(</root/priv/sojupass)
-USER vern bnc.vern.cc bnc.vern.cc vern
-EOF
-cat << EOF
-JOIN #vern-announcements
-EOF
-} | openssl s_client -connect irc.tilde.chat:6697 -quiet
diff --git a/tilserv/announce/mkmpost b/tilserv/announce/mkmpost
index db49cb9..a7dcaec 100755
--- a/tilserv/announce/mkmpost
+++ b/tilserv/announce/mkmpost
@@ -1,6 +1,6 @@
 #!/usr/bin/env -S bash -e
 [[ -z "$1" ]] && {
-	printf "Usage: %s message\n" "$0"
+	printf "Usage: %s message [description]\n" "$0"
 	exit 1
 }
 TxnId() { # Random chars. Needed for sending messages. I am not using tr on /dev/urandom for speed reasons
@@ -11,9 +11,18 @@ TxnId() { # Random chars. Needed for sending messages. I am not using tr on /dev
 }
 instance='https://mtrx.vern.cc'
 RoomId='!DbQXembCUWglXOcHRx:vern.cc'
-curl -s \
-  -X PUT \
-  -H 'Content-Type: application/json' \
-  -H 'Authorization: Bearer '"$(<root/priv/root-access-token)" \
-  -d '{"msgtype":"m.text", "body":"'"${1}"'"}' \
-  "$instance"'/_matrix/client/r0/rooms/'"$RoomId"'/send/m.room.message/'"$(TxnId)"
+if [[ -z ${2} ]]; then
+	curl -s \
+  		-X PUT \
+  		-H 'Content-Type: application/json' \
+  		-H 'Authorization: Bearer '"$(</root/priv/root-access-token)" \
+  		-d '{"msgtype":"m.text", "body":"'"${1}"'"}' \
+  		"$instance"'/_matrix/client/r0/rooms/'"$RoomId"'/send/m.room.message/'"$(TxnId)"
+else
+	curl -s \
+  		-X PUT \
+  		-H 'Content-Type: application/json' \
+  		-H 'Authorization: Bearer '"$(</root/priv/root-access-token)" \
+  		-d '{"msgtype":"m.text", "body":"'"SUBJECT: ${1}\n${2}"'"}' \
+  		"$instance"'/_matrix/client/r0/rooms/'"$RoomId"'/send/m.room.message/'"$(TxnId)"
+fi
diff --git a/tilserv/announce/mkxpost b/tilserv/announce/mkxpost
index 708e0d7..5f5d87e 100755
--- a/tilserv/announce/mkxpost
+++ b/tilserv/announce/mkxpost
@@ -1,6 +1,10 @@
 #!/usr/bin/env -S bash -e
 [[ -z "$1" ]] && {
-	printf "Usage: %s message\n" "$0"
+	printf "Usage: %s message [description]\n" "$0"
 	exit 1
 }
-echo "${1}" | hsendxmpp -u announcements -p "$(</root/priv/xmppannouncepasswd)" -j vern.cc -c announcements@muc.vern.cc -r announcementsbot
+if [[ -z ${2} ]]; then
+	echo "${1}" | hsendxmpp -u announcements -p "$(</root/priv/xmppannouncepasswd)" -j vern.cc -c announcements@muc.vern.cc -r announcementsbot
+else
+	printf "SUBJECT: ${1}\n${2}" | hsendxmpp -u announcements -p "$(</root/priv/xmppannouncepasswd)" -j vern.cc -c announcements@muc.vern.cc -r announcementsbot
+fi