Update patches for mastodon v4.3.0

This commit is contained in:
2024-10-14 12:51:55 +00:00
parent d5b81255d0
commit 080e089f19
4 changed files with 23 additions and 44 deletions

View File

@@ -1,13 +1,14 @@
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index 5ae1099d0..c9c76c700 100644
index 19361277a..03dc1ad85 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -11,11 +11,16 @@ class REST::InstanceSerializer < ActiveModel::Serializer
@@ -11,12 +11,17 @@ class REST::InstanceSerializer < ActiveModel::Serializer
include RoutingHelper
attributes :domain, :title, :version, :source_url, :description,
:usage, :thumbnail, :languages, :configuration,
+ :max_toot_chars,
:registrations
:usage, :thumbnail, :icon, :languages, :configuration,
:registrations, :api_versions
has_one :contact, serializer: ContactSerializer
has_many :rules, serializer: REST::RuleSerializer
@@ -20,17 +21,18 @@ index 5ae1099d0..c9c76c700 100644
if object.thumbnail
{
diff --git a/app/serializers/rest/v1/instance_serializer.rb b/app/serializers/rest/v1/instance_serializer.rb
index 99d1b2bd6..b5e6c8185 100644
index 7f9f21c5a..c99f1f9c1 100644
--- a/app/serializers/rest/v1/instance_serializer.rb
+++ b/app/serializers/rest/v1/instance_serializer.rb
@@ -6,12 +6,17 @@ class REST::V1::InstanceSerializer < ActiveModel::Serializer
@@ -4,6 +4,7 @@ class REST::V1::InstanceSerializer < ActiveModel::Serializer
include RoutingHelper
attributes :uri, :title, :short_description, :description, :email,
+ :max_toot_chars,
:version, :urls, :stats, :thumbnail,
:languages, :registrations, :approval_required, :invites_enabled,
+ :max_toot_chars,
:configuration
has_one :contact_account, serializer: REST::AccountSerializer
@@ -12,6 +13,10 @@ class REST::V1::InstanceSerializer < ActiveModel::Serializer
has_many :rules, serializer: REST::RuleSerializer