bash-atproto v3.2, bap-bsky v1.1 and bap-sprk v2.0

bash-atproto: add bap_getRecord and bap_getServiceAuth
bash-atproto: fix plc directory resolve notice breaking bap_resolveDID
bash-atproto: bump version to 3.2
bap-bsky: Add bapBsky_cyorGetReplyRoot, bapBsky_cyorAddReply and bapBsky_cyorAddVideo
bap-bsky: bump version to 1.1
bap-sprk: move bapSprk_submitPost down so the cyor functions are at the top
bap-sprk: Add bapSprk_cyorAddVideo
bap-sprk: Add support for alt text in bapSprk_postVideo (BREAKING CHANGE)
bap-sprk: verify correct amount of parameters are passed to bapSprk_cyorAddImage
bap-sprk: bump version to 2.0
New bap-extra with bapExt_authWithATFileCreds

bap-bsky.sh

···
 #!/bin/bash
 # SPDX-License-Identifier: MIT
 # bap-bsky.sh: the bash-atproto functions pertaining to Bluesky Social.
-bapBsky_internalVersion=1
-bapBsky_internalMinorVer=0
-
 if [ -z "$bap_internalVersion" ]; then >&2 echo "bash-atproto not loaded?"; return 127; fi
-if [ "$bap_internalVersion" != "3" ] || ! [ "$bap_internalMinorVer" -ge "0" ]; then >&2 echo "Incorrect bash-atproto version"; return 1; fi
+if [ "$bap_internalVersion" != "3" ] || ! [ "$bap_internalMinorVer" -ge "2" ]; then >&2 echo "Incorrect bash-atproto version"; return 1; fi
+
+bapBsky_internalVersion=1
+bapBsky_internalMinorVer=1
 
 function bapBskyErr () {
    >&2 echo "bap-bsky: $*"
···
    bapCYOR_add height $6 .embed.images.[$1].aspectRatio
 }
 
-# # (porn, sexual, nudity), graphic-media
+function bapBsky_cyorAddVideo () {
+   # param:
+   # 1 - blob
+   # 2 - size
+   # 3 - width
+   # 4 - height
+   # 5 - alt text
+   if [ -z "$4" ]; then bapBskyErr "error: Required argument missing"; return 1; fi
+   bapCYOR_str alt "$5" .embed
+   bapCYOR_str \$type app.bsky.embed.video .embed
+   bapCYOR_str \$type blob .embed.video
+   bapCYOR_str \$link "$1" .embed.video.ref
+   bapCYOR_str mimeType "video/mp4" .embed.video
+   bapCYOR_add size $2 .embed.video
+   bapCYOR_add width $3 .embed.aspectRatio
+   bapCYOR_add height $4 .embed.aspectRatio
+}
+
+# (porn, sexual, nudity), graphic-media
 function bapBsky_cyorAddLabel () {
    if [ -z "$2" ]; then bapBskyErr "error: Required argument missing"; return 1; fi
    bapCYOR_str \$type com.atproto.label.defs#selfLabels .labels
···
    bapCYOR_str val $2 .labels.values.[$1]
 }
 
