diff options
author | pluralcafe-docker <docker@plural.cafe> | 2018-08-22 08:26:56 +0000 |
---|---|---|
committer | pluralcafe-docker <docker@plural.cafe> | 2018-08-22 08:26:56 +0000 |
commit | a4935a8e24dcfa865fb330693d8ec90beca1aa98 (patch) | |
tree | 9fc0be073bc2ed5bf4231d850106f214fdeb020e /app/controllers/statuses_controller.rb | |
parent | c339d49d82b3fd2873831029d9c92b3fbf1236e3 (diff) | |
parent | 37965ac8d9773ae79f6b8dd6fcd353894d2194ca (diff) |
Merge branch 'glitch'
Diffstat (limited to 'app/controllers/statuses_controller.rb')
-rw-r--r-- | app/controllers/statuses_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb index 1940aaa1b..bc711a8e4 100644 --- a/app/controllers/statuses_controller.rb +++ b/app/controllers/statuses_controller.rb @@ -34,7 +34,7 @@ class StatusesController < ApplicationController format.json do skip_session! unless @stream_entry.hidden? - render_cached_json(['activitypub', 'note', @status.cache_key], content_type: 'application/activity+json', public: !@stream_entry.hidden?) do + render_cached_json(['activitypub', 'note', @status], content_type: 'application/activity+json', public: !@stream_entry.hidden?) do ActiveModelSerializers::SerializableResource.new(@status, serializer: ActivityPub::NoteSerializer, adapter: ActivityPub::Adapter) end end @@ -44,7 +44,7 @@ class StatusesController < ApplicationController def activity skip_session! - render_cached_json(['activitypub', 'activity', @status.cache_key], content_type: 'application/activity+json', public: !@stream_entry.hidden?) do + render_cached_json(['activitypub', 'activity', @status], content_type: 'application/activity+json', public: !@stream_entry.hidden?) do ActiveModelSerializers::SerializableResource.new(@status, serializer: ActivityPub::ActivitySerializer, adapter: ActivityPub::Adapter) end end |