Add sharedInbox to actors (#4737)

diff --git a/app/controllers/activitypub/inboxes_controller.rb b/app/controllers/activitypub/inboxes_controller.rb
index 078494c20746cc091d5bc356e12084981c60d1cb..5fce505fd207f7f1c3d4b84409deab0e3382c324 100644 (file)
--- a/app/controllers/activitypub/inboxes_controller.rb
+++ b/app/controllers/activitypub/inboxes_controller.rb
@@ -18,7 +18,7 @@ class ActivityPub::InboxesController < Api::BaseController
   private
 
   def set_account
-    @account = Account.find_local!(params[:account_username])
+    @account = Account.find_local!(params[:account_username]) if params[:account_username]
   end
 
   def body

diff --git a/app/serializers/activitypub/actor_serializer.rb b/app/serializers/activitypub/actor_serializer.rb
index b157368680ae3d522e548de83cd80aa4fd040bad..a72ecee24bb3ca9725cec6ca7e870b7e86043446 100644 (file)
--- a/app/serializers/activitypub/actor_serializer.rb
+++ b/app/serializers/activitypub/actor_serializer.rb
@@ -4,8 +4,9 @@ class ActivityPub::ActorSerializer < ActiveModel::Serializer
   include RoutingHelper
 
   attributes :id, :type, :following, :followers,
-             :inbox, :outbox, :preferred_username,
-             :name, :summary, :url
+             :inbox, :outbox, :shared_inbox,
+             :preferred_username, :name, :summary,
+             :url
 
   has_one :public_key, serializer: ActivityPub::PublicKeySerializer
 
@@ -52,6 +53,10 @@ class ActivityPub::ActorSerializer < ActiveModel::Serializer
     account_outbox_url(object)
   end
 
+  def shared_inbox
+    inbox_url
+  end
+
   def preferred_username
     object.username
   end

diff --git a/config/routes.rb b/config/routes.rb
index f8f145e1dddd892c19cfa4368bb2244b4b6b1345..7f77460688d192a50690538dca716abd9fc63886 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -56,6 +56,8 @@ Rails.application.routes.draw do
     resource :inbox, only: [:create], module: :activitypub
   end
 
+  resource :inbox, only: [:create], module: :activitypub
+
   get '/@:username', to: 'accounts#show', as: :short_account
   get '/@:username/with_replies', to: 'accounts#show', as: :short_account_with_replies
   get '/@:username/media', to: 'accounts#show', as: :short_account_media