jekyll-activity-pub 0.1.0rc16 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bab8dd66e0a0cb65da8e304c0863aea81e9474d614d6e402ad1c467095104f13
-  data.tar.gz: 3197b0125944c2d0ecc5da5f81b7add9e3cfcfc7aec7a3ecc62902097ef0ea94
+  metadata.gz: b01de6dccd0e03a7936d3c107f755e7f5d663e8d8e9622007f57a0a2ff0228d0
+  data.tar.gz: 4477807387c5b864b337299662f5c564f1c46407d47c213e27b264971cd3b823
 SHA512:
-  metadata.gz: c9e2ca9f2b982b86a04ad682bd1ef431543db98ac38314a7188570ea1562b194f254b0cceb64aa141b96a4cc644bdefbc78ab4a2b99370901b0898d03a2cc787
-  data.tar.gz: d5305462910540cefd06f1cabba97d15beb731924995ab7f93ada8df1e327811de4f66545a77ff5a82caa7cc75d6adc3fdabe532a7a2432811729e9f4dfab61c
+  metadata.gz: cda61088586cd05fa26155db048fd66845a2c32e8a66c05c51d7e8624a49048e0528cb1ccb24ea1ad21ca2d71002be6b3696a12e2ad013d2d3889328ca73fd58
+  data.tar.gz: 7fa8b2e1c900c0e65a82b2cf96bf408574a4e40167cf9e0d0317aadcfabf7f17c2f3e05d609e4dfa3a704740b176c10adb91c97541ba4160228e09afac2583bd

data/lib/jekyll/activity_pub/actor.rb

@@ -26,7 +26,6 @@ module Jekyll
         Notifier.actor_url = data['id']
         Notifier.actor = "@#{username}@#{hostname}"
 
-        data['following'] = Notifier.following_url
         data['followers'] = Notifier.followers_url
 
         trigger_hooks :post_init

data/lib/jekyll/activity_pub/following.rb

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

data/lib/jekyll/activity_pub/instance_v1.rb

@@ -0,0 +1,130 @@
+# frozen_string_literal: true
+
+require 'jekyll/page'
+require_relative 'helper'
+require_relative 'version'
+
+module Jekyll
+  module ActivityPub
+    # Points to site's metadata
+    class InstanceV1 < Jekyll::Page
+      include Helper
+
+      # Initialize with default data
+      #
+      # @param :site [Jekyll::Site]
+      # @param :base [String]
+      # @param :dir [String]
+      # @param :name [String]
+      def initialize(site, base = '', dir = 'api/v1', name = 'instance')
+        @context = StubContext.new(registers: { site: site })
+
+        super(site, base, dir, name)
+
+        trigger_hooks :post_init
+      end
+
+      def permalink
+        'api/v1/instance/'
+      end
+
+      def output_ext
+        '.json'
+      end
+
+      def read_yaml(*)
+        self.data = {
+          'uri' => hostname,
+          'title' => public_name,
+          'short_description' => summary,
+          'description' => summary,
+          'email' => email,
+          'version' => Jekyll::ActivityPub::VERSION,
+          'urls' => {},
+          'stats' => {
+            'user_count' => 1,
+            'status_count' => 0,
+            'domain_count' => 1
+          },
+          'thumbnail' => conditional_absolute_url(avatar),
+          'languages' => languages,
+          'registrations' => false,
+          'approval_required' => false,
+          'invites_enabled' => false,
+          'configuration' => {
+            'accounts' => {},
+            'statuses' => {},
+            'media_attachments' => {},
+            'polls' => {}
+          },
+          'contact_account' => {
+            'id' => 1,
+            'username' => username,
+            'acct' => username,
+            'display_name' => public_name,
+            'locked' => false,
+            'bot' => false,
+            'discoverable' => true,
+            'group' => false,
+            'created_at' => published.xmlschema,
+            'note' => summary,
+            'url' => site.config['url'],
+            'uri' => site.config['url'],
+            'avatar' => conditional_absolute_url(avatar),
+            'avatar_static' => conditional_absolute_url(avatar),
+            'header' => conditional_absolute_url(header),
+            'header_static' => conditional_absolute_url(header),
+            'followers_count' => 0,
+            'following_count' => 0,
+            'statuses_count' => 0,
+            'last_status_at' => nil,
+            'noindex' => false,
+            'emojis' => [],
+            'roles' => [],
+            'fields' => []
+          },
+          'rules' => []
+        }
+      end
+
+      def increase_local_posts_counter!
+        data['stats']['status_count'] += 1
+        data['contact_account']['statuses_count'] += 1
+        nil
+      end
+
+      def increase_last_status!(last_status)
+        self.last_status_at = last_status if !last_status_at || last_status_at < last_status
+      end
+
+      private
+
+      def last_status_at
+        data['contact_account']['last_status_at']
+      end
+
+      def last_status_at=(last_status)
+        data['contact_account']['last_status_at'] = last_status
+      end
+
+      # @return [String,nil]
+      def header
+        @header ||= [find_best_value_for(site.config, %w[activity_pub images], %w[image path])].flatten.compact.first
+      end
+
+      # @return [Array<String>]
+      def languages
+        @languages ||= site.config['locales'] || [locale]
+      end
+
+      # @return [String,nil]
+      def email
+        @email ||= find_best_value_for(site.config, %w[activity_pub email], 'email')
+      end
+
+      def avatar
+        @avatar ||= [find_best_value_for(site.config, %w[activity_pub icons], 'logo')].flatten.compact.first
+      end
+    end
+  end
+end

data/lib/jekyll/activity_pub/{instance.rb → instance_v2.rb}

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-require 'jekyll/page'
-require_relative 'helper'
-require_relative 'version'
+require_relative 'instance_v1'
 
 module Jekyll
   module ActivityPub
     # Points to site's metadata
-    class Instance < Jekyll::Page
+    class InstanceV2 < InstanceV1
       include Helper
 
       # Initialize with default data
@@ -17,21 +15,13 @@ module Jekyll
       # @param :dir [String]
       # @param :name [String]
       def initialize(site, base = '', dir = 'api/v2', name = 'instance')
-        @context = StubContext.new(registers: { site: site })
-
         super(site, base, dir, name)
-
-        trigger_hooks :post_init
       end
 
       def permalink
         'api/v2/instance/'
       end
 
-      def output_ext
-        '.json'
-      end
-
       def read_yaml(*)
         self.data = {
           'domain' => hostname,
@@ -92,25 +82,19 @@ module Jekyll
         }
       end
 
-      private
-
-      # @return [String,nil]
-      def header
-        @header ||= [find_best_value_for(site.config, %w[activity_pub images], %w[image path])].flatten.compact.first
+      def increase_local_posts_counter!
+        data['contact']['account']['statuses_count'] += 1
+        nil
       end
 
-      # @return [Array<String>]
-      def languages
-        @languages ||= site.config['locales'] || [locale]
-      end
+      private
 
-      # @return [String,nil]
-      def email
-        @email ||= find_best_value_for(site.config, %w[activity_pub email], 'email')
+      def last_status_at
+        data['contact']['account']['last_status_at']
       end
 
-      def avatar
-        @avatar ||= [find_best_value_for(site.config, %w[activity_pub icons], 'logo')].flatten.compact.first
+      def last_status_at=(last_status)
+        data['contact']['account']['last_status_at'] = last_status
       end
     end
   end

data/lib/jekyll/activity_pub/notifier.rb

@@ -64,11 +64,6 @@ module Jekyll
           "#{url}/v1/#{actor}/followers"
         end
 
-        # @return [String]
-        def following_url
-          "#{url}/v1/#{actor}/following"
-        end
-
         # Save the public key URL for later
         #
         # @param :url [String]

data/lib/jekyll/activity_pub.rb

@@ -11,7 +11,9 @@ require_relative 'activity_pub/public_key'
 require_relative 'activity_pub/nodeinfo'
 require_relative 'activity_pub/nodeinfo_20'
 require_relative 'activity_pub/nodeinfo_21'
-require_relative 'activity_pub/instance'
+require_relative 'activity_pub/instance_v1'
+require_relative 'activity_pub/instance_v2'
+require_relative 'activity_pub/following'
 
 module Jekyll
   # ActivityPub

data/lib/jekyll-activity-pub.rb

@@ -29,7 +29,14 @@ 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 << site.config['instance'] = Jekyll::ActivityPub::Instance.new(site)
+  site.pages << Jekyll::ActivityPub::Following.new(site, actor)
+
+  # Instances
+  site.config['instances'] = [Jekyll::ActivityPub::InstanceV1, Jekyll::ActivityPub::InstanceV2].map do |instance|
+    instance.new(site).tap do |i|
+      site.pages << i
+    end
+  end
 
   # Nodeinfo
   site.config['nodeinfos'] = [Jekyll::ActivityPub::Nodeinfo20, Jekyll::ActivityPub::Nodeinfo21].map do |nodeinfo|
@@ -97,13 +104,9 @@ Jekyll::Hooks.register(:documents, :post_convert, priority: :high) do |doc|
       outbox.data['orderedItems'] << action
 
       site.config['nodeinfos'].map(&:increase_local_posts_counter!)
-
-      site.config['instance'].data['contact']['account']['statuses_count'] += 1
-
-      last_status_at = site.config['instance'].data['contact']['account']['last_status_at']
-
-      if !last_status_at || last_status_at < doc.date
-        site.config['instance'].data['contact']['account']['last_status_at'] = doc.date
+      site.config['instances'].each do |instance|
+        instance.increase_local_posts_counter!
+        instance.increase_last_status!(doc.date)
       end
 
       site.pages << action

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-activity-pub
 version: !ruby/object:Gem::Version
-  version: 0.1.0rc16
+  version: 0.1.0
 platform: ruby
 authors:
 - Sutty
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-17 00:00:00.000000000 Z
+date: 2023-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: distributed-press-api-client
@@ -149,10 +149,12 @@ files:
 - lib/jekyll/activity_pub/delete.rb
 - lib/jekyll/activity_pub/document.rb
 - lib/jekyll/activity_pub/errors.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
-- lib/jekyll/activity_pub/instance.rb
+- lib/jekyll/activity_pub/instance_v1.rb
+- lib/jekyll/activity_pub/instance_v2.rb
 - lib/jekyll/activity_pub/nodeinfo.rb
 - lib/jekyll/activity_pub/nodeinfo_20.rb
 - lib/jekyll/activity_pub/nodeinfo_21.rb
@@ -196,9 +198,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.26
 signing_key: