jekyll-activity-pub 0.1.0rc15 → 0.1.0rc16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85320eb7b8fa252e8e66bb733d4ab51478b379f4ebd6211c0fbc6387f425cffc
-  data.tar.gz: 122b5349c06408910f743f255112df2acc3318cc0ede289ea5811a030fda3b65
+  metadata.gz: bab8dd66e0a0cb65da8e304c0863aea81e9474d614d6e402ad1c467095104f13
+  data.tar.gz: 3197b0125944c2d0ecc5da5f81b7add9e3cfcfc7aec7a3ecc62902097ef0ea94
 SHA512:
-  metadata.gz: a2111ddfe7cf26d72088b000014c6ac690a731235c392e9d2cb86a7831913a53d1e27a6a6920c599a52218f275eaf29f473dc37b03b561bbc8abe64d0ddafb6c
-  data.tar.gz: 5ec690882fbc64d533a1f02741252215e71b9a156d7697228afa5b71bbd927d4bda149d3724f88ca598bd9e58530c21f350ae5c59694e1e1a9cb0256c505be32
+  metadata.gz: c9e2ca9f2b982b86a04ad682bd1ef431543db98ac38314a7188570ea1562b194f254b0cceb64aa141b96a4cc644bdefbc78ab4a2b99370901b0898d03a2cc787
+  data.tar.gz: d5305462910540cefd06f1cabba97d15beb731924995ab7f93ada8df1e327811de4f66545a77ff5a82caa7cc75d6adc3fdabe532a7a2432811729e9f4dfab61c

data/lib/jekyll/activity_pub/activity.rb

@@ -72,16 +72,26 @@ module Jekyll
 
       private
 
+      # @return [String]
+      def content_warning
+        @content_warning ||= doc.data['content_warning'].to_s.strip
+      end
+
       # Find summary
       #
       # @return [String,nil]
       def summary
-        @summary ||= doc.data.slice('title', 'summary').values.join(separator)
+        @summary ||=
+          if content_warning.empty?
+            doc.data.slice('title', 'summary').values.join(separator)
+          else
+            [content_warning, doc.data['title']].join(separator)
+          end
       end
 
       # Should it have a content warning?
       def sensitive?
-        !!doc.data.fetch('sensitive', false)
+        !content_warning.empty? || !!doc.data.fetch('sensitive', false)
       end
 
       # Separator to join title and summary by

data/lib/jekyll/activity_pub/actor.rb

@@ -57,7 +57,7 @@ module Jekyll
           'icon' => icons.first,
           'image' => images.first,
           'publicKey' => nil,
-          'published' => date.xmlschema,
+          'published' => published.xmlschema,
           'updated' => updated.xmlschema,
           'attachment' => [
             PropertyValue.new(website_name, website_link)
@@ -67,7 +67,7 @@ module Jekyll
 
       # @return [Time]
       def date
-        @date ||= site.config.dig('activity_pub', 'published') || site.time
+        published
       end
 
       private
@@ -77,21 +77,6 @@ module Jekyll
         @updated ||= site.config.dig('activity_pub', 'updated') || site.time
       end
 
-      # Finds public name
-      #
-      # @return [String,nil]
-      def public_name
-        @public_name ||= find_best_value_for(site.config, %w[activity_pub public_name], 'title') || username
-      end
-
-      # Find summary between site tagline or description, reusing fields
-      # that are used on jekyll-seo-tag
-      #
-      # @return [String,nil]
-      def summary
-        @summary ||= find_best_value_for(site.config, %w[activity_pub summary], 'tagline', 'description')
-      end
-
       # Find icons
       #
       # @return [Array]

data/lib/jekyll/activity_pub/helper.rb

@@ -84,6 +84,26 @@ module Jekyll
         @username ||= 'site'
       end
 
+      # Finds public name
+      #
+      # @return [String,nil]
+      def public_name
+        @public_name ||= find_best_value_for(site.config, %w[activity_pub public_name], 'title') || username
+      end
+
+      # @return [Time]
+      def published
+        @published ||= site.config.dig('activity_pub', 'published') || site.time
+      end
+
+      # Find summary between site tagline or description, reusing fields
+      # that are used on jekyll-seo-tag
+      #
+      # @return [String,nil]
+      def summary
+        @summary ||= find_best_value_for(site.config, %w[activity_pub summary], 'tagline', 'description')
+      end
+
       # Return hostname
       #
       # @return [String]

data/lib/jekyll/activity_pub/instance.rb

@@ -0,0 +1,117 @@
+# frozen_string_literal: true
+
+require 'jekyll/page'
+require_relative 'helper'
+require_relative 'version'
+
+module Jekyll
+  module ActivityPub
+    # Points to site's metadata
+    class Instance < 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/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,
+          'version' => Jekyll::ActivityPub::VERSION,
+          'source_url' => 'https://0xacab.org/sutty/jekyll/jekyll-activity-pub',
+          'title' => public_name,
+          'description' => summary,
+          'usage' => {
+            'users' => {
+              'active_month' => 1
+            }
+          },
+          'thumbnail' => {
+            'url' => conditional_absolute_url(avatar)
+          },
+          'languages' => languages,
+          'configuration' => {
+            'urls' => {},
+            'accounts' => {},
+            'statuses' => {},
+            'media_attachments' => {},
+            'polls' => {},
+            'translation' => {},
+          },
+          'registrations' => {
+            'enabled' => false,
+            'approval_required' => false,
+            'message' => nil
+          },
+          'contact' => {
+            'email' => email,
+            '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'],
+              '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' => [],
+              'fields' => []
+            },
+            'rules' => []
+          }
+        }
+      end
+
+      private
+
+      # @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/nodeinfo.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'jekyll/page'
+require_relative 'helper'
+
+module Jekyll
+  module ActivityPub
+    # Points to site's nodeinfo
+    class Nodeinfo < Jekyll::Page
+      include Helper
+
+      # Initialize with default data
+      #
+      # @param :site [Jekyll::Site]
+      # @param :nodeinfos [Array<Nodeinfo21>]
+      # @param :base [String]
+      # @param :dir [String]
+      # @param :name [String]
+      def initialize(site, nodeinfos, base = '', dir = '.well-known', name = 'webfinger')
+        @context = StubContext.new(registers: { site: site })
+        @nodeinfos = nodeinfos
+
+        super(site, base, dir, name)
+
+        trigger_hooks :post_init
+      end
+
+      def read_yaml(*)
+        self.data = { 'links' => @nodeinfos.map(&:to_jrd) }
+      end
+
+      # The nodeinfo file is expected to be at this location always
+      #
+      # @return [String]
+      def permalink
+        '.well-known/nodeinfo'
+      end
+    end
+  end
+end

data/lib/jekyll/activity_pub/nodeinfo_20.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require 'jekyll/page'
+require_relative 'helper'
+require_relative 'version'
+
+module Jekyll
+  module ActivityPub
+    # Points to site's nodeinfo 2.0
+    class Nodeinfo20 < Jekyll::Page
+      include Helper
+
+      def version
+        '2.0'
+      end
+
+      # Initialize with default data
+      #
+      # @param :site [Jekyll::Site]
+      # @param :base [String]
+      # @param :dir [String]
+      # @param :name [String]
+      def initialize(site, base = '', dir = 'nodeinfo', name = version)
+        @context = StubContext.new(registers: { site: site })
+
+        super(site, base, dir, name)
+
+        trigger_hooks :post_init
+      end
+
+      def read_yaml(*)
+        self.data = {
+          'version' => version,
+          'software' => {
+            'name' => 'sutty-distributed-press',
+            'version' => Jekyll::ActivityPub::VERSION
+          },
+          'protocols' => ['activitypub'],
+          'services' => {},
+          'openRegistrations' => false,
+          'usage' => {
+            'users' => {
+              'total' => 1,
+              'activeHalfyear' => 1,
+              'activeMonth' => 1
+            },
+            'localPosts' => 0,
+            'localComments' => 0
+          },
+          'metadata' => {}
+        }
+      end
+
+      # The nodeinfo file is expected to be at this location always
+      #
+      # @return [String]
+      def permalink
+        "nodeinfo/#{version}.json"
+      end
+
+      # @return [Hash]
+      def to_jrd
+        {
+          'rel' => "http://nodeinfo.diaspora.software/ns/schema/#{version}",
+          'href' => absolute_url(url)
+        }
+      end
+
+      # @return [nil]
+      def increase_local_posts_counter!
+        data['usage']['localPosts'] += 1
+        nil
+      end
+    end
+  end
+end

