jekyll-activity-pub 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55b6801d86becb5ee13ad13e9f46f50e54670d8c4fb77483b6f387efdec5657a
-  data.tar.gz: 8e7461bfc3508ebf9cde56f67c2b5b4967da5f15dd0586308a2b4b8b37fa326d
+  metadata.gz: e5dbbab91a509e4edbb918ef90128a03415c702d3ff517c4d6466a3f38f183d1
+  data.tar.gz: 0c99c1dd59dfdf75144ba48a8a1b820aa5ad2adec542edb3aebca4a05b1cebea
 SHA512:
-  metadata.gz: 26952a76b93dd2483926672ee6360a81562d7af097d5516949d3229f4c869e283f4a1939bf4fb1f6ec28a213b946a6f93f07ad7bd8c8d8f4451cd465e31dcd35
-  data.tar.gz: e33538ae2ef792e5d1405658ac2a936e869e6d1adca347b53dd0d00b2da6fab0ac38257353628c75c3482cb1405b7910f5071c3af0c732d1c043d59f65c1e025
+  metadata.gz: ed1203e6aac6abd5aaa2130c6bf6ed7d47130a18a4c3866ee078cee1d7c963e5d71e9285a6dbadfe8a096ca32ebadf215747edc33fde40a2f694457a829ed991
+  data.tar.gz: 4d5e3a40dcd8d3fc8e64110c88d26319188d2ea43899c455b110c1cf154841114182033da31fd6fe0f02b67bfaaaf4c12567a896d7e5f28a4ab693f027dc0faa

data/lib/jekyll/activity_pub/notifier.rb

@@ -55,6 +55,11 @@ module Jekyll
           @@site
         end
 
+        # Announce the website?
+        def announce?
+          !!config['announce']
+        end
+
         def url
           config['url'].tap do |u|
             abort_if_missing('activity_pub.url', u, '_config.yml')
@@ -127,7 +132,7 @@ module Jekyll
           # @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?
+            unless (response = inbox.create(actor_url, announce?)).ok?
               raise NotificationError, "Couldn't create/update inbox (#{response.code}: #{response.message})"
             end
           end

data/lib/jekyll-activity-pub-fep-1042.rb

@@ -16,6 +16,19 @@ Jekyll::Hooks.register %i[actor activity], :post_init, priority: 8 do |page|
 
   site = page.site
 
+  # @param uri [URI,Addressable::URI]
+  # @param protocol [String]
+  # @return [URI,Addressable::URI]
+  def add_protocol_to_uri(uri, protocol)
+    uri.scheme = protocol
+
+    if protocol != 'https' && uri.path.end_with?('.jsonld')
+      uri.path = uri.path.sub('.jsonld', ".#{protocol}.jsonld")
+    end
+
+    uri
+  end
+
   # Changes the URLs from a base URL to have a different scheme
   #
   # @param object [Any]
@@ -33,9 +46,7 @@ Jekyll::Hooks.register %i[actor activity], :post_init, priority: 8 do |page|
       end
     when String
       if object.start_with? base_url
-        Addressable::URI.parse(object).tap do |uri|
-          uri.scheme = scheme
-        end.to_s
+        add_protocol_to_uri(Addressable::URI.parse(object), scheme).to_s
       else
         object
       end
@@ -52,24 +63,30 @@ Jekyll::Hooks.register %i[actor activity], :post_init, priority: 8 do |page|
     end
   end
 
-  uri = Addressable::URI.parse page.data['id']
   url = page.data['url']
+  formats = ['application/ld+json; profile="https://www.w3.org/ns/activitystreams"', 'application/activity+json']
+  data = page.pruned_data
 
+  # TODO: Fetch enabled protocols from DP API
   %w[https ipns hyper bittorrent].each do |protocol|
-    uri.scheme = protocol
-    url <<
-      Jekyll::ActivityPub::Link.new(site, uri.to_s, 'alternate', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"')
-    url <<
-      Jekyll::ActivityPub::Link.new(site, uri.to_s, 'alternate', 'application/activity+json')
+    uri = Addressable::URI.parse(page.data['id'])
+    add_protocol_to_uri(uri, protocol)
+
+    formats.each do |format|
+      url << Jekyll::ActivityPub::Link.new(site, uri.to_s, 'alternate', format)
+    end
   end
 
   %w[ipns hyper bittorrent].each do |protocol|
-    json = convert_uris(page.pruned_data, site.config['url'], protocol)
-    json['url'] = url
+    uri = Addressable::URI.parse(page.data['id'])
+    add_protocol_to_uri(uri, protocol)
 
-    uri = Addressable::URI.parse(json['id'])
-    uri.path = uri.path.sub('.jsonld', ".#{protocol}.jsonld")
+    Jekyll.logger.debug 'FEP 1042:', "Generating #{uri.path} (#{protocol})"
+
+    json = convert_uris(data, site.config['url'], protocol)
+    json['url'] = url
     json['id'] = uri.to_s
+
     # XXX: Only works on forward slash OSes
     path = uri.path.sub(%r{\A/}, '')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-activity-pub
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
 - Sutty
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-20 00:00:00.000000000 Z
+date: 2024-04-05 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.4.0
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement