Browse Source

Add sharedInbox to actors (#4737)

pull/4/head
Eugen Rochko 6 years ago
committed by GitHub
parent
commit
2db9ccaf3e
3 changed files with 10 additions and 3 deletions
  1. +1
    -1
      app/controllers/activitypub/inboxes_controller.rb
  2. +7
    -2
      app/serializers/activitypub/actor_serializer.rb
  3. +2
    -0
      config/routes.rb

+ 1
- 1
app/controllers/activitypub/inboxes_controller.rb View File

@ -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

+ 7
- 2
app/serializers/activitypub/actor_serializer.rb View File

@ -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

+ 2
- 0
config/routes.rb View File

@ -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

Loading…
Cancel
Save