Try new version of trust command, see #198

Signed-off-by: Soenke Huster <me@eknoes.de>
eknoes · Sep 7, 2021 · ccd4de9 · ccd4de9
1 parent 8cc0c56
commit ccd4de9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/resources/signal-reset-session.sh b/resources/signal-reset-session.sh
@@ -9,4 +9,6 @@ if [ -z "$1" ]
     exit 1;
 fi
 
-signald "{\"account\": \"+4915792453845\", \"address\": { \"number\": \"$1\" }, \"type\": \"reset_session\", \"version\": \"v1\" }"
+signald "{\"account\": \"+4915792453845\", \"address\": { \"number\": \"$1\" }, \"type\": \"get_identities\", \"version\": \"v1\" }" jq -rc "{\"number\": .data.address.number, \"safety_number\": (.data.identities[] | select(.trust_level == \"UNTRUSTED\") | .safety_number) } | \"{\\\"type\\\": \\\"trust\\\", \\\"safety_number\\\": \\\"\(.safety_number)\\\", \\\"address\\\": {\\\"number\\\": \(.number), \\\"account\\\": \\\"+4915792453845\\\", \\\"trust_level\\\": \\\"TRUSTED_UNVERIFIED\\\"}\"" | while read trustcmd; do
+  signald "$trustcmd"
+done
diff --git a/resources/signal-trust-new-keys.sh b/resources/signal-trust-new-keys.sh
@@ -8,8 +8,8 @@ signald() {
 }
 
 signald '{"type": "list_accounts"}' | jq -r 'select(.type == "account_list") | .data.accounts[].username' | while read username; do
-        signald "{\"type\": \"get_identities\", \"username\": \"$username\"}" | jq -rc ".data.identities[] | select(.trust_level == \"UNTRUSTED\") | \"{\\\"type\\\": \\\"trust\\\", \\\"fingerprint\\\": \\\"\(.fingerprint)\\\", \\\"recipientAddress\\\": \(.address), \\\"username\\\": \\\"$username\\\"}\"" | while read trustcmd; do
+        signald "{\"type\": \"get_identities\", \"username\": \"$username\"}" | jq -rc ".data.identities[] | select(.trust_level == \"UNTRUSTED\") | \"{\\\"type\\\": \\\"trust\\\", \\\"safety_number\\\": \\\"\(.safety_number)\\\", \\\"address\\\": {\\\"number\\\": \(.address.number), \\\"account\\\": \\\"$username\\\", \\\"trust_level\\\": \\\"TRUSTED_UNVERIFIED\\\"}\"" | while read trustcmd; do
                 signald "$trustcmd"
                 signald "{\"type\": \"send\", \"version\": \"v1\", \"recipientAddress\": {\"number\": \"$SIGNAL_ADMIN_PHONE\"}, \"username\": \"$username\", \"messageBody\": \"$(echo $trustcmd | jq -r .recipientAddress.number) ($(echo $trustcmd | jq -r .recipientAddress.uuid)) new fingerprint is $(echo $trustcmd | jq -r .fingerprint)\"}"
         done
-done
+done