jekyll-activity-pub 0.1.0rc1 → 0.1.0rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77756fcc84da5788d84a8d2719177e87c7a6113bac9783e3542b116a03e2bc75
-  data.tar.gz: e2722d852839f02c6af42e742bc3a13d2618ecd4b091dd218c5cd5d6f1af3016
+  metadata.gz: b11d1c8910e7b917bc7dbb039eaac2ded7907e5b1ada47dfd163f8aa9e2d0673
+  data.tar.gz: f0396377184e52144764a6fcb94c952c1ce99f174fcb5716762dd21aee45e6f1
 SHA512:
-  metadata.gz: 777fd56a8128d654ebcd19344c1872144c8e553abd42960b95973d208241e25326171f38fb7af019f769f7fd6929b41de8b84421481567f3420020562005310d
-  data.tar.gz: 4194053ad320923b07bd822acfd78adc902d54000577c899f61c305b2d6a8dfba458458508f8e5cb54029952b9863b7b9a3d015858892642156b9c4266840b89
+  metadata.gz: 83f87b84b22d33e5d2c0b1b7d4efb3bfc0ba5aafd1e6e35dcf54c6469992b46288956676f5024f6e277c6880d568507f22abdcdd6bfadefe92a33e95c78e4fb9
+  data.tar.gz: cc268a2c2a7d00daaa2222744713a61407384d696c95af74c8be5a5dd4cea41beccb22bfa69297ba7bc3aab82ca519135517ee48a03487c99b45798d22b467f1

data/lib/jekyll/activity_pub/activity.rb

@@ -3,6 +3,7 @@
 require 'jekyll/page'
 require_relative 'helper'
 require_relative 'document'
+require_relative 'notifier'
 
 module Jekyll
   module ActivityPub
@@ -52,7 +53,7 @@ module Jekyll
           'to' => [
             'https://www.w3.org/ns/activitystreams#Public'
           ],
-          'cc' => [],
+          'cc' => [ Notifier.followers_url ],
           'inReplyTo' => doc.data['in_reply_to'],
           'sensitive' => sensitive?,
           'content' => doc.content,

data/lib/jekyll/activity_pub/actor.rb

@@ -24,6 +24,10 @@ module Jekyll
         super
 
         Notifier.actor_url = data['id']
+        Notifier.actor = "@#{username}@#{hostname}"
+
+        data['following'] = Notifier.following_url
+        data['followers'] = Notifier.followers_url
 
         trigger_hooks :post_init
       end
@@ -95,13 +99,14 @@ module Jekyll
 
       def inbox
         @inbox ||=
-          site.config.dig('activity_pub', 'url').tap do |inbox|
+          site.config.dig('activity_pub', 'url').dup.tap do |inbox|
             value_is_required! inbox, MissingInboxError
 
             inbox << '/v1/@'
             inbox << username
             inbox << '@'
             inbox << hostname
+            inbox << '/inbox'
           end
       end
     end

data/lib/jekyll/activity_pub/create.rb

@@ -14,9 +14,8 @@ module Jekyll
       #
       # @param :site [Jekyll::Site]
       # @param :actor [Jekyll::ActivityPub::Actor]
-      # @param :followers [Jekyll::ActivityPub::Followers]
       # @param :object [Jekyll::ActivityPub::Activity]
-      def initialize(site, actor, followers, object)
+      def initialize(site, actor, object)
         @context = StubContext.new(registers: { site: site })
 
         @data = {
@@ -24,12 +23,8 @@ module Jekyll
           'type' => 'Create',
           'actor' => absolute_url(actor.url),
           'published' => object.data['published'],
-          'to' => [
-            'https://www.w3.org/ns/activitystreams#Public'
-          ],
-          'cc' => [
-            absolute_url(followers.url)
-          ],
+          'to' => object.data['to'],
+          'cc' => object.data['cc'],
           'object' => absolute_url(object.url),
           'inReplyTo' => object.data['in_reply_to']
         }

data/lib/jekyll/activity_pub/delete.rb

@@ -8,9 +8,8 @@ module Jekyll
       #
       # @param :site [Jekyll::Site]
       # @param :actor [Jekyll::ActivityPub::Actor]
-      # @param :followers [Jekyll::ActivityPub::Followers]
       # @param :object [Jekyll::ActivityPub::Activity]
-      def initialize(site, actor, _followers, object)
+      def initialize(site, actor, object)
         @context = StubContext.new(registers: { site: site })
 
         @data = {

data/lib/jekyll/activity_pub/notifier.rb

@@ -2,6 +2,7 @@
 
 require 'pathname'
 require 'httparty'
+require 'distributed_press/version'
 require 'distributed_press/v1/social/client'
 require_relative 'errors'
 require_relative 'create'
@@ -16,7 +17,7 @@ module Jekyll
     # Jekyll's build process.
     class Notifier
       # An struct that responds to a #url method
-      PseudoObject = Struct.new(:url, keyword_init: true)
+      PseudoObject = Struct.new(:url, :data, keyword_init: true)
 
       class << self
         # Set the site and initialize data
@@ -30,6 +31,16 @@ module Jekyll
           end
         end
 
+        # @return [String]
+        def followers_url
+          "#{config['url']}/v1/#{actor}/followers"
+        end
+
+        # @return [String]
+        def following_url
+          "#{config['url']}/v1/#{actor}/following"
+        end
+
         # Save the public key URL for later
         #
         # @param :url [String]
@@ -74,23 +85,34 @@ module Jekyll
                   "Could't fetch public key (#{response.code}: #{response.message})"
           end
 
-          unless client.private_key.compare? OpenSSL::Pkey::RSA.new(response.body)
+          unless client.private_key.compare? OpenSSL::PKey::RSA.new(response.body)
             raise NotificationError, "Public key at #{public_key_url} differs from local version"
           end
 
-          base_endpoint = "/v1/#{actor}/"
-          outbox_endpoint = "#{base_endpoint}/outbox/"
+          base_endpoint = "/v1/#{actor}"
+          outbox_endpoint = "#{base_endpoint}/outbox"
           actor_object = PseudoObject.new(url: actor_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
-          # TODO: Send keypair
-          client.post(endpoint: base_endpoint, body: {})
+          unless (response = client.post(endpoint: base_endpoint, body: inbox_body)).ok?
+            raise NotificationError, "Couldn't create inbox (#{response.code}: #{response.message})"
+          end
 
           # Remove notifications already performed and notify
           data['notifications'].reject do |object_url, status|
             done? object_url, status
           end.each do |object_url, status|
-            process_object(outbox_endpoint, actor_object, PseudoObject.new(url: object_url), status)
+            object = PseudoObject.new(url: object_url, data: JSON.parse(File.read(site.in_dest_dir(object_url))))
+            process_object(outbox_endpoint, actor_object, object, status)
           end
 
           # Store everything for later
@@ -117,12 +139,13 @@ module Jekyll
           action(path, 'delete') if exist? path
         end
 
-        # Updates an activity if it was previously created
+        # Updates an activity if it was previously created, otherwise
+        # create it
         #
         # @param :path [String]
         # @return [Hash]
         def update(path)
-          action(path, 'update') if exist? path
+          action(path, exist?(path) ? 'update' : 'create')
         end
 
         # Creates an activity
@@ -208,7 +231,8 @@ module Jekyll
           @@client ||= DistributedPress::V1::Social::Client.new(
             private_key_pem: private_key,
             url: config['url'],
-            public_key_url: public_key_url
+            public_key_url: public_key_url,
+            logger: Jekyll.logger
           )
         end
 
@@ -248,19 +272,19 @@ module Jekyll
         # @return [nil]
         def process_object(endpoint, actor, object, status)
           action = status['action']
-          activity = Object.const_get(action.capitalize).new(site, actor, object)
+          activity = Object.const_get("Jekyll::ActivityPub::#{action.capitalize}").new(site, actor, object)
 
           if (response = client.post(endpoint: endpoint, body: activity)).ok?
             status['action'] = 'done'
             status["#{action}d_at"] = Time.now.to_i
           else
             Jekyll.logger.warn 'ActivityPub:',
-                               "Couldn't perform #{action} for #{object_url} (#{response.code}: #{response.message})"
+                               "Couldn't perform #{action} for #{object.url} (#{response.code}: #{response.message})"
           end
 
           nil
         rescue NameError
-          Jekyll.logger.warn 'ActivityPub:', "Action \"#{action}\" for #{url} unrecognized, ignoring."
+          Jekyll.logger.warn 'ActivityPub:', "Action \"#{action}\" for #{object.url} unrecognized, ignoring."
         end
       end
     end

data/lib/jekyll/activity_pub/update.rb

@@ -10,9 +10,8 @@ module Jekyll
       #
       # @param :site [Jekyll::Site]
       # @param :actor [Jekyll::ActivityPub::Actor]
-      # @param :followers [Jekyll::ActivityPub::Followers]
       # @param :object [Jekyll::ActivityPub::Activity]
-      def initialize(site, actor, followers, object)
+      def initialize(site, actor, object)
         super
 
         data['type'] = 'Update'

data/lib/jekyll/activity_pub/webfinger.rb

@@ -2,7 +2,6 @@
 
 require 'jekyll/page'
 require_relative 'helper'
-require_relative 'notifier'
 
 module Jekyll
   module ActivityPub
@@ -23,8 +22,6 @@ module Jekyll
 
         super(site, base, dir, name)
 
-        Notifier.actor = "@#{username}@#{hostname}"
-
         # Set the actor profile in yet another format (no leading @)
         site.config['activity_pub_profile'] = "#{username}@#{hostname}"
 

data/lib/jekyll/activity_pub.rb

@@ -4,8 +4,6 @@ require_relative 'activity_pub/webfinger'
 require_relative 'activity_pub/actor'
 require_relative 'activity_pub/activity'
 require_relative 'activity_pub/outbox'
-require_relative 'activity_pub/followers'
-require_relative 'activity_pub/following'
 require_relative 'activity_pub/host_meta'
 require_relative 'activity_pub/create'
 require_relative 'activity_pub/update'

data/lib/jekyll-activity-pub.rb

@@ -27,8 +27,6 @@ Jekyll::Hooks.register :site, :post_read, priority: :low do |site|
   site.pages << site.config['webfinger'] = webfinger = Jekyll::ActivityPub::WebFinger.new(site, actor)
   site.pages << site.config['outbox'] = Jekyll::ActivityPub::Outbox.new(site, actor)
   site.pages << site.config['host-meta'] = Jekyll::ActivityPub::HostMeta.new(site, webfinger)
-  site.pages << Jekyll::ActivityPub::Following.new(site, actor)
-  site.pages << site.config['followers'] = Jekyll::ActivityPub::Followers.new(site, actor)
 
   # Add Actor to home page
   home = site.pages.find do |page|
@@ -53,7 +51,6 @@ Jekyll::Hooks.register(:documents, :post_convert, priority: :high) do |doc|
   name = "#{File.basename(doc.url, '.html')}.jsonld"
   actor = site.config['actor']
   outbox = site.config['outbox']
-  followers = site.config['followers']
 
   Jekyll::ActivityPub::Activity.new(site, actor, doc, nil, dir, name).tap do |activity|
     doc.data['activity'] = activity
@@ -68,7 +65,7 @@ Jekyll::Hooks.register(:documents, :post_convert, priority: :high) do |doc|
         Jekyll::ActivityPub::Create
       end
 
-    create_or_update.new(site, actor, followers, activity).tap do |action|
+    create_or_update.new(site, actor, activity).tap do |action|
       Jekyll::ActivityPub::Notifier.public_send action.data['type'].downcase.to_sym, activity.destination(site.dest)
 
       outbox.data['totalItems'] += 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-activity-pub
 version: !ruby/object:Gem::Version
-  version: 0.1.0rc1
+  version: 0.1.0rc2
 platform: ruby
 authors:
 - Sutty
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-30 00:00:00.000000000 Z
+date: 2023-09-01 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.0rc0
+        version: 0.3.0rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0rc0
+        version: 0.3.0rc3
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -135,8 +135,6 @@ files:
 - lib/jekyll/activity_pub/delete.rb
 - lib/jekyll/activity_pub/document.rb
 - lib/jekyll/activity_pub/errors.rb
-- lib/jekyll/activity_pub/followers.rb
-- lib/jekyll/activity_pub/following.rb
 - lib/jekyll/activity_pub/helper.rb
 - lib/jekyll/activity_pub/host_meta.rb
 - lib/jekyll/activity_pub/image.rb

data/lib/jekyll/activity_pub/followers.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'ordered_collection'
-
-module Jekyll
-  module ActivityPub
-    # An empty collection of followers
-    class Followers < OrderedCollection
-      # Initialize with default data
-      #
-      # @param :site [Jekyll::Site]
-      # @param :actor [Jekyll::ActivityPub::Actor]
-      # @param :base [String]
-      # @param :dir [String]
-      # @param :name [String]
-      def initialize(site, actor, base = '', dir = '', name = 'followers.jsonld')
-        super(site, base, dir, name)
-
-        actor.data['followers'] = absolute_url(url)
-
-        trigger_hooks :post_init
-      end
-    end
-  end
-end

data/lib/jekyll/activity_pub/following.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'ordered_collection'
-
-module Jekyll
-  module ActivityPub
-    # An empty collection of followed actors
-    class Following < OrderedCollection
-      # Initialize with default data
-      #
-      # @param :site [Jekyll::Site]
-      # @param :actor [Jekyll::ActivityPub::Actor]
-      # @param :base [String]
-      # @param :dir [String]
-      # @param :name [String]
-      def initialize(site, actor, base = '', dir = '', name = 'following.jsonld')
-        super(site, base, dir, name)
-
-        actor.data['following'] = absolute_url(url)
-
-        trigger_hooks :post_init
-      end
-    end
-  end
-end