From 02964ebf92a7f85496a13a94b839e4a20f16084e Mon Sep 17 00:00:00 2001
From: erebion <noreply@erebion.eu>
Date: Tue, 6 Jan 2026 19:39:57 +0100
Subject: [PATCH] cleaning this all up a bit further...

---
 .../zuginfo_api_create_account.yml            |  7 +++
 ...uginfo_api_create_webpush_subscription.yml | 23 ++++++----
 .../zuginfo_api_detail_subscription.yml       | 44 +++++++++++++++++++
 .../zuginfo_api_list_subscriptions.yml        | 17 +------
 4 files changed, 67 insertions(+), 24 deletions(-)
 create mode 100644 zuginfo_playbooks/zuginfo_api_detail_subscription.yml

diff --git a/zuginfo_playbooks/zuginfo_api_create_account.yml b/zuginfo_playbooks/zuginfo_api_create_account.yml
index 8aea7f6..cabf776 100644
--- a/zuginfo_playbooks/zuginfo_api_create_account.yml
+++ b/zuginfo_playbooks/zuginfo_api_create_account.yml
@@ -59,3 +59,10 @@
     - name: "Print Result of Unknown Request"
       ansible.builtin.debug:
         msg: "{{ account_whatever }}"
+
+    - name: "Print important IDs"
+      ansible.builtin.debug:
+        msg:
+        - "Please save the following IDs:"
+        - "aid: {{ aid }}"
+        - "mysterious_id: {{ mysterious_id }}"
diff --git a/zuginfo_playbooks/zuginfo_api_create_webpush_subscription.yml b/zuginfo_playbooks/zuginfo_api_create_webpush_subscription.yml
index b61fe95..2539232 100644
--- a/zuginfo_playbooks/zuginfo_api_create_webpush_subscription.yml
+++ b/zuginfo_playbooks/zuginfo_api_create_webpush_subscription.yml
@@ -23,13 +23,13 @@
           Referer: https://www.zuginfo.nrw/
       register: webpush_subscription
 
-    - name: "Create WebPush Subscription"
-      ansible.builtin.debug:
-        msg: "{{ webpush_subscription }}"
-
     - set_fact:
         user_id: "{{ webpush_subscription.json.svcResL[0].res.userId }}"
 
+    - name: "Print user_id"
+      ansible.builtin.debug:
+        msg: "{{ user_id }}"
+
     - name: "Get a Channel ID"
       ansible.builtin.uri:
         url: "https://www.zuginfo.nrw/gate/?requestId={{ mysterious_id }}&hciMethod=SubscrUserDetails&hciVersion=1.24&hciClientType=WEB&hciClientVersion=10104&aid={{ aid }}&rnd={{ unix_time_millis }}"
@@ -42,13 +42,13 @@
           Referer: https://www.zuginfo.nrw/
       register: channel_id
 
-    - name: "channel_id"
-      ansible.builtin.debug:
-        msg: "{{ channel_id }}"
-
     - set_fact:
         channel_id: "{{ channel_id.json.svcResL[0].res.availableChannels[0].channelId }}"
 
+    - name: "Print channel_id"
+      ansible.builtin.debug:
+        msg: "{{ channel_id }}"
+
     - name: "Subscribe to info for S4"
       ansible.builtin.uri:
         url: "https://www.zuginfo.nrw/gate/?requestId={{ mysterious_id }}&hciMethod=SubscrCreate&hciVersion=1.24&hciClientType=WEB&hciClientVersion=10104&aid={{ aid }}&rnd={{ unix_time_millis }}"
@@ -85,3 +85,10 @@
     - name: "Result: Verify Subscription"
       ansible.builtin.debug:
         msg: "{{ verify_subscription }}"
+
+    - name: "Print important IDs"
+      ansible.builtin.debug:
+        msg:
+        - "Please save the following IDs:"
+        - "user_id: {{ user_id }}"
+        - "channel_id: {{ channel_id }}"
diff --git a/zuginfo_playbooks/zuginfo_api_detail_subscription.yml b/zuginfo_playbooks/zuginfo_api_detail_subscription.yml
new file mode 100644
index 0000000..9756f4d
--- /dev/null
+++ b/zuginfo_playbooks/zuginfo_api_detail_subscription.yml
@@ -0,0 +1,44 @@
+---
+
+- name: "Zuginfo.nrw API"
+  hosts: localhost
+  vars:
+    unix_time_millis: "1762342729099"
+    aid: ""
+    mysterious_id: ""
+    user_id: ""
+    subscription_id: ""
+
+  tasks:
+    - name: "List Subscriptions"
+      ansible.builtin.uri:
+        url: "https://www.zuginfo.nrw/gate/?requestId={{ mysterious_id }}&hciMethod=SubscrSearch&hciVersion=1.24&hciClientType=WEB&hciClientVersion=10104&aid={{ aid }}&rnd={{ unix_time_millis }}"
+        method: POST
+        body: "{{ lookup('ansible.builtin.template','list_subscriptions.json.j2') }}"
+        headers:
+          Accept-Encoding: gzip, deflate, br, zstd
+          Content-Type: application/json
+          Origin: https://www.zuginfo.nrw/
+          Referer: https://www.zuginfo.nrw/
+          TE: trailers
+      register: list_subscription
+
+    - name: "Print Result: List of Subscriptions"
+      ansible.builtin.debug:
+        msg: "{{ list_subscription }}"
+
+    - name: "Detail Subscriptions"
+      ansible.builtin.uri:
+        url: "https://www.zuginfo.nrw/gate/?requestId={{ mysterious_id }}&hciMethod=SubscrUserDetails&hciVersion=1.24&hciClientType=WEB&hciClientVersion=10104&aid={{ aid }}&rnd={{ unix_time_millis }}"
+        method: POST
+        body: "{{ lookup('ansible.builtin.template','detail_subscriptions.json.j2') }}"
+        headers:
+          Accept-Encoding: gzip, deflate, br, zstd
+          Content-Type: application/json
+          Origin: https://www.zuginfo.nrw/
+          Referer: https://www.zuginfo.nrw/
+      register: detail_subscription
+
+    - name: "Print Result: Details of Subscriptions"
+      ansible.builtin.debug:
+        msg: "{{ detail_subscription }}"
diff --git a/zuginfo_playbooks/zuginfo_api_list_subscriptions.yml b/zuginfo_playbooks/zuginfo_api_list_subscriptions.yml
index 4ebd1b8..dabdc73 100644
--- a/zuginfo_playbooks/zuginfo_api_list_subscriptions.yml
+++ b/zuginfo_playbooks/zuginfo_api_list_subscriptions.yml
@@ -6,6 +6,7 @@
     unix_time_millis: "1762342729099"
     aid: ""
     mysterious_id: ""
+    user_id: ""
 
   tasks:
     - name: "List Subscriptions"
@@ -24,19 +25,3 @@
     - name: "Print Result: List of Subscriptions"
       ansible.builtin.debug:
         msg: "{{ list_subscription }}"
-
-    - name: "Detail Subscriptions"
-      ansible.builtin.uri:
-        url: "https://www.zuginfo.nrw/gate/?requestId={{ mysterious_id }}&hciMethod=SubscrUserDetails&hciVersion=1.24&hciClientType=WEB&hciClientVersion=10104&aid={{ aid }}&rnd={{ unix_time_millis }}"
-        method: POST
-        body: "{{ lookup('ansible.builtin.template','detail_subscriptions.json.j2') }}"
-        headers:
-          Accept-Encoding: gzip, deflate, br, zstd
-          Content-Type: application/json
-          Origin: https://www.zuginfo.nrw/
-          Referer: https://www.zuginfo.nrw/
-      register: detail_subscription
-
-    - name: "Print Result: Details of Subscriptions"
-      ansible.builtin.debug:
-        msg: "{{ detail_subscription }}"