From 09b3d1510b55bb59e56448a6c0257feb3802c0c7 Mon Sep 17 00:00:00 2001
From: eyjhb <eyjhbb@gmail.com>
Date: Wed, 12 Mar 2025 00:02:58 +0100
Subject: [PATCH 1/5] notify: fewer words for a token

---
 machines/gerd/services/notify/app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/machines/gerd/services/notify/app.py b/machines/gerd/services/notify/app.py
index cbc0fa1..7c6a083 100644
--- a/machines/gerd/services/notify/app.py
+++ b/machines/gerd/services/notify/app.py
@@ -361,7 +361,7 @@ def set_user_default_matrix_room(username: str, roomid: str):
     con.commit()
 
 
-def generate_token(num_words: int = 5) -> str:
+def generate_token(num_words: int = 3) -> str:
     mnemo = Mnemonic("english")
     words = mnemo.generate(strength=256)
     return "-".join(words.split(" ")[0:num_words])

From 5564c8cbfcb4f8efd60b81288b2f1c474f34ed69 Mon Sep 17 00:00:00 2001
From: eyjhb <eyjhbb@gmail.com>
Date: Wed, 12 Mar 2025 00:03:15 +0100
Subject: [PATCH 2/5] notify: no need to include dashes in token

---
 machines/gerd/services/notify/app.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/machines/gerd/services/notify/app.py b/machines/gerd/services/notify/app.py
index 7c6a083..88dcd9d 100644
--- a/machines/gerd/services/notify/app.py
+++ b/machines/gerd/services/notify/app.py
@@ -291,7 +291,8 @@ def send_notification():
     con = get_db()
     cur = con.cursor()
     res = cur.execute(
-        "SELECT username FROM tokens WHERE token = ?", (token,)
+        "SELECT username FROM tokens WHERE REPLACE(token, '-', '') = ? OR token = ? ",
+        (token, token),
     ).fetchone()
 
     if not res:

From 2380f6694da2c933eac9f9fbe0f03b834fe6fda0 Mon Sep 17 00:00:00 2001
From: eyjhb <eyjhbb@gmail.com>
Date: Wed, 12 Mar 2025 00:04:14 +0100
Subject: [PATCH 3/5] notify: better documentation

---
 machines/gerd/services/notify/app.py | 33 ++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/machines/gerd/services/notify/app.py b/machines/gerd/services/notify/app.py
index 88dcd9d..2de7532 100644
--- a/machines/gerd/services/notify/app.py
+++ b/machines/gerd/services/notify/app.py
@@ -222,6 +222,18 @@ def index():
           <td>default room</td>
           <td>!yREJWHUMJhGROiHbtu:fricloud.dk or #na-offtopic:rend.al</td>
         </tr>
+        <tr>
+          <th scope="row">token</th>
+          <td>Authorization Token</td>
+          <td>empty</td>
+          <td>enable-trade-decide or enabletradedecide</td>
+        </tr>
+        <tr>
+          <th scope="row">jq</th>
+          <td>jq filter</td>
+          <td>.</td>
+          <td>[.[].commits | .name ] | join("\\n")</td>
+        </tr>
       </tbody>
     </table>
     <hr>
@@ -240,6 +252,27 @@ def index():
     doCheck = false;
   }} ''{script_example_with_token}'';
 </code></pre>
+    <hr>
+    <h2>Notes</h2>
+    <p>
+        <b>jq</b> is very powerful, and can easily be used to turn webhook data into useful information in a notification.
+        Just append your `jq=<url_encoded_query>`, to your notification URL, and then watch the magic.
+        Below is an example for doing it with Forgejo, when new commits are pushed.
+    </p>
+
+    <pre class="border"><code>(.total_commits | tostring)
++ " commits pushed to "
++ .repository.full_name
++ "\n\n" +
+  # format commits
+  ([.commits.[]
+  | "- "
+    + (.message | gsub("[\n\t]"; ""))
+    + " (" + .author.name + ")" ]
+  | join("\n"))
++ "\n\n"
++ "Changes: " + .compare_url</code></pre>
+
 
     <!--
         <p class="fs-5">You've successfully loaded up the Bootstrap starter example. It includes <a href="https://getbootstrap.com/">Bootstrap 5</a> via the <a href="https://www.jsdelivr.com/package/npm/bootstrap">jsDelivr CDN</a> and includes an additional CSS and JS file for your own code.</p>

