jekyll-activity-pub 0.1.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b01de6dccd0e03a7936d3c107f755e7f5d663e8d8e9622007f57a0a2ff0228d0
-  data.tar.gz: 4477807387c5b864b337299662f5c564f1c46407d47c213e27b264971cd3b823
+  metadata.gz: 3e61984240bfd3db494bd595ba46d733ac9449eea47c6f822f772e8f3745fd1f
+  data.tar.gz: 245acdaf13711a3529dc8b9f5bccfb92e42a717cb0da43970d97409df9e8b7b6
 SHA512:
-  metadata.gz: cda61088586cd05fa26155db048fd66845a2c32e8a66c05c51d7e8624a49048e0528cb1ccb24ea1ad21ca2d71002be6b3696a12e2ad013d2d3889328ca73fd58
-  data.tar.gz: 7fa8b2e1c900c0e65a82b2cf96bf408574a4e40167cf9e0d0317aadcfabf7f17c2f3e05d609e4dfa3a704740b176c10adb91c97541ba4160228e09afac2583bd
+  metadata.gz: c6069172361e462639d19b64f2554659b13cd3c9fa58765dcc750b72e0c01761ee30bfd8655f0da8d79c85873481096ca2fb99e713f9b8794c5345a4866246d3
+  data.tar.gz: 16e3b5e5ae50c6fbf3487f904acdb9e2b0f3f5e93f3ac942cb5209aaa5dd0275ebccb821205c6e3c118d5349ad55d824b7ce71d2c0b91b312a4d1155d22ac1f7

data/lib/jekyll/activity_pub/activity.rb

@@ -46,7 +46,8 @@ module Jekyll
             }
           ],
           'type' => 'Note',
-          'id' => absolute_url(doc.url),
+          'id' => absolute_url(url),
+          'url' => absolute_url(doc.url),
           'summary' => summary,
           'published' => (doc.data['created_at'] || doc.date).xmlschema,
           'updated' => doc.data['last_modified_at']&.xmlschema,

data/lib/jekyll/activity_pub/helper.rb

@@ -66,6 +66,18 @@ module Jekyll
 
       alias type hook_owner
 
+      # Detects locale
+      #
+      # @return [String]
+      def locale
+        return @locale if defined? @locale
+
+        @locale   = site.config['locale']
+        @locale ||= ENV['LANG']&.split('.', 2)&.first
+
+        @locale = @locale&.tr('_', '-')
+      end
+
       private
 
       # Is Liquid on strict mode?
@@ -137,18 +149,6 @@ module Jekyll
         File.exist?(cname_file)
       end
 
-      # Detects locale
-      #
-      # @return [String]
-      def locale
-        return @locale if defined? @locale
-
-        @locale   = site.config['locale']
-        @locale ||= ENV['LANG']&.split('.', 2)&.first
-
-        @locale = @locale&.tr('_', '-')
-      end
-
       # Finds the value of a text field amongst options
       #
       # @params :hash [Hash] The haystack

data/lib/jekyll/activity_pub/link.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+module Jekyll
+  module ActivityPub
+    # Represents a Link
+    class Link
+      include Helper
+
+      attr_reader :data
+
+      # Initialize with default data
+      #
+      # @param :site [Jekyll::Site]
+      # @param :href [String]
+      # @param :rel [String]
+      # @param :media_type [String]
+      def initialize(site, href, rel = nil, media_type = nil)
+        @site = site
+        @data = {
+          'type' => 'Link',
+          'mediaType' => media_type,
+          'href' => href,
+          'rel' => rel
+        }
+
+        trigger_hooks :post_init
+      end
+    end
+  end
+end

data/lib/jekyll/activity_pub/notifier.rb

@@ -4,6 +4,8 @@ require 'pathname'
 require 'httparty'
 require 'distributed_press/version'
 require 'distributed_press/v1/social/client'
+require 'distributed_press/v1/social/inbox'
+require 'distributed_press/v1/social/outbox'
 require_relative 'errors'
 require_relative 'create'
 require_relative 'update'
@@ -118,29 +120,23 @@ module Jekyll
             raise NotificationError, "Public key at #{public_key_url} differs from local version"
           end
 
-          base_endpoint = "/v1/#{actor}"
-          outbox_endpoint = "#{base_endpoint}/outbox"
           actor_object = object_for(site.in_dest_dir(actor_url.sub(site.config['url'], '')))
-          # TODO: Move to API client
-          inbox_body = {
-            'actorUrl' => actor_url,
-            'publicKeyId' => public_key_url,
-            'keypair' => {
-              'publicKeyPem' => client.public_key.public_to_pem,
-              'privateKeyPem' => client.private_key.export
-            }
-          }
 
           # Create inbox
-          unless (response = client.post(endpoint: base_endpoint, body: inbox_body)).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['notifications'].reject do |object_url, _|
             done? object_url
           end.each do |object_url, status|
-            process_object(outbox_endpoint, actor_object, object_for(object_url), status)
+            process_object(actor_object, object_for(object_url), status)
           end
 
           # Update actor profile
@@ -148,7 +144,7 @@ module Jekyll
             Jekyll.logger.debug 'ActivityPub:', 'Updating Actor profile'
             actor_update = Jekyll::ActivityPub::Update.new(site, actor_object, actor_object)
 
-            unless (response = client.post(endpoint: outbox_endpoint, body: actor_update)).ok?
+            unless (response = outbox.post(activity: actor_update)).ok?
               raise NotificationError, "Couldn't update actor (#{response.code}: #{response.message})"
             end
           end
@@ -311,6 +307,14 @@ module Jekyll
           )
         end
 
+        def inbox
+          @@inbox ||= DistributedPress::V1::Social::Inbox.new(client: client, actor: actor)
+        end
+
+        def outbox
+          @@outbox ||= DistributedPress::V1::Social::Outbox.new(client: client, actor: actor)
+        end
+
         # Run action
         #
         # @param :path [String]
@@ -337,16 +341,15 @@ module Jekyll
 
         # Turns an object into an activity and notifies outbox
         #
-        # @param :endpoint [String]
         # @param :actor [PseudoObject]
         # @param :object [PseudoObject]
         # @param :status [Hash]
         # @return [nil]
-        def process_object(endpoint, actor, object, status)
+        def process_object(actor, object, status)
           action = status['action']
           activity = Object.const_get("Jekyll::ActivityPub::#{action.capitalize}").new(site, actor, object)
 
-          if (response = client.post(endpoint: endpoint, body: activity)).ok?
+          if (response = outbox.post(activity: activity)).ok?
             status['action'] = 'done'
             status["#{action}d_at"] = Time.now.to_i
           else

data/lib/jekyll-activity-pub-absolute-assets.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require_relative 'jekyll-activity-pub-nokogiri'
+
+# Modifies the Activity contents so any element with a src attribute
+# uses absolute URLs
+Jekyll::Hooks.register :activity, :post_init, priority: 35 do |activity|
+  case activity
+  when Jekyll::ActivityPub::Activity
+    url = Addressable::URI.parse(activity.data['id'])
+
+    activity.data['content'].css('[src]').each do |img|
+      uri = Addressable::URI.parse(img['src'])
+
+      next unless uri.relative?
+
+      raise "Can't convert relative paths yet" if uri.path.start_with? '..'
+
+      uri.path = "/#{uri.path}" unless uri.path.start_with? '/'
+
+      uri.hostname = url.hostname
+      uri.scheme   = url.scheme
+
+      img['src'] = uri.to_s
+    rescue Exception => e
+      Jekyll.logger.error 'ActivityPub:', "#{img['src']}: #{e}"
+    end
+  end
+end

data/lib/jekyll-activity-pub-assets-as-attachments.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative 'jekyll-activity-pub-absolute-assets'
+
+# Convert all embedded images, videos and audios into attachments. Note
+# Mastodon only supports four attachments per post.
+#
+# The hook run after absolute assets.
+Jekyll::Hooks.register :activity, :post_init, priority: 34 do |activity|
+  activity.data['content'].css('img[src],video[src],audio[src]').each do |element|
+    src = Addressable::URI.parse(element['src'])
+
+    activity.data['attachment'] << Jekyll::ActivityPub::Document.new(activity.site, src.path, element['alt'].to_s)
+  end
+end

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

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+# Implement FEP-fffd Proxy Objects for Distributed Press by creating new
+# activities and actors under supported protocols/schemes.
+#
+# Priority is low so it's the last thing we do.  If you need to modify
+# 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|
+  require 'jekyll/activity_pub/link'
+
+  # Changes the URLs from a base URL to have a different scheme
+  #
+  # @param object [Any]
+  # @param base_url [String]
+  # @param scheme [String]
+  def convert_uris(object, base_url, scheme)
+    case object
+    when Hash
+      object.transform_values do |value|
+        convert_uris(value, base_url, scheme)
+      end
+    when Array
+      object.map do |value|
+        convert_uris(value, base_url, scheme)
+      end
+    when String
+      if object.start_with? base_url
+        Addressable::URI.parse(object).tap do |uri|
+          uri.scheme = scheme
+        end.to_s
+      else
+        object
+      end
+    when Nokogiri::HTML5::DocumentFragment
+      object.dup.tap do |html|
+        html.css('[src]').each do |element|
+          element['src'] = convert_uris(element['src'], base_url, scheme)
+        end
+      end
+    when Jekyll::ActivityPub::Helper
+      convert_uris(object.data, base_url, scheme)
+    else
+      object
+    end
+  end
+
+  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') ]
+
+      %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')
+      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
+
+        uri  = Addressable::URI.parse(json['id'])
+        uri.path = uri.path.sub('.jsonld', ".#{protocol}.jsonld")
+        json['id'] = uri.to_s
+        path = uri.path.sub(%r{\A/}, '')
+
+        Jekyll::PageWithoutAFile.new(site, site.source, File.dirname(path), File.basename(path)).tap do |alternate|
+          site.pages << alternate
+
+          alternate.content = json.to_json
+        end
+      end
+    end
+  end
+end

data/lib/jekyll-activity-pub-link-iframes.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# Converts iframes to links.  Priority is higher than high.
+Jekyll::Hooks.register :activity, :post_init, priority: 31 do |activity|
+  activity.data['content'].tap do |html|
+    html.css('iframe[src]').each do |iframe|
+      ::Nokogiri::XML::Node.new('p', html) do |p|
+        ::Nokogiri::XML::Node.new('a', p) do |a|
+          a['href'] = iframe['src']
+          iframe.replace p
+          p << a
+        end
+      end
+    end
+  end
+end

data/lib/jekyll-activity-pub-nokogiri.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'nokogiri'
+
+# Parses the Activity contents as HTML5 so we can modify it later.
+# Priority is highest so we always have the parsed contents.
+Jekyll::Hooks.register :activity, :post_init, priority: 100 do |activity|
+  case activity.data['content']
+  when String
+    Jekyll.logger.debug 'ActivityPub:', "Parsing content for #{activity.data['id']}"
+
+    activity.data['content'] =
+      activity.data['contentMap'][activity.locale] =
+      ::Nokogiri::HTML5.fragment(activity.data['content'])
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-activity-pub
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Sutty
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-05 00:00:00.000000000 Z
+date: 2024-03-12 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.3.0rc4
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0rc4
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -139,11 +139,15 @@ extra_rdoc_files:
 files:
 - LICENSE.txt
 - README.md
+- lib/jekyll-activity-pub-absolute-assets.rb
+- lib/jekyll-activity-pub-assets-as-attachments.rb
+- lib/jekyll-activity-pub-fep-fffd-distributed-press.rb
+- lib/jekyll-activity-pub-link-iframes.rb
+- lib/jekyll-activity-pub-nokogiri.rb
 - lib/jekyll-activity-pub.rb
 - lib/jekyll/activity_pub.rb
 - lib/jekyll/activity_pub/activity.rb
 - lib/jekyll/activity_pub/actor.rb
-- lib/jekyll/activity_pub/cache.rb~
 - lib/jekyll/activity_pub/commands.rb
 - lib/jekyll/activity_pub/create.rb
 - lib/jekyll/activity_pub/delete.rb
@@ -155,6 +159,7 @@ files:
 - lib/jekyll/activity_pub/image.rb
 - lib/jekyll/activity_pub/instance_v1.rb
 - lib/jekyll/activity_pub/instance_v2.rb
+- lib/jekyll/activity_pub/link.rb
 - lib/jekyll/activity_pub/nodeinfo.rb
 - lib/jekyll/activity_pub/nodeinfo_20.rb
 - lib/jekyll/activity_pub/nodeinfo_21.rb
@@ -164,7 +169,6 @@ files:
 - lib/jekyll/activity_pub/outbox.rb
 - lib/jekyll/activity_pub/property_value.rb
 - lib/jekyll/activity_pub/public_key.rb
-- lib/jekyll/activity_pub/tomsbtone.rb~
 - lib/jekyll/activity_pub/update.rb
 - lib/jekyll/activity_pub/version.rb
 - lib/jekyll/activity_pub/webfinger.rb

data/lib/jekyll/activity_pub/cache.rb~

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-require 'jekyll/cache'
-
-module Jekyll
-  module ActivityPub
-    class Cache < Jekyll::Cache
-    end
-  end
-end

data/lib/jekyll/activity_pub/tomsbtone.rb~

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-require 'jekyll/page'
-require_relative 'helper'
-
-module Jekyll
-  module ActivityPub
-    # Represents a removed activity
-    class Tombstone < Jekyll::Page
-      include Helper
-
-      # @param :object_id [String]
-      attr_reader :object_id
-
-      # Initialize with default data
-      #
-      # @param :site [Jekyll::Site]
-      # @param :object_id [String]
-      def initialize(site, object_id, )
-        @context = StubContext.new(registers: { site: site })
-        @object_id = object_id
-
-        dest = Pathname.new(object.destination(site.dest)).relative_path_from(site.dest)
-        name = 'tombstone.jsonld'
-        dir = File.join(
-          File.dirname(dest),
-          File.basename(dest, '.jsonld')
-        )
-
-        super(site, '', dir, name)
-
-        trigger_hooks :post_init
-      end
-
-      def read_yaml(*)
-        @data = {
-          '@context' => 'https://www.w3.org/ns/activitystreams',
-          'type' => 'Tomsbtone',
-          'id' => absolute_url(object_id),
-          'published' => object.data[DATE_ATTRIBUTE],
-          'to' => object.data['to'],
-          'cc' => object.data['cc'],
-          'object' => object.data,
-          'inReplyTo' => object.data['in_reply_to']
-        }
-      end
-
-      # @return [Time]
-      def date
-        @date ||= Time.parse(object.data[DATE_ATTRIBUTE])
-      end
-
-      private
-
-      def type
-        @type ||= self.class.name.split('::').last
-      end
-    end
-  end
-end
-