replace complex at:// handler with PDSls

src/commands/handle.sh

···
+#!/usr/bin/env bash
+
+function atfile.handle() {
+    uri="$1"
+    handler="$2"
+
+    function atfile.handle.is_temp_file_needed() {
+        handler="${1//.desktop/}"
+        type="$2"
+
+        handlers=(
+            "app.drey.EarTag"
+            "com.github.neithern.g4music"
+        )
+
+        if [[ ${handlers[*]} =~ $handler ]]; then
+            echo 1
+        elif [[ $type == "text/"* ]]; then
+            echo 1
+        else
+            echo 0
+        fi
+    }
+
+    [[ $_output_json == 1 ]] && atfile.die "Command not available as JSON"
+
+    actor="$(echo "$uri" | cut -d "/" -f 3)"
+    key="$(echo "$uri" | cut -d "/" -f 4)"
+
+    atfile.util.create_dir "$_path_blobs_tmp"
+
+    if [[ -n "$actor" && -n "$key" ]]; then
+        atfile.util.override_actor "$actor"
+
+        atfile.say.debug "Getting record...\n↳ NSID: $_nsid_upload\n↳ Repo: $_username\n↳ Key: $key"
+        record="$(com.atproto.repo.getRecord "$_username" "$_nsid_upload" "$key")"
+        error="$(atfile.util.get_xrpc_error $? "$record")"
+        [[ -n "$error" ]] && atfile.die.gui.xrpc_error "Unable to get '$key'" "$error"
+
+        blob_cid="$(echo "$record" | jq -r ".value.blob.ref.\"\$link\"")"
+        blob_uri="$(atfile.util.build_blob_uri "$_username" "$blob_cid")"
+        file_type="$(echo "$record" | jq -r '.value.file.mimeType')"
+
+        if [[ $_os == "linux"* ]] && \
+            [ -x "$(command -v xdg-mime)" ] && \
+            [ -x "$(command -v xdg-open)" ] && \
+            [ -x "$(command -v gtk-launch)" ]; then
+
+            # HACK: Open with browser if $file_type isn't set
+            [[ -z $file_type ]] && file_type="text/html"
+
+            if [[ -z $handler ]]; then
+                atfile.say.debug "Querying for handler '$file_type'..."
+                handler="$(xdg-mime query default "$file_type")"
+            else
+                handler="$handler.desktop"
+                atfile.say.debug "Handler manually set to '$handler'"
+            fi
+
+            # shellcheck disable=SC2319
+            # shellcheck disable=SC2181
+            if [[ -n $handler ]] || [[ $? != 0 ]]; then
+                atfile.say.debug "Opening '$key' ($file_type) with '${handler//.desktop/}'..."
+
+                # HACK: Some apps don't like http(s)://; we'll need to handle these
+                if [[ $(atfile.handle.is_temp_file_needed "$handler" "$file_type") == 1 ]]; then
+                    atfile.say.debug "Unsupported for streaming"
+
+                    download_success=1
+                    # shellcheck disable=SC2154
+                    tmp_path="$_path_blobs_tmp/$blob_cid"
+
+                    if ! [[ -f "$tmp_path" ]]; then
+                        atfile.say.debug "Downloading '$blob_cid'..."
+                        atfile.http.download "$blob_uri" "$tmp_path"
+                        [[ $? != 0 ]] && download_success=0
+                    else
+                        atfile.say.debug "Blob '$blob_cid' already exists"
+                    fi
+
+                    if [[ $download_success == 1 ]]; then
+                        atfile.say.debug "Launching '$handler'..."
+                        gtk-launch "$handler" "$tmp_path" </dev/null &>/dev/null &
+                    else
+                        atfile.die.gui \
+                            "Unable to download '$key'"
+                    fi
+                else
+                    atfile.say.debug "Launching '$handler'..."
+                    gtk-launch "$handler" "$blob_uri" </dev/null &>/dev/null &
+                fi
+            else
+                atfile.say.debug "No handler for '$file_type'. Launching URI..."
+                atfile.util.launch_uri "$blob_uri"
+            fi
+        else
+            atfile.say.debug "Relevant tools not installed. Launching URI..."
+            atfile.util.launch_uri "$blob_uri"
+        fi
+    else
+        atfile.die.gui \
+            "Invalid ATFile URI\n↳ Must be 'atfile://<actor>/<key>'" \
+            "Invalid ATFile URI"
+    fi
+}

src/commands/help.sh

···
     bsky [<actor>]
         Get Bluesky profile for <actor>\n
     handle <at-uri>
-        Open at:// URI with relevant App\n
+        Open at:// URI with PDSls\n
     handle <atfile-uri> [<handler>]
         Open atfile:// URI with relevant App
         ℹ️  Set <handler> to a .desktop entry (with '.desktop') to force the
···
 
 Usage
     $_prog <command> [<arguments>]
-    $_prog at://<actor>[/<collection>/<rkey>]
     $_prog atfile://<actor>/<key>\n\n"
 
     [[ $ATFILE_DEVEL == 1 ]] && usage+="$usage_commands_devel\n\n"

src/commands/old_cmds.sh

···
     fi
 }
 
-function atfile.invoke.handle_atfile() {
-    uri="$1"
-    handler="$2"
-
-    function atfile.invoke.handle_atfile.is_temp_file_needed() {
-        handler="${1//.desktop/}"
-        type="$2"
-
-        handlers=(
-            "app.drey.EarTag"
-            "com.github.neithern.g4music"
-        )
-
-        if [[ ${handlers[*]} =~ $handler ]]; then
-            echo 1
-        elif [[ $type == "text/"* ]]; then
-            echo 1
-        else
-            echo 0
-        fi
-    }
-
-    [[ $_output_json == 1 ]] && atfile.die "Command not available as JSON"
-
-    actor="$(echo "$uri" | cut -d "/" -f 3)"
-    key="$(echo "$uri" | cut -d "/" -f 4)"
-
-    atfile.util.create_dir "$_path_blobs_tmp"
-
-    if [[ -n "$actor" && -n "$key" ]]; then
-        atfile.util.override_actor "$actor"
-
-        atfile.say.debug "Getting record...\n↳ NSID: $_nsid_upload\n↳ Repo: $_username\n↳ Key: $key"
-        record="$(com.atproto.repo.getRecord "$_username" "$_nsid_upload" "$key")"
-        error="$(atfile.util.get_xrpc_error $? "$record")"
-        [[ -n "$error" ]] && atfile.die.gui.xrpc_error "Unable to get '$key'" "$error"
-
-        blob_cid="$(echo "$record" | jq -r ".value.blob.ref.\"\$link\"")"
-        blob_uri="$(atfile.util.build_blob_uri "$_username" "$blob_cid")"
-        file_type="$(echo "$record" | jq -r '.value.file.mimeType')"
-
-        if [[ $_os == "linux"* ]] && \
-            [ -x "$(command -v xdg-mime)" ] && \
-            [ -x "$(command -v xdg-open)" ] && \
-            [ -x "$(command -v gtk-launch)" ]; then
-
-            # HACK: Open with browser if $file_type isn't set
-            [[ -z $file_type ]] && file_type="text/html"
-
-            if [[ -z $handler ]]; then
-                atfile.say.debug "Querying for handler '$file_type'..."
-                handler="$(xdg-mime query default "$file_type")"
-            else
-                handler="$handler.desktop"
-                atfile.say.debug "Handler manually set to '$handler'"
-            fi
-
-            # shellcheck disable=SC2319
-            # shellcheck disable=SC2181
-            if [[ -n $handler ]] || [[ $? != 0 ]]; then
-                atfile.say.debug "Opening '$key' ($file_type) with '${handler//.desktop/}'..."
-
-                # HACK: Some apps don't like http(s)://; we'll need to handle these
-                if [[ $(atfile.invoke.handle_atfile.is_temp_file_needed "$handler" "$file_type") == 1 ]]; then
-                    atfile.say.debug "Unsupported for streaming"
-
-                    download_success=1
-                    # shellcheck disable=SC2154
-                    tmp_path="$_path_blobs_tmp/$blob_cid"
-
-                    if ! [[ -f "$tmp_path" ]]; then
-                        atfile.say.debug "Downloading '$blob_cid'..."
-                        atfile.http.download "$blob_uri" "$tmp_path"
-                        [[ $? != 0 ]] && download_success=0
-                    else
-                        atfile.say.debug "Blob '$blob_cid' already exists"
-                    fi
-
-                    if [[ $download_success == 1 ]]; then
-                        atfile.say.debug "Launching '$handler'..."
-                        gtk-launch "$handler" "$tmp_path" </dev/null &>/dev/null &
-                    else
-                        atfile.die.gui \
-                            "Unable to download '$key'"
-                    fi
-                else
-                    atfile.say.debug "Launching '$handler'..."
-                    gtk-launch "$handler" "$blob_uri" </dev/null &>/dev/null &
-                fi
-            else
-                atfile.say.debug "No handler for '$file_type'. Launching URI..."
-                atfile.util.launch_uri "$blob_uri"
-            fi
-        else
-            atfile.say.debug "Relevant tools not installed. Launching URI..."
-            atfile.util.launch_uri "$blob_uri"
-        fi
-    else
-        atfile.die.gui \
-            "Invalid ATFile URI\n↳ Must be 'atfile://<actor>/<key>'" \
-            "Invalid ATFile URI"
-    fi
-}
-
-function atfile.invoke.handle_aturi() {
-    uri="$1"
-
-    [[ $_output_json == 1 ]] && atfile.die "Command not available as JSON"
-    [[ "$uri" != "at://"* ]] && atfile.die.gui \
-        "Invalid AT URI\n↳ Must be 'at://<actor>[/<collection>/<rkey>]'" \
-        "Invalid AT URI"
-
-    atfile.say.debug "Resolving '$uri'..."
-    app_uri="$(atfile.util.get_app_url_for_at_uri "$uri")"
-    [[ -z "$app_uri" ]] && atfile.die.gui \
-        "Unable to resolve AT URI to App"
-
-    app_proto="$(echo "$app_uri" | cut -d ":" -f 1)"
-
-    atfile.say.debug "Opening '$app_uri' ($app_proto)..."
-
-    if [[ $app_proto == "atfile" ]]; then
-        atfile.invoke.handle_atfile "$app_uri"
-    else
-        atfile.util.launch_uri "$app_uri"
-    fi
-}
-
 function atfile.invoke.list() {
     cursor="$1"
     unset error

src/shared/invoke.sh

···
                 uri="${args[0]}"
                 protocol="$(atfile.util.get_uri_segment "$uri" protocol)"
 
-                if [[ $protocol == "https" ]]; then
-                    http_uri="$uri"
-                    uri="$(atfile.util.map_http_to_at "$http_uri")"
-
-                    atfile.say.debug "Mapping '$http_uri'..."
-                    
-                    if [[ -z "$uri" ]]; then
-                        atfile.die "Unable to map '$http_uri' to at:// URI"
-                    else
-                        protocol="$(atfile.util.get_uri_segment "$uri" protocol)"
-                    fi
-                fi
-
                 atfile.say.debug "Handling protocol '$protocol://'..."
 
                 case $protocol in
-                    "at") atfile.invoke.handle_aturi "$uri" ;;
-                    "atfile") atfile.invoke.handle_atfile "$uri" "${args[1]}" ;;
+                    "at")
+                        atfile.say.debug "Launching '$uri' in PDSls..."
+                        atfile.util.launch_uri "https://pdsls.dev/$uri"
+                        ;;
+                    "atfile")
+                        atfile.handle "$uri" "${args[1]}"
+                        ;;
                 esac
                 ;;
             "help")

