diff options
| author | Reverite <github@reverite.sh> | 2019-07-07 16:25:42 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-07-07 16:25:42 -0700 |
| commit | 7d99f12fd03cf2f861d0747c3bbcd4a8cf454d99 (patch) | |
| tree | 7b166c33fefb4bf3cc6f6dee46f5883f7428d80a /app/serializers | |
| parent | 100bb17b1317f07c0eaa89da869f960b6cff611f (diff) | |
| parent | fce885f271f8651702d606406e21677280071e40 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/activitypub/note_serializer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb index 7225b2319..61fa77852 100644 --- a/app/serializers/activitypub/note_serializer.rb +++ b/app/serializers/activitypub/note_serializer.rb @@ -25,7 +25,7 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer attribute :closed, if: :poll_and_expired? def id - raise Mastodon::NotPermittedError, 'Local-only statuses should not be serialized' if object.local_only? + raise Mastodon::NotPermittedError, 'Local-only statuses should not be serialized' if object.local_only? && !instance_options[:allow_local_only] ActivityPub::TagManager.instance.uri_for(object) end |