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

diff --git a/app/controllers/remote_follow_controller.rb b/app/controllers/remote_follow_controller.rb
index 3b988e08d80a83bcf2412087927f55518f2b2722..cd61fd7639a410b828a21c03cbd16e9feee23568 100644 (file)
--- 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 645995c2a07ff2055bfd49933175828fdab17421..b8534182291c04901d766e06149b29a2e4d02fb2 100644 (file)
--- 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
 

diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index d5e5b7fe00d00bfaedb554a5bc10a584b9782964..cc2fed3f1398295eaea1c7a38f7924233ce27337 100644 (file)
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -64,7 +64,7 @@ function main() {
     [].forEach.call(document.querySelectorAll('.logo-button'), (content) => {
       content.addEventListener('click', (e) => {
         e.preventDefault();
-        window.open(e.target.href, 'mastodon-intent', 'width=400,height=400,resizable=no,menubar=no,status=no,scrollbars=yes');
+        window.open(e.target.href, 'mastodon-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes');
       });
     });
 

diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss
index 14dc5dd6211a1fdc987f146d8973748ec2a8a5b7..8033e6418708456d27f544d1234cc292ff7e5ac9 100644 (file)
--- a/app/javascript/styles/mastodon/accounts.scss
+++ b/app/javascript/styles/mastodon/accounts.scss
@@ -464,6 +464,7 @@
   background: $simple-background-color;
 
   &__header {
+    background: $base-shadow-color;
     background-size: cover;
     background-position: center center;
     height: 90px;

diff --git a/app/javascript/styles/mastodon/stream_entries.scss b/app/javascript/styles/mastodon/stream_entries.scss
index 281cbaf83a77af0f9f813327d045a846710c895a..369bb4479ce29916a9566c403215467bc2b8f145 100644 (file)
--- a/app/javascript/styles/mastodon/stream_entries.scss
+++ b/app/javascript/styles/mastodon/stream_entries.scss
@@ -324,6 +324,9 @@
         .button.button-secondary.logo-button {
           flex: 0 auto;
           font-size: 14px;
+          background: $ui-highlight-color;
+          color: $primary-text-color;
+          border: 0;
 
           svg {
             width: 20px;
@@ -332,19 +335,21 @@
             margin-right: 5px;
 
             path:first-child {
-              fill: $ui-primary-color;
+              fill: $primary-text-color;
             }
 
             path:last-child {
-              fill: $simple-background-color;
+              fill: $ui-highlight-color;
             }
           }
 
           &:active,
           &:focus,
           &:hover {
-            svg path:first-child {
-              fill: lighten($ui-primary-color, 4%);
+            background: lighten($ui-highlight-color, 10%);
+
+            svg path:last-child {
+              fill: lighten($ui-highlight-color, 10%);
             }
           }
         }

diff --git a/app/views/remote_follow/new.html.haml b/app/views/remote_follow/new.html.haml
index fc5c4da20bd9a57bfaa18a981303382403f7cccd..3273c318c05e69f36052d4a11dc5b8fc0ad32a1d 100644 (file)
--- a/app/views/remote_follow/new.html.haml
+++ b/app/views/remote_follow/new.html.haml
@@ -11,3 +11,5 @@
 
     .actions
       = f.button :button, t('remote_follow.proceed'), type: :submit
+
+    %p.hint.subtle-hint= t('remote_follow.no_account_html', sign_up_path: open_registrations? ? new_user_registration_path : 'https://joinmastodon.org')

diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml
index c0f1e4f0f531c5036368dea4004f76446f8c247d..de844818fcd0a0da9cea0ee134fc62b54d8867ae 100644 (file)
--- a/app/views/stream_entries/_detailed_status.html.haml
+++ b/app/views/stream_entries/_detailed_status.html.haml
@@ -8,7 +8,7 @@
       %span= acct(status.account)
 
   - if embedded_view?
-    = link_to "web+mastodon://follow?uri=#{status.account.local_username_and_domain}", class: 'button button-secondary logo-button', target: '_new' do
+    = link_to account_remote_follow_path(status.account), class: 'button button-secondary logo-button', target: '_new' do
       = render file: Rails.root.join('app', 'javascript', 'images', 'logo.svg')
       = t('accounts.follow')
 

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5cb81ebe9e59ad305a094f594c3fcee7b153f239..8ab652045e121b8e9522b2812a34c238bea47da2 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -615,6 +615,7 @@ en:
   remote_follow:
     acct: Enter your username@domain you want to follow from
     missing_resource: Could not find the required redirect URL for your account
+    no_account_html: Don't have an account? You can <a href='%{sign_up_path}' target='_blank'>sign up here</a>
     proceed: Proceed to follow
     prompt: 'You are going to follow:'
   remote_unfollow: