mirror of
https://github.com/mastodon/mastodon.git
synced 2024-08-20 21:08:15 -07:00
Minor ActivityPub JSON fixes (#4214)
- Objects must have attributedTo instead of actor - The current attribute belongs to CollectionPage, not Collection
This commit is contained in:
parent
35b868eeca
commit
a6328fc1b1
7 changed files with 4 additions and 9 deletions
|
@ -20,7 +20,6 @@ class ActivityPub::OutboxesController < Api::BaseController
|
|||
ActivityPub::CollectionPresenter.new(
|
||||
id: account_outbox_url(@account),
|
||||
type: :ordered,
|
||||
current: account_outbox_url(@account),
|
||||
size: @account.statuses_count,
|
||||
items: @statuses
|
||||
)
|
||||
|
|
|
@ -21,7 +21,6 @@ class FollowerAccountsController < ApplicationController
|
|||
ActivityPub::CollectionPresenter.new(
|
||||
id: account_followers_url(@account),
|
||||
type: :ordered,
|
||||
current: account_followers_url(@account),
|
||||
size: @account.followers_count,
|
||||
items: @follows.map { |f| ActivityPub::TagManager.instance.uri_for(f.account) }
|
||||
)
|
||||
|
|
|
@ -21,7 +21,6 @@ class FollowingAccountsController < ApplicationController
|
|||
ActivityPub::CollectionPresenter.new(
|
||||
id: account_following_index_url(@account),
|
||||
type: :ordered,
|
||||
current: account_following_index_url(@account),
|
||||
size: @account.following_count,
|
||||
items: @follows.map { |f| ActivityPub::TagManager.instance.uri_for(f.target_account) }
|
||||
)
|
||||
|
|
|
@ -23,7 +23,6 @@ class TagsController < ApplicationController
|
|||
ActivityPub::CollectionPresenter.new(
|
||||
id: tag_url(@tag),
|
||||
type: :ordered,
|
||||
current: tag_url(@tag),
|
||||
size: @tag.statuses.count,
|
||||
items: @statuses.map { |s| ActivityPub::TagManager.instance.uri_for(s) }
|
||||
)
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class ActivityPub::CollectionPresenter < ActiveModelSerializers::Model
|
||||
attributes :id, :type, :current, :size, :items
|
||||
attributes :id, :type, :size, :items
|
||||
end
|
||||
|
|
|
@ -6,8 +6,7 @@ class ActivityPub::CollectionSerializer < ActiveModel::Serializer
|
|||
super
|
||||
end
|
||||
|
||||
attributes :id, :type, :total_items,
|
||||
:current
|
||||
attributes :id, :type, :total_items
|
||||
|
||||
has_many :items, key: :ordered_items
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
class ActivityPub::NoteSerializer < ActiveModel::Serializer
|
||||
attributes :id, :type, :summary, :content,
|
||||
:in_reply_to, :published, :url,
|
||||
:actor, :to, :cc, :sensitive
|
||||
:attributed_to, :to, :cc, :sensitive
|
||||
|
||||
has_many :media_attachments, key: :attachment
|
||||
has_many :virtual_tags, key: :tag
|
||||
|
@ -36,7 +36,7 @@ class ActivityPub::NoteSerializer < ActiveModel::Serializer
|
|||
ActivityPub::TagManager.instance.url_for(object)
|
||||
end
|
||||
|
||||
def actor
|
||||
def attributed_to
|
||||
ActivityPub::TagManager.instance.uri_for(object.account)
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue