jekyll-activity-pub 0.1.0rc10 → 0.1.0rc12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 170103e5349bb552e32725ce5ba90938ea4fcf7b034ff1286f680b67bb69d93c
-  data.tar.gz: 3db2d02b5f965168b0888d2fee69a132eef6073aeb4da1000ca80f64930f2e27
+  metadata.gz: 52d19e3cacf79bb7a5c041ae37b4caae232947f50fc94eb7b269edebe37a15b7
+  data.tar.gz: 976bf99864bc71f49bec91090de41b4ddb829cfc296ba0addaa7dc43400daddd
 SHA512:
-  metadata.gz: a69f783567780f8bf77fc2bc1b4b59435cacfda2a4c9d9f091fdf0390a4160b7e555d22b0d24939a86f8f931866ad79e4b788194067911b6c39e00f44fb517cf
-  data.tar.gz: 3d26355f79661701e5a4fe5b5a48793c34bc73725befaed5a61239aede84b0bd94172578abe044d6a0fdf9c220472aa3e81913426e461bf1bfcd8d8a57a23182
+  metadata.gz: abfa3e386181380e62a2223b64c3201f5b3751921f669c4129e637959c0600c8fa529f8ce929540a51c975154f7a5c007e4d39522561e1c05ce82ff1eda7bce5
+  data.tar.gz: 98bb2c9fcec4955dc7b79582421fca47d6d50008bce879a821e5d3d2dc4c800901566230dc402ec1ea03f173c1ce1457d2c3c6751a5f8b9991b16c329edd7604

data/lib/jekyll/activity_pub/activity.rb

@@ -49,6 +49,7 @@ module Jekyll
           'id' => absolute_url(doc.url),
           'summary' => summary,
           'published' => (doc.data['created_at'] || doc.date).xmlschema,
+          'updated' => doc.data['last_modified_at']&.xmlschema,
           'attributedTo' => absolute_url(actor.url),
           'to' => [
             'https://www.w3.org/ns/activitystreams#Public'

data/lib/jekyll/activity_pub/create.rb

@@ -9,6 +9,9 @@ module Jekyll
     class Create < Jekyll::Page
       include Helper
 
+      # Where is the date stored
+      DATE_ATTRIBUTE = 'published'
+
       # @param :object [Jekyll::ActivityPub::Activity]
       attr_reader :object
 
@@ -26,10 +29,11 @@ module Jekyll
         @actor = actor
 
         dest = Pathname.new(object.destination(site.dest)).relative_path_from(site.dest)
-        name = "#{type.downcase}.jsonld"
+        name = "#{date.to_i}.jsonld"
         dir = File.join(
           File.dirname(dest),
-          File.basename(dest, '.jsonld')
+          File.basename(dest, '.jsonld'),
+          type.downcase
         )
 
         super(site, '', dir, name)
@@ -43,14 +47,19 @@ module Jekyll
           'type' => type,
           'id' => absolute_url(url),
           'actor' => absolute_url(actor.url),
-          'published' => object.data['published'],
+          'published' => object.data[DATE_ATTRIBUTE],
           'to' => object.data['to'],
           'cc' => object.data['cc'],
-          'object' => absolute_url(object.url),
+          '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

data/lib/jekyll/activity_pub/notifier.rb

@@ -21,6 +21,13 @@ module Jekyll
         def destination(_)
           site.in_dest_dir(relative_path)
         end
+
+        # @return [Time, nil]
+        def updated_at
+          @updated_at ||= Time.parse(data['updated'])
+        rescue StandardError
+          nil
+        end
       end
 
       class << self
@@ -120,10 +127,7 @@ module Jekyll
           data['notifications'].reject do |object_url, _|
             done? object_url
           end.each do |object_url, status|
-            path = site.in_dest_dir(object_url)
-            data = JSON.parse(File.read(path)) if File.exist? path
-            object = PseudoObject.new(url: object_url, site: site, relative_path: object_url, data: data || {})
-            process_object(outbox_endpoint, actor_object, object, status)
+            process_object(outbox_endpoint, actor_object, object_for(object_url), status)
           end
 
           # Store everything for later
@@ -151,12 +155,13 @@ module Jekyll
         end
 
         # Updates an activity if it was previously created, otherwise
-        # create it
+        # create it, or update it again if it was modified later
         #
         # @param :path [String]
         # @return [nil]
         def update(path)
-          if created?(path)
+          # Compare Unix timestamps
+          if created?(path) && (object_for(path)&.updated_at&.to_i || 0) > (status(path)['updated_at'] || 0)
             action(path, 'update')
           else
             create(path)
@@ -329,6 +334,18 @@ module Jekyll
         rescue NameError
           Jekyll.logger.warn 'ActivityPub:', "Action \"#{action}\" for #{object.url} unrecognized, ignoring."
         end
+
+        def object_for(path)
+          @@object_for ||= {}
+          @@object_for[path_relative_to_dest(path)] ||=
+            begin
+              rel  = path_relative_to_dest(path)
+              path = site.in_dest_dir(rel)
+              data = JSON.parse(File.read(path)) if File.exist? path
+
+              PseudoObject.new(url: rel, site: site, relative_path: rel, data: data || {})
+            end
+        end
       end
     end
   end

data/lib/jekyll/activity_pub/tomsbtone.rb

@@ -0,0 +1,61 @@
+# 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
+

data/lib/jekyll/activity_pub/update.rb

@@ -5,6 +5,8 @@ require_relative 'create'
 module Jekyll
   module ActivityPub
     # Represents an Update activity
-    class Update < Create; end
+    class Update < Create
+      DATE_ATTRIBUTE = 'updated'
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-activity-pub
 version: !ruby/object:Gem::Version
-  version: 0.1.0rc10
+  version: 0.1.0rc12
 platform: ruby
 authors:
 - Sutty
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-01 00:00:00.000000000 Z
+date: 2023-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: distributed-press-api-client
@@ -144,6 +144,7 @@ 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/webfinger.rb
 - lib/jekyll/command_extension.rb