From aa5e50e5d5289325a599365bc920daed266ca477 Mon Sep 17 00:00:00 2001 From: KMY Date: Tue, 9 Jan 2024 15:57:33 +0900 Subject: [PATCH] =?UTF-8?q?Change:=20NodeInfo=E3=81=AE=E3=83=90=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E8=A1=A8=E8=A8=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/serializers/nodeinfo/serializer.rb | 6 +++++- lib/mastodon/version.rb | 13 ++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/serializers/nodeinfo/serializer.rb b/app/serializers/nodeinfo/serializer.rb index 3555f0bd8d..b316753c72 100644 --- a/app/serializers/nodeinfo/serializer.rb +++ b/app/serializers/nodeinfo/serializer.rb @@ -11,7 +11,7 @@ class NodeInfo::Serializer < ActiveModel::Serializer end def software - { name: 'mastodon', version: Mastodon::Version.to_s } + { name: 'kmyblue', version: Mastodon::Version.to_s } end def services @@ -41,6 +41,10 @@ class NodeInfo::Serializer < ActiveModel::Serializer def metadata { features: fedibird_capabilities, + upstream: { + name: 'Mastodon', + version: Mastodon::Version.to_s_of_mastodon, + }, } end diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 0e819ce52c..0d3e40b859 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -46,8 +46,19 @@ module Mastodon components.join end + def to_s_of_mastodon + components = [to_a.join('.')] + components << "-#{prerelease}" if prerelease.present? + components << "+#{build_metadata_of_mastodon}" if build_metadata_of_mastodon.present? + components.join + end + def build_metadata - ['kmyblue', to_s_of_kmyblue, ENV.fetch('MASTODON_VERSION_METADATA', nil)].compact.join('.') + ['kmyblue', to_s_of_kmyblue, build_metadata_of_mastodon].compact.join('.') + end + + def build_metadata_of_mastodon + ENV.fetch('MASTODON_VERSION_METADATA', nil) end def to_a