about summary refs log tree commit diff
path: root/app/serializers
diff options
context:
space:
mode:
authorFire Demon <firedemon@creature.cafe>2020-11-18 22:10:15 -0600
committerFire Demon <firedemon@creature.cafe>2020-11-18 22:10:15 -0600
commit930f7145374adb79e92e9bdfcbc0d0044690b6c8 (patch)
tree6188688d3e48cd8a40fbe89adaf8db6bbf07d082 /app/serializers
parentcfe8a3218addfd7e0cc82c6f0054572f3d8aa296 (diff)
Always use indirect federation
Diffstat (limited to 'app/serializers')
-rw-r--r--app/serializers/activitypub/actor_serializer.rb4
-rw-r--r--app/serializers/activitypub/outbox_serializer.rb2
-rw-r--r--app/serializers/activitypub/undo_announce_serializer.rb2
-rw-r--r--app/serializers/rest/account_serializer.rb2
4 files changed, 5 insertions, 5 deletions
diff --git a/app/serializers/activitypub/actor_serializer.rb b/app/serializers/activitypub/actor_serializer.rb
index 0c6205d7f..38c566937 100644
--- a/app/serializers/activitypub/actor_serializer.rb
+++ b/app/serializers/activitypub/actor_serializer.rb
@@ -25,8 +25,8 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
   attribute :also_known_as, if: :also_known_as?
   attribute :suspended, if: :suspended?
 
-  context_extensions :require_dereference, :show_replies, :private, :require_auth, :metadata, :server_metadata
-  attributes :require_dereference, :show_replies, :show_unlisted, :private, :require_auth
+  context_extensions :show_replies, :private, :require_auth, :metadata, :server_metadata
+  attributes :show_replies, :show_unlisted, :private, :require_auth
   attributes :metadata, :server_metadata
 
   class EndpointsSerializer < ActivityPub::Serializer
diff --git a/app/serializers/activitypub/outbox_serializer.rb b/app/serializers/activitypub/outbox_serializer.rb
index d1708cc36..4de619efc 100644
--- a/app/serializers/activitypub/outbox_serializer.rb
+++ b/app/serializers/activitypub/outbox_serializer.rb
@@ -10,6 +10,6 @@ class ActivityPub::OutboxSerializer < ActivityPub::CollectionSerializer
   end
 
   def items
-    object.items.map { |status| ActivityPub::ActivityPresenter.from_status(status, instance_options[:domain], embed: false) }
+    object.items.map { |status| ActivityPub::ActivityPresenter.from_status(status, instance_options[:domain]) }
   end
 end
diff --git a/app/serializers/activitypub/undo_announce_serializer.rb b/app/serializers/activitypub/undo_announce_serializer.rb
index d48fcff73..535cda20a 100644
--- a/app/serializers/activitypub/undo_announce_serializer.rb
+++ b/app/serializers/activitypub/undo_announce_serializer.rb
@@ -22,6 +22,6 @@ class ActivityPub::UndoAnnounceSerializer < ActivityPub::Serializer
   end
 
   def virtual_object
-    ActivityPub::ActivityPresenter.from_status(object, instance_options[:domain], embed: false)
+    ActivityPub::ActivityPresenter.from_status(object, instance_options[:domain])
   end
 end
diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb
index 133f66201..1b780da90 100644
--- a/app/serializers/rest/account_serializer.rb
+++ b/app/serializers/rest/account_serializer.rb
@@ -7,7 +7,7 @@ class REST::AccountSerializer < ActiveModel::Serializer
              :note, :url, :avatar, :avatar_static, :header, :header_static,
              :followers_count, :following_count, :statuses_count, :last_status_at
 
-  attributes :require_dereference, :show_replies, :show_unlisted
+  attributes :show_replies, :show_unlisted
 
   has_one :moved_to_account, key: :moved, serializer: REST::AccountSerializer, if: :moved_and_not_nested?