Prevent archiving when user set "noindex" (#11421)

diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
index 0dc984dcc205393ea3ddbb45a0fe0e0d28faaf57..6846abeb692c94376399ca14d4d0026384b7206e 100644 (file)
--- a/app/views/accounts/show.html.haml
+++ b/app/views/accounts/show.html.haml
@@ -5,7 +5,7 @@
   %meta{ name: 'description', content: account_description(@account) }/
 
   - if @account.user&.setting_noindex
-    %meta{ name: 'robots', content: 'noindex' }/
+    %meta{ name: 'robots', content: 'noindex, noarchive' }/
 
   %link{ rel: 'alternate', type: 'application/atom+xml', href: account_url(@account, format: 'atom') }/
   %link{ rel: 'alternate', type: 'application/rss+xml', href: account_url(@account, format: 'rss') }/

diff --git a/app/views/statuses/show.html.haml b/app/views/statuses/show.html.haml
index 704e37a3df24d8391e8ba26996679e9ca39218fd..0f22d106b560c12a79a8f2cace6da89d93dfe445 100644 (file)
--- a/app/views/statuses/show.html.haml
+++ b/app/views/statuses/show.html.haml
@@ -3,7 +3,7 @@
 
 - content_for :header_tags do
   - if @account.user&.setting_noindex
-    %meta{ name: 'robots', content: 'noindex' }/
+    %meta{ name: 'robots', content: 'noindex, noarchive' }/
 
   %link{ rel: 'alternate', type: 'application/json+oembed', href: api_oembed_url(url: short_account_status_url(@account, @status), format: 'json') }/
   %link{ rel: 'alternate', type: 'application/activity+json', href: ActivityPub::TagManager.instance.uri_for(@status) }/