diff options
| author | Starfall <us@starfall.systems> | 2022-02-13 22:15:26 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2022-02-13 22:15:26 -0600 |
| commit | c0341f06be5310a00b85a5d48fa80891d47c6710 (patch) | |
| tree | 907ef7f787f8bd446a6d9be1448a8bcff74e5a08 /app/presenters | |
| parent | 169688aa9f2a69ac3d36332c833e9cad43b5f7a5 (diff) | |
| parent | 6f78c66fe01921a4e7e01aa6e2386a5fce7f3afd (diff) | |
Merge remote-tracking branch 'glitch/main'
Not at all sure where the admin UI is going to display English language names now but OK.
Diffstat (limited to 'app/presenters')
| -rw-r--r-- | app/presenters/activitypub/activity_presenter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/presenters/activitypub/activity_presenter.rb b/app/presenters/activitypub/activity_presenter.rb index 5d174767f..38e8527e8 100644 --- a/app/presenters/activitypub/activity_presenter.rb +++ b/app/presenters/activitypub/activity_presenter.rb @@ -4,7 +4,7 @@ class ActivityPub::ActivityPresenter < ActiveModelSerializers::Model attributes :id, :type, :actor, :published, :to, :cc, :virtual_object class << self - def from_status(status) + def from_status(status, allow_inlining: true) new.tap do |presenter| presenter.id = ActivityPub::TagManager.instance.activity_uri_for(status) presenter.type = status.reblog? ? 'Announce' : 'Create' @@ -15,7 +15,7 @@ class ActivityPub::ActivityPresenter < ActiveModelSerializers::Model presenter.virtual_object = begin if status.reblog? - if status.account == status.proper.account && status.proper.private_visibility? && status.local? + if allow_inlining && status.account == status.proper.account && status.proper.private_visibility? && status.local? status.proper else ActivityPub::TagManager.instance.uri_for(status.proper) |