jekyll-activity-pub 0.3.0rc2 → 0.3.0rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24722f4f80296b16a8e845d28e7864c001c7dde35517bb797201e503e1219fec
-  data.tar.gz: e49e896e300c74eb27785e5dba183cd473424ead02e7453e1223ed4d97df8703
+  metadata.gz: bb938546e87448c714988213943b785dc80e45f8732f1467a5194d9062676155
+  data.tar.gz: b3bcd5a07570d8d631c80fd1572e129f7b74d907016be00f81befb48be04beab
 SHA512:
-  metadata.gz: b8456a7a10668b22bce6ab5581b9bb47d854ba04955c8ab47711d9842cfa4f82e085a1fb03e305513628106cc24fe7bbb5c91c09f25b71e5d92ed84efb49a75a
-  data.tar.gz: 627ccc89d7ed1bdd069eb61fb9eb15e9ce5faeeada32c28241cdf79fecc472b4de3f0dd3160da920b63afdbba9bf5b2118525fd8c70a5ebd785863c617270843
+  metadata.gz: 3a6ab712cf1a359bcb43a2f122b8b773899adcf63a937e4493d1e8f71d2dae11da8f0bce678f50effde0a75a363de49adc530c643605335094818fa39de04627
+  data.tar.gz: 1d53716211728821b983f3bcc0fb6eb2a2722a310aba0cbb52aeb76225729977ab4e22cbc5558b8e3e8b4185d4bba49a1466a4b35b8d4d8fcdf3cf70e02fc413

data/lib/jekyll/activity_pub/helper.rb

@@ -16,6 +16,18 @@ module Jekyll
       # Some filters needs a Liquid-like context
       StubContext = Struct.new(:registers, keyword_init: true)
 
+      # Convert into a dereferentiable object
+      #
+      # @return [Jekyll::Drops::ActivityDrop]
+      def to_liquid
+        @to_liquid ||=
+          begin
+            require 'jekyll/drops/activity_drop'
+
+            Jekyll::Drops::ActivityDrop.new(self)
+          end
+      end
+
       # Removes empty values from data
       #
       # @return [Hash]

data/lib/jekyll/activity_pub/notifier.rb

@@ -7,6 +7,7 @@ require 'distributed_press/v1/social/client'
 require 'distributed_press/v1/social/inbox'
 require 'distributed_press/v1/social/outbox'
 require 'distributed_press/v1/social/replies'
+require 'distributed_press/v1/social/dereferencer'
 require_relative 'errors'
 require_relative 'create'
 require_relative 'update'
@@ -56,11 +57,19 @@ module Jekyll
           @@site
         end
 
+        def dereferencer
+          @@dereferencer ||= DistributedPress::V1::Social::Dereferencer.new(client: client)
+        end
+
         # Announce the website?
         def announce?
           !!config['announce']
         end
 
+        def manually_approves_followers?
+          !!config['manually_approves_followers']
+        end
+
         def url
           config['url'].tap do |u|
             abort_if_missing('activity_pub.url', u, '_config.yml')
@@ -129,7 +138,7 @@ module Jekyll
           actor_object = object_for(site.in_dest_dir(actor_url.sub(site.config['url'], '')))
 
           # Create/Update inbox
-          unless (response = inbox.create(actor_url, announce?)).ok?
+          unless (response = inbox.create(actor_url, announce: announce?, manually_approves_followers: manually_approves_followers?)).ok?
             raise NotificationError, "Couldn't create/update inbox (#{response.code}: #{response.message})"
           end
 

data/lib/jekyll/drops/activity_drop.rb

@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+require 'distributed_press/v1/social/referenced_object'
+require 'jekyll/activity_pub/notifier'
+
+class DistributedPress
+  module V1
+    module Social
+      module Liquid
+        def to_liquid
+          @to_liquid ||=
+            begin
+              if object.success?
+                Jekyll::Drops::ActivityDrop.new(object: object.parsed_response)
+              else
+                Jekyll.logger.warn 'ActivityPub:', "Couldn't download #{object.request.uri} (Status: #{object.code})"
+                {}
+              end
+            rescue Exception => e
+              Jekyll.logger.warn 'ActivityPub:', "Couldn't download (Error: #{e.message})"
+              {}
+            end
+        end
+
+        def to_h
+          if object.success?
+            object.parsed_response.to_json
+          else
+            Jekyll.logger.warn 'ActivityPub:', "Couldn't download #{object.request.uri} (Status: #{object.code})"
+
+            {}
+          end
+        end
+
+        def to_s
+          to_json
+        end
+
+        def to_json
+          if object.success?
+            object.parsed_response.to_json
+          else
+            Jekyll.logger.warn 'ActivityPub:', "Couldn't download #{object.request.uri} (Status: #{object.code})"
+
+            object.request.uri
+          end
+        end
+      end
+    end
+  end
+end
+
+DistributedPress::V1::Social::Reference.include DistributedPress::V1::Social::Liquid
+
+module Jekyll
+  module Drops
+    # Converts an activity into a liquid drop that can be dereferenced on
+    # demand.
+    class ActivityDrop < Drop
+      extend Forwardable
+
+      mutable false
+
+      # Iterate over all items of a collection
+      #
+      # @return [Array]
+      def all_items
+        return nil unless @obj.respond_to?(:each)
+
+        @all_items ||= @obj.each.to_a
+      end
+
+      # This means we could dereference the object, Liquid can use it to
+      # check if it's possible to use it.
+      def available
+        true
+      end
+
+      # @todo Still no idea why Liquid/Jekyll initialize this with
+      # different objects
+      def initialize(obj)
+        id =
+          case obj
+          when Jekyll::Page
+            obj['id'] || obj.url
+          when DistributedPress::V1::Social::ReferencedObject
+            obj['id']
+          when Hash
+            obj[:object]['id']
+          end
+
+        raise StandardError unless id
+
+        Jekyll.logger.info 'ActivityPub:', "Referencing #{id}"
+
+        @original_obj = obj
+        @@objects ||= {}
+        @obj = @@objects[id] ||=
+          case obj
+          when Jekyll::Page
+            DistributedPress::V1::Social::ReferencedObject.new(object: JSON.parse(obj.to_json), dereferencer: Jekyll::ActivityPub::Notifier.dereferencer)
+          when DistributedPress::V1::Social::ReferencedObject
+            obj
+          when Hash
+            obj[:object]
+          else raise StandardError
+          end
+      rescue StandardError => e
+        Jekyll.logger.warn 'ActivityPub:', "Error"
+      end
+
+      def to_s
+        @obj.object.to_json
+      end
+
+      def fallback_data
+        @obj
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-activity-pub
 version: !ruby/object:Gem::Version
-  version: 0.3.0rc2
+  version: 0.3.0rc4
 platform: ruby
 authors:
 - Sutty
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-19 00:00:00.000000000 Z
+date: 2024-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: distributed-press-api-client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0rc2
+        version: 0.5.0rc8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0rc2
+        version: 0.5.0rc8
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +128,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sutty-liquid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 - sutty@riseup.net
@@ -178,6 +192,7 @@ files:
 - lib/jekyll/command_extension.rb
 - lib/jekyll/commands/generate_keys.rb
 - lib/jekyll/commands/notify.rb
+- lib/jekyll/drops/activity_drop.rb
 homepage: https://jekyll-activity-pub.sutty.nl/
 licenses:
 - Apache-2.0