bskyrb 0.5 → 0.5.2

data/lib/bskyrb/records.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Bskyrb
   class RecordManager
     include RequestUtils
@@ -9,6 +10,7 @@ module Bskyrb
 
     def get_post_by_url(url, depth = 10)
       # e.g. "https://staging.bsky.app/profile/naia.bsky.social/post/3jszsrnruws27"
+      # or "at://did:plc:scx5mrfxxrqlfzkjcpbt3xfr/app.bsky.feed.post/3jszsrnruws27"
       # regex by chatgpt:
       query = Bskyrb::AppBskyFeedGetpostthread::GetPostThread::Input.new.tap do |q|
         q.uri = at_post_link(session.pds, url)
@@ -16,7 +18,7 @@ module Bskyrb
       end
       res = HTTParty.get(
         get_post_thread_uri(session.pds, query),
-        headers: default_authenticated_headers(session)
+        headers: default_authenticated_headers(session),
       )
       Bskyrb::AppBskyFeedDefs::PostView.from_hash res["thread"]["post"]
     end
@@ -27,7 +29,7 @@ module Bskyrb
       HTTParty.post(
         upload_blob_uri(session.pds),
         body: image_bytes,
-        headers: default_authenticated_headers(session)
+        headers: default_authenticated_headers(session),
       )
     end
 
@@ -38,47 +40,17 @@ module Bskyrb
       HTTParty.post(
         create_record_uri(session.pds),
         body: input.to_h.compact.to_json,
-        headers: default_authenticated_headers(session)
+        headers: default_authenticated_headers(session),
       )
     end
 
-    def detect_facets(json_hash) # TODO, DOES NOT WORK YET
-      # For some reason this always fails at finding text records and I have no idea why
-      # Detect domain names that have been @mentioned in the text
-      matches = json_hash["record"]["text"].scan(/@([^\s.]+\.[^\s]+)/)
-
-      # Create a facets array to hold the resolved handles
-      facets = []
-
-      # Loop through the matches and resolve the handles
-      matches.each do |match|
-        handle = match[0]
-        resolved_handle = resolve_handle(session.pds, handle)
-        byte_start = json_hash["record"]["text"].index("@" + handle)
-        byte_end = byte_start + handle.length
-        facet = {
-          "$type": "app.bsky.richtext.facet",
-          features: [
-            {
-              "$type": "app.bsky.richtext.facet#mention",
-              did: resolved_handle
-            }
-          ],
-          index: {
-            byteStart: byte_start,
-            byteEnd: byte_end
-          }
-        }
-        facets.push(facet)
-      end
-
-      # Append the facets to the JSON hash
-      json_hash["record"]["facets"] = facets
-
-      # Convert the JSON hash back to a string
-      JSON.generate(json_hash)
-
-      # "Doesn't work yet"
+    def delete_record(collection, rkey)
+      data = { collection: collection, repo: session.did, rkey: rkey }
+      HTTParty.post(
+        delete_record_uri(session),
+        body: data.to_json,
+        headers: default_authenticated_headers(session),
+      )
     end
 
     def create_post(text)
@@ -89,34 +61,36 @@ module Bskyrb
         "record" => {
           "$type" => "app.bsky.feed.post",
           "createdAt" => DateTime.now.iso8601(3),
-          "text" => text
-        }
+          "text" => text,
+        },
       })
       create_record(input)
     end
 
     def create_reply(replylink, text)
       reply_to = get_post_by_url(replylink)
-      reply_json = {
-        root: {
-            uri: reply_to.uri,
-            cid: reply_to.cid,
-        },
-        parent: {
-            uri: reply_to.uri,
-            cid: reply_to.cid,
+      input = Bskyrb::ComAtprotoRepoCreaterecord::CreateRecord::Input.from_hash({
+        "collection" => "app.bsky.feed.post",
+        "$type" => "app.bsky.feed.post",
+        "repo" => session.did,
+
+        "record" => {
+          "reply" => {
+            "parent" => {
+              "uri" => reply_to.uri,
+              "cid" => reply_to.cid,
+            },
+            "root" => {
+              "uri" => reply_to.uri,
+              "cid" => reply_to.cid,
+            },
+          },
+          "$type" => "app.bsky.feed.post",
+          "createdAt" => DateTime.now.iso8601(3),
+          "text" => text,
         },
-        collection: "app.bsky.feed.post",
-        repo: session.did,
-        record: {
-          "$type": "app.bsky.feed.post",
-          createdAt: DateTime.now.iso8601(3),
-          text: text
-        }
-      },
-      reply_hash = JSON.parse(reply_json.to_json)
-      reply = Bskyrb::ComAtprotoRepoCreaterecord::CreateRecord::Input.from_hash(reply_hash)
-      create_record(reply)
+      })
+      create_record(input)
     end
 
     def profile_action(username, type)
@@ -126,27 +100,26 @@ module Bskyrb
         "record" => {
           "subject" => resolve_handle(session.pds, username)["did"],
           "createdAt" => DateTime.now.iso8601(3),
-          "$type" => type
-        }
+          "$type" => type,
+        },
       })
       create_record(input)
     end
 
-
     def post_action(post, action_type)
       data = {
         collection: action_type,
         repo: session.did,
         record: {
-            subject: {
-                uri: post.uri,
-                cid: post.cid,
-            },
-            createdAt: DateTime.now.iso8601(3),
-            "$type": action_type
-        }
-    }
-    create_record(data)
+          subject: {
+            uri: post.uri,
+            cid: post.cid,
+          },
+          createdAt: DateTime.now.iso8601(3),
+          "$type": action_type,
+        },
+      }
+      create_record(data)
     end
 
     def like(post_url)
@@ -158,29 +131,15 @@ module Bskyrb
       post = get_post_by_url(post_url)
       post_action(post, "app.bsky.feed.repost")
     end
-    
+
     def follow(username)
       profile_action(username, "app.bsky.graph.follow")
     end
 
-    # def unfollow(username)
-    #   profile_action(username, "app.bsky.graph.unfollow(?)")
-    # end
-                                    #NONE OF THESE WORK 
-    # def mute(username)
-    #   profile_action(username, "app.bsky.graph.mute")
-    # end
-
-    # def unmute(username)
-    #   profile_action(username, "app.bsky.graph.unmute")
-    # end
-    
-
     def block(username)
       profile_action(username, "app.bsky.graph.block")
     end
 
-
     def get_latest_post(username)
       feed = get_latest_n_posts(username, 1)
       feed.feed.first
@@ -193,7 +152,7 @@ module Bskyrb
       end
       hydrate_feed HTTParty.get(
         get_author_feed_uri(session.pds, query),
-        headers: default_authenticated_headers(session)
+        headers: default_authenticated_headers(session),
       ), Bskyrb::AppBskyFeedGetauthorfeed::GetAuthorFeed::Output
     end
 
@@ -203,7 +162,7 @@ module Bskyrb
       end
       hydrate_feed HTTParty.get(
         get_timeline_uri(session.pds, query),
-        headers: default_authenticated_headers(session)
+        headers: default_authenticated_headers(session),
       ), Bskyrb::AppBskyFeedGettimeline::GetTimeline::Output
     end
 
@@ -213,7 +172,7 @@ module Bskyrb
       end
       hydrate_feed HTTParty.get(
         get_popular_uri(session.pds, query),
-        headers: default_authenticated_headers(session)
+        headers: default_authenticated_headers(session),
       ), Bskyrb::AppBskyUnspeccedGetpopular::GetPopular::Output
     end
 

data/lib/bskyrb/session.rb

@@ -1,28 +1,12 @@
+# typed: false
 require "uri"
 require "httparty"
 
-# def bsky_register(pds, user, password, invcode, email) # lets you create new accounts on a pds directly from ruby
-#   # doesn't go within session class because it wouldn't work unless you already have an account
-#   data = {
-#     "email": email,
-#     "handle": user + ".bsky.social", # defaulting to bsky.social handles because you can't add dns records for a DID that doesn't exist yet
-#     "inviteCode": invcode,
-#     "password": password,
-#   }
-#   resp = HTTParty.post(
-#     "#{pds}/xrpc/com.atproto.server.createAccount",
-#     body: data.to_json,
-#     headers: {'Content-Type' => 'application/json'}
-#   )
-#   resp
-# end
-
-module Bskyrb  
+module Bskyrb
   module RequestUtils
     def resolve_handle(pds, username)
-      HTTParty.get(
-        "#{pds}/xrpc/com.atproto.identity.resolveHandle?handle=#{username}"
-      )
+      resolveHandle = XRPC::Endpoint.new(pds, "com.atproto.identity.resolveHandle", :handle)
+      resolveHandle.get(handle: username)
     end
 
     def query_obj_to_query_params(q)
@@ -34,13 +18,17 @@ module Bskyrb
     end
 
     def default_headers
-      {"Content-Type" => "application/json"}
+      { "Content-Type" => "application/json" }
     end
 
     def create_record_uri(pds)
       "#{pds}/xrpc/com.atproto.repo.createRecord"
     end
 
+    def delete_record_uri(pds)
+      "#{pds}/xrpc/com.atproto.repo.deleteRecord"
+    end
+
     def upload_blob_uri(pds)
       "#{pds}/xrpc/com.atproto.repo.uploadBlob"
     end
@@ -63,18 +51,39 @@ module Bskyrb
 
     def default_authenticated_headers(session)
       default_headers.merge({
-        Authorization: "Bearer #{session.access_token}"
+        Authorization: "Bearer #{session.access_token}",
       })
     end
 
     def at_post_link(pds, url)
-      # e.g. "https://staging.bsky.app/profile/naia.bsky.social/post/3jszsrnruws27"
       url = url.to_s
-      # regex by chatgpt:
-      raise "The provided URL #{url} does not match the expected schema" unless /https:\/\/[a-zA-Z0-9.-]+\/profile\/[a-zA-Z0-9.-]+\/post\/[a-zA-Z0-9.-]+/.match?(url)
+
+      # Check if the URL is already in AT format
+      if url.start_with?("at://")
+        # Validate the username and post ID in the URL
+        parts = url.split("/")
+        if parts.length == 5 && parts[3] == "app.bsky.feed.post"
+          username = parts[2]
+          post_id = parts[4]
+          if post_id
+            return url
+          end
+        end
+
+        # If the URL is not valid, raise an error
+        raise "The provided URL #{url} is not a valid AT URL"
+      end
+
+      # Validate the format of the regular URL and extract the username and post ID
+      regex = /https:\/\/[a-zA-Z0-9.-]+\/profile\/[a-zA-Z0-9.-]+\/post\/[a-zA-Z0-9.-]+/
+      raise "The provided URL #{url} does not match the expected schema" unless regex.match?(url)
       username = url.split("/")[-3]
-      did = resolve_handle(pds, username)["did"]
       post_id = url.split("/")[-1]
+
+      # Validate the username and post ID in the AT URL
+      did = resolve_handle(pds, username)["did"]
+
+      # Construct the AT URL
       "at://#{did}/app.bsky.feed.post/#{post_id}"
     end
   end
@@ -103,14 +112,15 @@ module Bskyrb
       uri = URI("#{pds}/xrpc/com.atproto.server.createSession")
       response = HTTParty.post(
         uri,
-        body: {identifier: credentials.username, password: credentials.pw}.to_json,
-        headers: default_headers
+        body: { identifier: credentials.username, password: credentials.pw }.to_json,
+        headers: default_headers,
       )
+
+      raise UnauthorizedError if response.code == 401
+
       @access_token = response["accessJwt"]
       @refresh_token = response["refreshJwt"]
       @did = response["did"]
     end
   end
-
-
 end

data/lib/bskyrb/version.rb

@@ -1,5 +1,6 @@
+# typed: strict
 # frozen_string_literal: true
 
 module Bskyrb
-  VERSION = "0.5"
+  VERSION = "0.5.2"
 end

data/lib/bskyrb/xrpc.rb

@@ -0,0 +1,24 @@
+# typed: false
+require "uri"
+require "httparty"
+require "json"
+
+module XRPC
+  class Endpoint
+    attr_reader :request_uri
+
+    def initialize(pds, endpoint_location, *params)
+      @pds = pds
+      @endpoint_location = endpoint_location
+      @params = params
+    end
+
+    def get(params)
+      query_params = URI.encode_www_form(params)
+      @request_uri = URI("#{@pds}/xrpc/#{@endpoint_location}?#{query_params}")
+
+      response = HTTParty.get(@request_uri)
+      JSON.parse(response.body)
+    end
+  end
+end

data/lib/bskyrb.rb

@@ -1,5 +1,8 @@
+# typed: strict
 # frozen_string_literal: true
 
+require "bskyrb/error"
 require "bskyrb/session"
 require "bskyrb/records"
 require "bskyrb/generated_classes"
+require "bskyrb/xrpc"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bskyrb
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: 0.5.2
 platform: ruby
 authors:
 - Shreyan Jain
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-02 00:00:00.000000000 Z
+date: 2023-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -25,20 +25,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: net-http
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: date
   requirement: !ruby/object:Gem::Requirement
@@ -76,11 +62,13 @@ extra_rdoc_files: []
 files:
 - "./lib/bskyrb.rb"
 - "./lib/bskyrb/codegen.rb"
+- "./lib/bskyrb/error.rb"
 - "./lib/bskyrb/firehose.rb"
 - "./lib/bskyrb/generated_classes.rb"
 - "./lib/bskyrb/records.rb"
 - "./lib/bskyrb/session.rb"
 - "./lib/bskyrb/version.rb"
+- "./lib/bskyrb/xrpc.rb"
 homepage: https://github.com/ShreyanJain9/bskyrb
 licenses:
 - MIT