From 583583ae5f8151664c7bdfd3aba650487e24747b Mon Sep 17 00:00:00 2001
From: eyjhb <eyjhbb@gmail.com>
Date: Wed, 12 Mar 2025 00:04:36 +0100
Subject: [PATCH 4/5] notify: added support for quick URLs

---
 machines/gerd/services/notify/app.py | 32 ++++++++++++++++------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/machines/gerd/services/notify/app.py b/machines/gerd/services/notify/app.py
index 2de7532..abd2e5f 100644
--- a/machines/gerd/services/notify/app.py
+++ b/machines/gerd/services/notify/app.py
@@ -9,14 +9,8 @@ import os
 import jq
 import json
 
-# TODO(eyJhb): add the following
-#   - example of bash alias
-#   - jq filter parameter documentation
-#   - jq filter example
-#   - easy way to run it ONLY with curl
-#      - e.g. curl notify.fricloud.dk/notify/<simple_token>/msg
-
 app = Flask(__name__)
+app.url_map.strict_slashes = False
 
 import logging
 
@@ -175,11 +169,16 @@ def index():
           <input type="submit" class="btn btn-primary" name="action" value="Set Default Room ID">
     <hr>
           <div class="mb-3">
-            <label class="form-label">Token</label>
-            <input type="text" value="{token}" placeholder="token-not-generated" readonly class="form-control" >
+            <label class="form-label">Token (dashes are optional)</label>
+            <input type="text" value="{token}" placeholder="token-not-generated" readonly class="form-control" onclick="this.select();" >
           </div>
           <input type="submit" class="btn btn-primary" name="{generate_token_name}" value="{generate_token_value}">
         </form>
+    <hr>
+      <div class="mb-3">
+        <label class="form-label">Quick URL</label>
+        <input type="text" value="curl {CONFIG_URL}/notify/{token.replace("-", "")}/mymessage" class="form-control" onclick="this.select();" >
+      </div>
     <hr>
     <p>
       This notification service has support for both matrix and email.
@@ -293,18 +292,23 @@ def index():
     return tmpl
 
 
-@app.route("/notify", methods=["GET", "POST"])
-def send_notification():
+@app.route("/notify", methods=["GET", "POST"], defaults={"token": "", "body": ""})
+@app.route("/notify/<token>", methods=["GET", "POST"], defaults={"body": ""})
+@app.route("/notify/<token>/<body>", methods=["GET", "POST"])
+def send_notification(token: str, body: str):
     # default to this
     ntype = request.args.get("type", "matrix")
     title = request.args.get("title", "Notification")
-    body = request.args.get("body", request.get_data().decode("utf-8"))
+    body = request.args.get("body", request.get_data().decode("utf-8") or body)
     if not body:
         body = " "
-    token = request.authorization.token or request.authorization.password
+
+    if request.authorization:
+        token = request.authorization.token or request.authorization.password
+
     if not token:
         return (
-            "No token found, please either specify with Authorization: Bearer <token> or HTTPBasic",
+            "No token found, please either specify with Authorization: Bearer <token>, HTTPBasic or in the URL path",
             401,
         )
 

From d31149cfd0487955782fde2a8f6846f3fe0363b4 Mon Sep 17 00:00:00 2001
From: eyjhb <eyjhbb@gmail.com>
Date: Wed, 12 Mar 2025 00:04:44 +0100
Subject: [PATCH 5/5] notify: added bash alias example

---
 machines/gerd/services/notify/app.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/machines/gerd/services/notify/app.py b/machines/gerd/services/notify/app.py
index abd2e5f..9c6fb49 100644
--- a/machines/gerd/services/notify/app.py
+++ b/machines/gerd/services/notify/app.py
@@ -236,6 +236,9 @@ def index():
       </tbody>
     </table>
     <hr>
+
+    bash alias
+    <pre class="border"><code>notify() {{ curl "{CONFIG_URL}/notify/{token}" -g --data-urlencode "body=${{1:-}}"; }}</code></pre>
     curl
     <pre class="border"><code>curl "{CONFIG_URL}/notify" -H "Authorization: Bearer {token}"</code></pre>
     curl w/ specific body/title