+function bapBsky_cyorGetReplyRoot () {
+   if [ -z "$1" ]; then bapBskyErr "error: Required argument missing"; return 1; fi
+   bapBsky_temp=$(bap_getRecord $1) || return $?
+   if echo $bapBsky_temp | jq -re '.value.reply.root.uri' > /dev/null; then
+      # copy values
+      bapCYOR_str uri $(echo $bapBsky_temp | jq -re '.value.reply.root.uri') .reply.root
+      bapCYOR_str cid $(echo $bapBsky_temp | jq -re '.value.reply.root.cid') .reply.root
+   else
+      # we just wasted time and bandwidth!
+      bapCYOR_str uri $(echo $bapBsky_temp | jq -re '.uri') .reply.root
+      bapCYOR_str cid $(echo $bapBsky_temp | jq -re '.cid') .reply.root
+   fi
+   return 0
+}
+
+function bapBsky_cyorAddReply () {
+   if [ -z "$1" ]; then bapBskyErr "error: Required argument missing"; return 1; fi
+   bapBsky_temp=$(bap_getRecord $1) || return $?
+   bapCYOR_str uri $(echo $bapBsky_temp | jq -re '.uri') .reply.parent
+   bapCYOR_str cid $(echo $bapBsky_temp | jq -re '.cid') .reply.parent
+   if ! echo $bap_cyorRecord | jq -re '.reply.root' > /dev/null; then bapBsky_cyorGetReplyRoot $1 || return $?; fi
+   return 0
+}
+
 function bapBsky_submitPost () {
    bapCYOR_str createdAt $(date -u +%Y-%m-%dT%H:%M:%S.%3NZ)
    bap_postRecord "$bap_cyorRecord" || return $?
···
 }
 
 function bapBsky_postVideo () {
-# param:
-# 1 - blob
-# 2 - size
-# 3 - width
-# 4 - height
-# 5 - alt text
-# 6 - text
-# assuming video/mp4 is always the mimetype might be a bad assumption
+   # param:
+   # 1-5 - see bapBsky_cyorAddVideo
+   # 6 - text
    if [ -z "$4" ]; then bapBskyErr "fatal: more arguments required"; return 1; fi
    bapBsky_cyorInit
    bapCYOR_str text "$6"
-   bapCYOR_str alt "$5" .embed
-   bapCYOR_str \$type app.bsky.embed.video .embed
-   bapCYOR_str \$type blob .embed.video
-   bapCYOR_str \$link "$1" .embed.video.ref
-   bapCYOR_str mimeType "video/mp4" .embed.video
-   bapCYOR_add size $2 .embed.video
-   bapCYOR_add width $3 .embed.aspectRatio
-   bapCYOR_add height $4 .embed.aspectRatio
+   bapBsky_cyorAddVideo $1 $2 $3 $4 "$5"
    bapBsky_submitPost || return $?
    bapBskyEcho "Posted record at $uri"
    return 0
···
 
 function bapBsky_stubWarn () {
    bapBskyErr "warn: function ${FUNCNAME[1]} was renamed. call $1 instead"
-}
-
-function bap_fakeStub () {
-   bapBsky_stubWarn bapBsky_lol
 }
 
 function bapCYOR_bskypost () {

bap-extra.sh

···
+#!/bin/bash
+# SPDX-License-Identifier: MIT
+# bap-extra.sh: Other functions that might be useful
+if [ -z "$bap_internalVersion" ]; then >&2 echo "bash-atproto not loaded?"; return 127; fi
+if [ "$bap_internalVersion" != "3" ] || ! [ "$bap_internalMinorVer" -ge "1" ]; then >&2 echo "Incorrect bash-atproto version"; return 1; fi
+
+bapExt_internalVersion=1
+bapExt_internalMinorVer=0
+
+function bapExtErr () {
+    >&2 echo "bap-extra: $*"
+}
+
+function bapExtEcho () {
+    if [ ! "$bap_verbosity" -ge 1 ]; then return 0; fi
+    echo "bap-extra: $*"
+}
+
+function bapExt_authWithATFileCreds () {
+    # Auth with atfile credentials for your convenience
+    if [ -f  "$HOME/.config/atfile.env" ]; then while IFS= read -r line; do declare -g "$line"; done < "$HOME/.config/atfile.env"
+    else bapExtErr "no ATFile credentials file to load!"; return 1; fi
+    if [ -z "$ATFILE_USERNAME" ] || [ -z "$ATFILE_PASSWORD" ]; then bapExtErr "ATFile credentials not found!"; fi
+    bap_findPDS $(bap_resolveDID $ATFILE_USERNAME) || { bapExtErr "Couldn't resolve PDS!"; return 1; }
+    bap_getKeys $ATFILE_USERNAME $ATFILE_PASSWORD || { bapExtErr "Couldn't log in with ATFile credentials!"; return 1; }
+    bapInternal_loadFromJwt
+    ATFILE_USERNAME= ATFILE_PASSWORD=
+    bapExtEcho "Auth successful. Use bap_closeSession when done"
+    return 0
+}

bap-sprk.sh

···
 # bap-sprk.sh: Spark the revolution...from the command line!
 # The PDS is not capable of verifying Spark lexicon at the moment, be careful!
 # This code has not been thoroughly tested. Use at your own risk!
-bapSprk_internalVersion=1
-bapSprk_internalMinorVer=0
-
 if [ -z "$bap_internalVersion" ]; then >&2 echo "bash-atproto not loaded?"; return 127; fi
 if [ "$bap_internalVersion" != "3" ] || ! [ "$bap_internalMinorVer" -ge "0" ]; then >&2 echo "Incorrect bash-atproto version"; return 1; fi
+
+
+bapSprk_internalVersion=2
+bapSprk_internalMinorVer=0
 
 function bapSprk_err () {
     >&2 echo "bap-sprk: $*"
···
     bapCYOR_str text ""
 }
 
-function bapSprk_submitPost () {
-   bapCYOR_str createdAt $(date -u +%Y-%m-%dT%H:%M:%S.%3NZ)
-   bap_postRecord "$bap_cyorRecord" || return $?
-   bap_cyorRecord=
-   uri=$(echo $bap_result | jq -r .uri)
-   cid=$(echo $bap_result | jq -r .cid)
-   return 0
-}
-
 function bapSprk_cyorAddImage () {
     # Lexicon has alt text but no image dimensions
     # 1 image, 2 blob, 3 mime, 4 size, 5 alt
+    if [ -z "$4" ]; then bapSprkErr "error: Required argument missing"; return 1; fi
     bapCYOR_str \$type so.sprk.embed.images .embed
     bapCYOR_str alt "$5" .embed.images.[$1]
     bapCYOR_str \$type so.sprk.embed.images#image .embed.images.[$1]
···
     #bapCYOR_add height $7 .embed.images.[$1].aspectRatio
 }
 
+function bapSprk_cyorAddVideo () {
+    if [ -z "$3" ]; then bapSprkErr "error: Required argument missing"; return 1; fi
+    bapCYOR_str \$type so.sprk.embed.video .embed
+    bapCYOR_str alt "$4" .embed
+    bapCYOR_str \$type blob .embed.video
+    bapCYOR_str \$link $1 .embed.video.ref
+    bapCYOR_str mimeType "$3" .embed.video
+    bapCYOR_add size $2 .embed.video
+}
+
+function bapSprk_submitPost () {
+   bapCYOR_str createdAt $(date -u +%Y-%m-%dT%H:%M:%S.%3NZ)
+   bap_postRecord "$bap_cyorRecord" || return $?
+   bap_cyorRecord=
+   uri=$(echo $bap_result | jq -r .uri)
+   cid=$(echo $bap_result | jq -r .cid)
+   return 0
+}
+
 function bapSprk_prepareImage () {
     # 5MB image limit: at://sprk.so/app.bsky.feed.post/3lipdqef2k22n
     # Get rid of dimensions liimt with really big numbers
···
     # 1 blob - $bap_postedImage
     # 2 size - $bap_postedSize
     # 3 mime - $bap_postedMime
+    # 4 alt text
+    # 5 post text
     if [ -z "$3" ]; then bapSprk_err "fatal: more arguments required"; return 1; fi
     bapSprk_cyorInit
-    bapCYOR_str text "$4"
-    bapCYOR_str \$type so.sprk.feed.post
-    bapCYOR_str \$type so.sprk.embed.video .embed
-    bapCYOR_str alt "" .embed
-    bapCYOR_str \$type blob .embed.video
-    bapCYOR_str \$link $1 .embed.video.ref
-    bapCYOR_str mimeType "$bap_postedMime" .embed.video
-    bapCYOR_add size $bap_postedSize .embed.video
+    bapCYOR_str text "$5"
+    bapSprk_cyorAddVideo $1 $2 $3 "$4"
     bapSprk_submitPost "$bap_cyorRecord" || return $?
     bapSprk_echo "Posted record at $uri"
     return 0

bash-atproto.sh

···
 #!/bin/bash
 # SPDX-License-Identifier: MIT
 bap_internalVersion=3
-bap_internalMinorVer=1
+bap_internalMinorVer=2
 
 # you can change these
 bap_plcDirectory=https://plc.directory
···
 function bapverbose () {
    if [ ! "$bap_verbosity" -ge 2 ]; then return 0; fi
    echo "bash-atproto: $*"
+}
+
+function baperrverb () {
+   if [ ! "$bap_verbosity" -ge 2 ]; then return 0; fi
+   >&2 echo "bash-atproto: $*"
 }
 
 function bap_decodeJwt () {
···
    return 0
 
    elif [[ "$1" =~ ^([a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?$ ]]; then
-      bapecho "Looking up handle from $bap_handleResolveURL"
+      baperrverb "Looking up handle from $bap_handleResolveURL"
       bap_temp=$(curl -s -A "$bap_curlUserAgent" -G --data-urlencode "handle=$1" "$bap_handleResolveURL/xrpc/com.atproto.identity.resolveHandle" | jq -re .did)
       if [ "$?" != "0" ]; then
          baperr "Error obtaining DID from API"
···
    bapecho "Using DID: $savedDID"
    return 0
 }
+
+function bap_getRecord () {
+   # get did of user
+   if [ "$bap_verbosity" -ge "2" ]; then >&2 echo -n "bash-atproto: fetching did..."; fi
+   bap_temp[0]=$(bap_resolveDID $(echo $1 | cut -d '/' -f 3)) || { baperr "failed to fetch did of record creator"; return 1; }
+   # get their pds
+   if [ "$bap_verbosity" -ge "2" ]; then >&2 echo -n "pds..."; fi
+   bap_temp[1]=$(bap_resolvePDS ${bap_temp[0]}) || { baperr "failed to fetch pds of record creator"; return 1; }
+   # get the post
+   if [ "$bap_verbosity" -ge "2" ]; then >&2 echo -n "post..."; fi
+   bap_result=$(curl -s --fail-with-body -A "$bap_curlUserAgent" -G --data-urlencode "repo=${bap_temp[0]}" --data-urlencode "collection=$(echo $1 | cut -d '/' -f 4)" --data-urlencode "rkey=$(echo $1 | cut -d '/' -f 5)" ${bap_temp[1]}/xrpc/com.atproto.repo.getRecord) || { bapInternal_errorCheck $? bap_getRecord "failed to fetch record"; return 1; }
+   echo $bap_result
+   baperrverb "ok"
+   bap_result=
+   return 0
+}
+
+function bap_getServiceAuth () {
+   # Service, Lifetime, Lexicon
+   if [ -z "$1" ]; then baperr "Required argument missing"; return 2; fi
+   if ! bapInternal_validateDID $1 2> /dev/null; then baperr "input must be a DID"; return 1; fi
+   bap_temp="aud=$1"
+   if [ -n "$2" ]; then bap_temp="$bap_temp&exp=$(($2 + $(date +%s)))"; fi
+   if [ -n "$3" ]; then bap_temp="$bap_temp&lxm=$3"; fi
+   bap_result=$(curl -s --fail-with-body -A "$bap_curlUserAgent" -G -H "Authorization: Bearer $savedAccess" "$savedPDS/xrpc/com.atproto.server.getServiceAuth?$bap_temp")
+   bapInternal_errorCheck $? bap_getServiceAuth "fatal: failed to mint service auth token" || return $?
+   echo $bap_result | jq -r .token
+   # PDS may change the expiry that bap requests
+   if [ -n "$2" ]; then
+      bap_decodeJwt "$(echo $bap_result | jq -r .token)"
+      if [ "$(($2 + $(date +%s)))" != "$(echo $bap_jwt | jq -r .exp)" ]; then baperr "warn: expiry time mismatch: got $(echo $bap_jwt | jq -r .exp), expected $(($2 + $(date +%s)))"; fi
+   fi
+   bap_result=
+   return 0
+}

docs/HOWTO.md

···
 
 ## Create a Bluesky post
 
-This is the manual way to create a Bluesky post with bap-bsky. You can use `bapBsky_createPost` and `bapBsky_postImage` for basic posts, but manually writing the JSON with the CYOR commands allows for much more flexibility.
+This is the manual way to create a Bluesky post with bap-bsky. You can use `bapBsky_createPost`, `bapBsky_postImage` and `bapBsky_postVideo` for basic posts, but manually writing the JSON with the CYOR commands allows for much more flexibility.
 
 1. `source bap-bsky.sh`
 2. `bapBsky_cyorInit`
···
 
 ### Adding a video
 
-Right now, posting video is only possible with `bapBsky_postVideo`, which creates a post with fixed values that can't be customized with CYOR.
+You can embed a video in the post like this:
 
 1. `bapBsky_prepareVideo <video file> <mime type>`
    1. The mime type for MP4 video is `video/mp4`. Other video types should not be used as `bapBsky_postVideo` and the Bluesky embed lexicon hardcode `video/mp4`.
-2. `bapBsky_postVideo $bap_postedBlob $bap_postedSize $bap_imageWidth $bap_imageHeight "<alt text, optional>" "<post text, optional>"`
+2. `bapBsky_cyorAddVideo $bap_postedBlob $bap_postedSize $bap_imageWidth $bap_imageHeight "<alt text, optional>"`
 
 ### Adding a self-label
 
···
       * Adult - `porn`
       * Graphic Media - `graphic-media`
 
+### Replies
+
+You can set your post to be a reply to another with `bapBsky_cyorAddReply`. It takes a simple AT URI as input.
+
+* `bapBsky_cyorAddReply at://did:plc:z72i7hdynmk6r22z27h6tvur/app.bsky.feed.post/3l6ovsdood32z`
+
+This will also fetch the appropriate root post if it hasn't been added already.
+
 ### Other things
 
-Because of how records work, you can add your own JSON keys, more formally called [unspecced fields](https://www.pfrazee.com/blog/lexicon-guidance#going-off-schema). You can use the `bapCYOR_str` and `bapCYOR_add` functions to do this. As the names imply, the former is for strings and the latter for integers.
+Because of how records work, it's possible to add your own JSON keys, more formally called [unspecced fields](https://www.pfrazee.com/blog/lexicon-guidance#going-off-schema). You can use the `bapCYOR_str` and `bapCYOR_add` functions to do this. As the names imply, the former is for strings and the latter for integers.
 
 For example, if you wanted to secretly embed your pizza preferences in a post, you might run a command like `bapCYOR_str pizzaPreference "with-pineapple"`. This won't be visible in-app, but anyone that views that post's JSON (with [PDSls](https://pdsls.dev), for example) will be able to see your preference for pineapple on pizza.
 
···
 
 ### Post a video
 
-Currently this is limited: No CYOR function for video (yet), and you can't add alt text. There's no Spark-dedicated prepare video command either, so try this:
+There's no Spark-dedicated prepare video command yet, but it's still pretty similar to Bluesky:
 
-1. `bap_postBlobToPDS <video file> video/mp4.`
+1. `bap_postBlobToPDS <video file> video/mp4`
    1. Spark might support other video types, but it's better to just use mp4. You might want to scrub metadata before posting.
-2. `bapSprk_postVideo $bap_postedBlob $bap_postedSize "<post text, optional>"`
+2. `bapSprk_cyorAddVideo $bap_postedBlob $bap_postedSize "<alt text, optional>"`

docs/MISSING.md

···
+Current list of missing features
+
+## bap-bsky
+
+* Communication with Lumi (Bluesky video service)
+
+* Tags (the element, not the facet)
+
+* External embeds
+
+* Facets
+  
+  * I'm not doing this lol
+
+## bap-sprk
+
+To be determined...