src/shared/util.sh

···
     printf "%'d\n" "$1"
 }
 
-# TODO: Check if record actually exists
-function atfile.util.get_app_url_for_at_uri() {
-    uri="$1"
-
-    actor="$(echo "$uri" | cut -d / -f 3)"
-    collection="$(echo "$uri" | cut -d / -f 4)"
-    rkey="$(echo "$uri" | cut -d / -f 5)"
-
-    ignore_url_validation=0
-    resolved_actor="$(atfile.util.resolve_identity "$actor")"
-    error="$(atfile.util.get_xrpc_error $? "$resolved_actor")"
-    [[ -n "$error" ]] && atfile.die.xrpc_error "Unable to resolve '$actor'" "$resolved_actor"
-
-    unset actor_handle
-    unset actor_pds
-    unset resolved_url
-    
-    # shellcheck disable=SC2181
-    if [[ $? == 0 ]]; then
-        actor="$(echo "$resolved_actor" | cut -d "|" -f 1)"
-        actor_handle="$(echo "$resolved_actor" | cut -d "|" -f 3 | cut -d "/" -f 3)"
-        actor_pds="$(echo "$resolved_actor" | cut -d "|" -f 2)"
-    else
-        unset actor
-    fi
-
-    [[ -z "$rkey" ]] && rkey="self"
-
-    if [[ -n "$actor" && -n "$collection" && -n "$rkey" ]]; then
-        case "$collection" in
-            "app.bsky.actor.profile") resolved_url="$_endpoint_social_app/profile/$actor" ;;
-            "app.bsky.feed.generator") resolved_url="$_endpoint_social_app/profile/$actor/feed/$rkey" ;;
-            "app.bsky.graph.list") resolved_url="$_endpoint_social_app/profile/$actor/lists/$rkey" ;;
-            "app.bsky.graph.starterpack") resolved_url="$_endpoint_social_app/starter-pack/$actor/$rkey" ;;
-            "app.bsky.feed.post") resolved_url="$_endpoint_social_app/profile/$actor/post/$rkey" ;;
-            "blue.linkat.board") resolved_url="https://linkat.blue/$actor_handle" ;;
-            "blue.zio.atfile.upload") ignore_url_validation=1 && resolved_url="atfile://$actor/$rkey" ;;
-            "chat.bsky.actor.declaration") resolved_url="$_endpoint_social_app/messages/settings" ;;
-            "com.shinolabs.pinksea.oekaki") resolved_url="https://pinksea.art/$actor/oekaki/$rkey" ;;
-            "com.whtwnd.blog.entry") resolved_url="https://whtwnd.com/$actor/$rkey" ;;
-            "events.smokesignal.app.profile") resolved_url="https://smokesignal.events/$actor" ;;
-            "events.smokesignal.calendar.event") resolved_url="https://smokesignal.events/$actor/$rkey" ;;
-            "fyi.unravel.frontpage.post") resolved_url="https://frontpage.fyi/post/$actor/$rkey" ;;
-            "link.pastesphere.snippet") resolved_url="https://pastesphere.link/user/$actor/snippet/$rkey" ;;
-            "app.bsky.feed.like"| \
-            "app.bsky.feed.postgate"| \
-            "app.bsky.feed.repost"| \
-            "app.bsky.feed.threadgate"| \
-            "app.bsky.graph.follow"| \
-            "app.bsky.graph.listblock"| \
-            "app.bsky.graph.listitem"| \
-            "events.smokesignal.calendar.rsvp"| \
-            "fyi.unravel.frontpage.comment"| \
-            "fyi.unravel.frontpage.vote")
-                record="$(atfile.xrpc.pds.get "com.atproto.repo.getRecord" "repo=$actor&collection=$collection&rkey=$rkey" "" "$actor_pds")"
-
-                if [[ -z "$(atfile.util.get_xrpc_error $? "$record")" ]]; then
-                    case "$collection" in
-                        "app.bsky.feed.like")
-                            resolved_url="$(atfile.util.get_app_url_for_at_uri "$(echo "$record" | jq -r '.value.subject.uri')")" ;;
-                        "app.bsky.feed.postgate")
-                            resolved_url="$(atfile.util.get_app_url_for_at_uri "$(echo "$record" | jq -r '.value.post')")" ;;
-                        "app.bsky.feed.repost")
-                            resolved_url="$(atfile.util.get_app_url_for_at_uri "$(echo "$record" | jq -r '.value.subject.uri')")" ;;
-                        "app.bsky.feed.threadgate")
-                            resolved_url="$(atfile.util.get_app_url_for_at_uri "$(echo "$record" | jq -r '.value.post')")" ;;
-                        "app.bsky.graph.follow")
-                            resolved_url="$_endpoint_social_app/profile/$(echo "$record" | jq -r '.value.subject')" ;;
-                        "app.bsky.graph.listblock")
-                            resolved_url="$(atfile.util.get_app_url_for_at_uri "$(echo "$record" | jq -r '.value.subject')")" ;;
-                        "app.bsky.graph.listitem")
-                            resolved_url="$_endpoint_social_app/profile/$(echo "$record" | jq -r '.value.subject')" ;;
-                        "events.smokesignal.calendar.rsvp")
-                            resolved_url="$(atfile.util.get_app_url_for_at_uri "$(echo "$record" | jq -r '.value.subject.uri')")" ;;
-                        "fyi.unravel.frontpage.comment")
-                            resolved_url="$(atfile.util.get_app_url_for_at_uri "$(echo "$record" | jq -r '.value.post.uri')")/$actor/$rkey" ;;
-                        "fyi.unravel.frontpage.vote")
-                            resolved_url="$(atfile.util.get_app_url_for_at_uri "$(echo "$record" | jq -r '.value.subject.uri')")" ;;
-                    esac
-                fi
-                ;;
-        esac
-    elif [[ -n "$actor" ]]; then
-        resolved_url="https://pdsls.dev/at://$actor"
-    fi
-
-    if [[ -n "$resolved_url" && $ignore_url_validation == 0 ]]; then
-        if [[ $(atfile.util.is_url_okay "$resolved_url") == 0 ]]; then
-            unset resolved_url
-        fi
-    fi
-
-    echo "$resolved_url"
-}
-
 function atfile.util.get_cache_path() {
     # shellcheck disable=SC2154
     mkdir -fp "$_path_cache"
···
         "protocol") echo "$uri" | cut -d ":" -f 1 ;;
         *) echo "$uri" | cut -d "/" -f "$segment" ;;
     esac
-}
-
-function atfile.util.map_http_to_at() {
-    http_uri="$1"
-    unset at_uri
-    unset actor
-    unset collection
-    unset rkey
-
-    case "$(atfile.util.get_uri_segment "$http_uri" host)" in
-        "atproto-browser.vercel.app"|\
-        "pdsls.dev"|\
-        "pdsls.pages.dev")
-            actor="$(atfile.util.get_uri_segment "$http_uri" 6)"
-            collection="$(atfile.util.get_uri_segment "$http_uri" 7)"
-            rkey="$(atfile.util.get_uri_segment "$http_uri" 8)"
-            ;;
-    esac
-
-    if [[ -n "$actor" ]]; then
-        at_uri="at://$actor"
-
-        if [[ -n "$collection" ]]; then
-            at_uri="$at_uri/$collection"
-
-            if [[ -n "$rkey" ]]; then
-                at_uri="$at_uri/$rkey"
-            fi
-        fi
-    fi
-
-    echo "$at_uri"
 }
 
 # HACK: This essentially breaks the entire session (it overrides $_username and