jekyll-activity-pub 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bbfcc9584215764c7097b8dbd857fba16fb9638676ef80a646dd77021f9b72c
-  data.tar.gz: a7d019c0613766a3c107e9aa24775032e1721348a4057d62424da9aa48e8340a
+  metadata.gz: 25980131086d34cbf873f6b6ae1d40ce1f75ea6955befbf1e5a565752bf06109
+  data.tar.gz: e3312417ad44dcfec2890a80a48260aff9b189b47c1ff5c8f2fa6ed8cda5a470
 SHA512:
-  metadata.gz: b9556ee3d0b03bb45c9dd051c24edb59915056d44886d56b15b7c6a4cdfed1520e28f3aa955769e8b5d3592f71dd704ab9328b148f22ddd77f6f9be577e666c0
-  data.tar.gz: 89bc2152540aeaeec52c5363afa646d9318a1cf9c34f2d732fcc705e785b359dce620ef98e2175b7f0c104ba86d74600b0a22fb4a8990be900d9d2c2fa74a077
+  metadata.gz: 2a2596e48239c38d84622f98afffa5f2e228edebe839d8bcd47f355b7fc248b6888496e7a3949d6e9bd3869bea3c2a59686a5d8079bc1cb87f6f2353e954d54d
+  data.tar.gz: 15a1ea8620e2376b32b5f347f88657b1c9133bbbef4be08c7bfc764501e0979921d871330ddba35b4445522261c9c5947d4a6f7245a8ea423e32d028166d4f9f

data/lib/jekyll/activity_pub/helper.rb

@@ -16,6 +16,15 @@ module Jekyll
       # Some filters needs a Liquid-like context
       StubContext = Struct.new(:registers, keyword_init: true)
 
+      # Removes empty values from data
+      #
+      # @return [Hash]
+      def pruned_data
+        data.reject do |_, v|
+          v.nil? || (v.respond_to?(:empty?) && v.empty?)
+        end
+      end
+
       # Renders the data hash as a stringified JSON
       #
       # @return [String]
@@ -188,12 +197,6 @@ module Jekyll
 
         absolute_url url
       end
-
-      def pruned_data
-        data.reject do |_, v|
-          v.nil? || (v.respond_to?(:empty?) && v.empty?)
-        end
-      end
     end
   end
 end

data/lib/jekyll/activity_pub/notifier.rb

@@ -123,8 +123,13 @@ module Jekyll
           actor_object = object_for(site.in_dest_dir(actor_url.sub(site.config['url'], '')))
 
           # Create inbox
-          unless (response = inbox.create(actor_url)).ok?
-            raise NotificationError, "Couldn't create inbox (#{response.code}: #{response.message})"
+          #
+          # @todo Updating/Key rotation seems broken for now
+          # @see {https://github.com/hyphacoop/social.distributed.press/issues/51}
+          unless inbox.get.ok?
+            unless (response = inbox.create(actor_url)).ok?
+              raise NotificationError, "Couldn't create/update inbox (#{response.code}: #{response.message})"
+            end
           end
 
           # Remove notifications already performed and notify

data/lib/jekyll-activity-pub-fep-fffd-distributed-press.rb

@@ -7,7 +7,8 @@
 # the original activities after this plugins runs, use priority 0.
 #
 # The hook runs on pre render so we can add the extra pages.
-Jekyll::Hooks.register :site, :pre_render, priority: 1 do |site|
+Jekyll::Hooks.register :site, :post_render, priority: 1 do |site|
+  require 'pry'
   require 'jekyll/activity_pub/link'
 
   # Changes the URLs from a base URL to have a different scheme
@@ -49,7 +50,6 @@ Jekyll::Hooks.register :site, :pre_render, priority: 1 do |site|
   site.pages.each do |page|
     case page
     when Jekyll::ActivityPub::Activity, Jekyll::ActivityPub::Actor
-      site = page.site
       uri = Addressable::URI.parse page.data['id']
       url = [ Jekyll::ActivityPub::Link.new(site, page.data['url'], 'canonical', 'text/html') ]
 
@@ -62,9 +62,8 @@ Jekyll::Hooks.register :site, :pre_render, priority: 1 do |site|
       end
 
       %w[ipns hyper bittorrent].each do |protocol|
-        json = convert_uris(page.data, site.config['url'], protocol).reject do |_, v|
-          v.nil? || (v.respond_to?(:empty?) && v.empty?)
-        end
+        json = convert_uris(page.pruned_data, site.config['url'], protocol)
+        json['url'] = url
 
         uri  = Addressable::URI.parse(json['id'])
         uri.path = uri.path.sub('.jsonld', ".#{protocol}.jsonld")
@@ -74,9 +73,14 @@ Jekyll::Hooks.register :site, :pre_render, priority: 1 do |site|
         Jekyll::PageWithoutAFile.new(site, site.source, File.dirname(path), File.basename(path)).tap do |alternate|
           site.pages << alternate
 
-          alternate.content = json.to_json
+          alternate.output = alternate.content = json.to_json
         end
       end
+
+      page.data['url'] = url
+      page.output = page.content
+
+      Jekyll.logger.info 'FEP fffd:', 'Generated'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-activity-pub
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Sutty
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-12 00:00:00.000000000 Z
+date: 2024-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: distributed-press-api-client