data/lib/jekyll/activity_pub/nodeinfo_21.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'jekyll/page'
+require_relative 'nodeinfo_20'
+
+module Jekyll
+  module ActivityPub
+    # Points to site's nodeinfo 2.1
+    class Nodeinfo21 < Nodeinfo20
+      def version
+        '2.1'
+      end
+
+      def read_yaml(*)
+        super.tap do |data|
+          data['software']['repository'] = 'https://0xacab.org/sutty/jekyll/jekyll-activity-pub/'
+          data['software']['homepage'] = 'https://sutty.nl'
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/activity_pub/version.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module ActivityPub
+    VERSION = '0.1.0'
+  end
+end

data/lib/jekyll/activity_pub.rb

@@ -8,6 +8,10 @@ require_relative 'activity_pub/host_meta'
 require_relative 'activity_pub/create'
 require_relative 'activity_pub/update'
 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'
 
 module Jekyll
   # ActivityPub

data/lib/jekyll-activity-pub.rb

@@ -29,6 +29,16 @@ 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)
+
+  # Nodeinfo
+  site.config['nodeinfos'] = [Jekyll::ActivityPub::Nodeinfo20, Jekyll::ActivityPub::Nodeinfo21].map do |nodeinfo|
+    nodeinfo.new(site).tap do |n|
+      site.pages << n
+    end
+  end
+
+  site.pages << site.config['nodeinfo'] = Jekyll::ActivityPub::Nodeinfo.new(site, site.config['nodeinfos'])
 
   # Add Actor to home page
   home = site.pages.find do |page|
@@ -85,6 +95,17 @@ Jekyll::Hooks.register(:documents, :post_convert, priority: :high) do |doc|
 
       outbox.data['totalItems'] += 1
       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
+      end
+
       site.pages << action
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-activity-pub
 version: !ruby/object:Gem::Version
-  version: 0.1.0rc15
+  version: 0.1.0rc16
 platform: ruby
 authors:
 - Sutty
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-07 00:00:00.000000000 Z
+date: 2023-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: distributed-press-api-client
@@ -152,6 +152,10 @@ files:
 - 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/nodeinfo.rb
+- lib/jekyll/activity_pub/nodeinfo_20.rb
+- lib/jekyll/activity_pub/nodeinfo_21.rb
 - lib/jekyll/activity_pub/notifier.rb
 - lib/jekyll/activity_pub/ordered_collection.rb
 - lib/jekyll/activity_pub/ordered_collection_page.rb
@@ -160,18 +164,19 @@ files:
 - 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
 - lib/jekyll/command_extension.rb
 - lib/jekyll/commands/generate_keys.rb
 - lib/jekyll/commands/notify.rb
-homepage: https://0xacab.org/sutty/jekyll/jekyll-activity-pub
+homepage: https://jekyll-activity-pub.sutty.nl/
 licenses:
 - Apache-2.0
 metadata:
-  bug_tracker_uri: https://0xacab.org/sutty/jekyll/jekyll-activity-pub/issues
-  homepage_uri: https://0xacab.org/sutty/jekyll/jekyll-activity-pub
+  bug_tracker_uri: https://jekyll-activity-pub.sutty.nl//issues
+  homepage_uri: https://jekyll-activity-pub.sutty.nl/
   source_code_uri: https://0xacab.org/sutty/jekyll/jekyll-activity-pub
-  changelog_uri: https://0xacab.org/sutty/jekyll/jekyll-activity-pub/-/blob/master/CHANGELOG.md
+  changelog_uri: https://jekyll-activity-pub.sutty.nl//-/blob/master/CHANGELOG.md
   documentation_uri: https://rubydoc.info/gems/jekyll-activity-pub
 post_install_message:
 rdoc_options: