diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2018-07-01 04:12:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-01 04:12:34 +0200 |
commit | 2092d5c0ad099e8f60eb001ee0cd647fc759aefc (patch) | |
tree | f5e6dfdd44ebf18bd648fdfbe5bd9b446ee1d5b3 /app/controllers | |
parent | 8fea9cc3112968d90ba4df02a90aa3a031a5f3a9 (diff) |
Improve embeds (#7919)
* Make embeds cacheable by reverse proxy * Make follow button on embeds open remote follow modal Instead of web+mastodon://, also, turn the button blue, and add a sign up prompt to the remote follow modal
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/remote_follow_controller.rb | 1 | ||||
-rw-r--r-- | app/controllers/statuses_controller.rb | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/controllers/remote_follow_controller.rb b/app/controllers/remote_follow_controller.rb index 3b988e08d..cd61fd763 100644 --- a/app/controllers/remote_follow_controller.rb +++ b/app/controllers/remote_follow_controller.rb @@ -5,6 +5,7 @@ class RemoteFollowController < ApplicationController before_action :set_account before_action :gone, if: :suspended_account? + before_action :set_body_classes def new @remote_follow = RemoteFollow.new(session_params) diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb index 645995c2a..b85341822 100644 --- a/app/controllers/statuses_controller.rb +++ b/app/controllers/statuses_controller.rb @@ -46,7 +46,12 @@ class StatusesController < ApplicationController end def embed + raise ActiveRecord::RecordNotFound if @status.hidden? + + skip_session! + expires_in 180, public: true response.headers['X-Frame-Options'] = 'ALLOWALL' + render 'stream_entries/embed', layout: 'embedded' end |