distributed-press-api-client 0.5.0rc8 → 0.5.0rc9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03507acb74efe4f9acac94ec797a4e9e2c763e0bea35a64442c2cc5be9a433bd
-  data.tar.gz: d291bf8e88761714b282fb54273dc220615f53ea0d2647a95447c13ff0d3b7c1
+  metadata.gz: 35ce06825d1ddabae961e86d8bdd698c5554f0e75a0dd74cc91741f508b23a2e
+  data.tar.gz: 74864dd3aaf4ac30d7a3a4cbba91ffe0c7d33dda6881a706e3bdef73682732ad
 SHA512:
-  metadata.gz: 639668b2192c1e7c256de2d294582e96a1f9c3ddb701ca6102805e7a887265df6a7d73579b97fc5d4dcbe6564b5dbab852e798b22182824cefdf805312dcc17c
-  data.tar.gz: 9d54c9a9567c1af53340d9d412a67cf43513c80c2af3642dc843949af0120165cf5a6e7eef8fcef106880e077273157fa84953a25842a735e32e229a617e7c42
+  metadata.gz: a66393b7fd19dba0355757c0590e2334671db099892d7ffa36471053fc07402247c74ab72f26681d2cc006beba68f5ed8d1eceab3c3d793308427d57e00cd863
+  data.tar.gz: 2e6c050daa4c9fc9f5192be716f1bf733c221b4020ded3e1ce637ef59e02a8f8020888f539d348f9e69a412dfc1819d330d0beb1ce21535725e7d67146371cd5

data/lib/distributed_press/v1/social/collection.rb

@@ -11,20 +11,47 @@ class DistributedPress
       class Collection < ReferencedObject
         include Enumerable
 
-        RECURSIVE_ATTRIBUTES = %w[items orderedItems first next].freeze
+        ATTRIBUTES = %w[items orderedItems].freeze
+        RECURSIVE_ATTRIBUTES = %w[first next].freeze
 
         # If the Collection has items, yield them and keep processing
         # any pages forward until the end.
         #
-        # @todo Use totalItems from the starting object for validation
         # @todo Implement lazy loading
         def each(&block)
+          counter = 0
+          total_items = object['totalItems']
+
           Enumerator.new do |enum|
-            RECURSIVE_ATTRIBUTES.each do |attribute|
-              next unless object.key?(attribute)
+            catch :total_items_reached do
+              ATTRIBUTES.each do |attribute|
+                next unless object.key?(attribute)
+
+                referenced[attribute].each(&block).each do |item|
+                  counter += 1
+
+                  enum << item
+
+                  if total_items
+                    throw :total_items_reached if total_items == counter
+                    throw :total_items_reached if counter > 1000
+                  end
+                end
+              end
+
+              RECURSIVE_ATTRIBUTES.each do |attribute|
+                next unless object.key?(attribute)
+                throw :total_items_reached if object['id'] && object['id'] == referenced[attribute]['id']
+
+                referenced[attribute].each(&block).each do |item|
+                  counter += 1
+                  enum << item
 
-              object[attribute].each(&block).each do |item|
-                enum << item
+                  if total_items
+                    throw :total_items_reached if total_items == counter
+                    throw :total_items_reached if counter > 1000
+                  end
+                end
               end
             end
           end

data/lib/distributed_press/v1/social/dereferencer.rb

@@ -56,7 +56,7 @@ class DistributedPress
           loop do
             uri = uris(uri)
             client = clients(uri)
-            response = client.get(endpoint: uri.path, parser: @parser)
+            response = client.get(endpoint: uri.request_uri, parser: @parser)
 
             # Break the loop if the request failed
             break unless response.success?

data/lib/distributed_press/v1/social/inbox.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'uri'
+require 'base64'
 require_relative 'client'
 
 class DistributedPress
@@ -64,7 +64,7 @@ class DistributedPress
         # @param :id [String] Activity ID
         # @return [HTTParty::Response]
         def reject(id:)
-          client.delete(endpoint: "#{endpoint}/#{URI.encode_uri_component(id)}")
+          client.delete(endpoint: "#{endpoint}/#{Base64.encode64(id).delete("\n")}")
         end
 
         # Accept an activity queued on the inbox
@@ -72,7 +72,7 @@ class DistributedPress
         # @param :id [String] Activity ID
         # @return [HTTParty::Response]
         def accept(id:)
-          client.post(endpoint: "#{endpoint}/#{URI.encode_uri_component(id)}", body: {})
+          client.post(endpoint: "#{endpoint}/#{Base64.encode64(id).delete("\n")}", body: {})
         end
 
         # Inbox

data/lib/distributed_press/v1/social/reference.rb

@@ -21,7 +21,9 @@ class DistributedPress
 
         # @param :uri [String]
         # @param :dereferencer [DistributedPress::V1::Social::Dereferencer]
-        def initialize(uri:, dereferencer:)
+        # @param :object [ReferencedObject,nil]
+        def initialize(uri:, dereferencer:, object: nil)
+          @object = object
           @uri = uri
           @dereferencer = dereferencer
         end
@@ -58,7 +60,7 @@ class DistributedPress
           "#{self.class.name}(#{uri})"
         end
 
-        def_delegators :object, :[], :dig, :to_h, :to_json, :slice, :key?, :keys
+        def_delegators :object, :[], :dig, :to_h, :to_json, :slice, :key?, :keys, :each
       end
     end
   end

data/lib/distributed_press/v1/social/referenced_object.rb

@@ -9,6 +9,8 @@ class DistributedPress
       class ReferencedObject
         extend Forwardable
 
+        # Mastodon hides self-replies
+        URI_FIXES = %r{&?only_other_accounts=true&?}
         REFERENTIABLE_ATTRIBUTES =
           %w[
             actor
@@ -46,11 +48,10 @@ class DistributedPress
 
         def_delegators :referenced, :[], :dig, :to_h, :to_json, :keys, :key?
 
-        def initialize(object:, dereferencer:)
+        def initialize(object:, dereferencer:, referenced: nil)
           @object = object
           @dereferencer = dereferencer
-          @referenced = HTTParty::ModuleInheritableAttributes.hash_deep_dup(object)
-          reference_object! referenced
+          @referenced = referenced || reference_object(object)
         end
 
         def _dump(_)
@@ -63,36 +64,54 @@ class DistributedPress
           new(object: object, dereferencer: dereferencer)
         end
 
+        def success?
+          true
+        end
+
+        def parsed_response
+          self
+        end
+
         private
 
-        def reference_object!(object)
-          REFERENTIABLE_ATTRIBUTES.each do |attribute|
-            next unless object.key? attribute
-
-            case object[attribute]
-            when Array
-              object[attribute].map! do |o|
-                case o
-                when Hash
-                  reference_object!(o)
-                  o
-                when String
-                  if o == DistributedPress::V1::Social::Reference::PUBLIC
-                    o
-                  else
-                    dereferencer.references(dereferencer.uris(o))
-                  end
+        def reference_object(object)
+          case object
+          when Array
+            object.map do |sub_object|
+              reference_object sub_object
+            end
+          when Hash
+            new_object = object.dup
+
+            new_object.each_key do |attribute|
+              next unless REFERENTIABLE_ATTRIBUTES.include? attribute
+
+              new_object[attribute] = reference_object object[attribute]
+            end
+
+            # XXX: Embedded objects may not have an ID, but they do have
+            # a type.
+            if new_object['type']
+              new_object =
+                case new_object['type']
+                when 'Collection', 'OrderedCollection', 'CollectionPage', 'OrderedCollectionPage'
+                  Collection.new(object: object, referenced: new_object, dereferencer: self)
                 else
-                  o
+                  ReferencedObject.new(object: object, referenced: new_object, dereferencer: self)
                 end
-              end
-            when Hash
-              reference_object!(object[attribute])
-            when String
-              unless object[attribute] == DistributedPress::V1::Social::Reference::PUBLIC
-                object[attribute] = dereferencer.references(dereferencer.uris(object[attribute]))
-              end
+
+              Reference.new(dereferencer: dereferencer, object: new_object, uri: new_object['id'])
+            else
+              new_object
+            end
+          when String
+            if object == DistributedPress::V1::Social::Reference::PUBLIC
+              object
+            else
+              dereferencer.references(dereferencer.uris(object.sub(URI_FIXES, '')))
             end
+          else
+            object
           end
         end
       end

data/lib/distributed_press/version.rb

@@ -3,5 +3,5 @@
 # API client
 class DistributedPress
   # Version
-  VERSION = '0.5.0rc8'
+  VERSION = '0.5.0rc9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: distributed-press-api-client
 version: !ruby/object:Gem::Version
-  version: 0.5.0rc8
+  version: 0.5.0rc9
 platform: ruby
 authors:
 - f
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-24 00:00:00.000000000 Z
+date: 2024-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable